Prevent 500 when there is an error during new auth source post (#19041) Fix #19036 Signed-off-by: Andrew Thornton <art27@cantab.net>

Changes

3 changed files (+5/-8)

• routers/web/admin/auths.go
  • @@ -93,7 +93,7 @@ func NewAuthSource(ctx *context.Context) {
    ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminAuthentications"] = true - ctx.Data["type"] = auth.LDAP + ctx.Data["type"] = auth.LDAP.Int() ctx.Data["CurrentTypeName"] = auth.Names[auth.LDAP] ctx.Data["CurrentSecurityProtocol"] = ldap.SecurityProtocolNames[ldap.SecurityProtocolUnencrypted] ctx.Data["smtp_auth"] = "PLAIN"
  • @@ -112,7 +112,7 @@ func NewAuthSource(ctx *context.Context) {
    ctx.Data["SSPIDefaultLanguage"] = "" // only the first as default - ctx.Data["oauth2_provider"] = oauth2providers[0] + ctx.Data["oauth2_provider"] = oauth2providers[0].Name ctx.HTML(http.StatusOK, tplAuthNew) }
  • @@ -253,9 +253,6 @@ func NewAuthSourcePost(ctx *context.Context) {
    ctx.Data["SSPISeparatorReplacement"] = "_" ctx.Data["SSPIDefaultLanguage"] = "" - // FIXME: most error path to render tplAuthNew will fail and result in 500 - // * template: admin/auth/new:17:68: executing "admin/auth/new" at <.type.Int>: can't evaluate field Int in type interface {} - // * template: admin/auth/source/oauth:5:93: executing "admin/auth/source/oauth" at <.oauth2_provider.Name>: can't evaluate field Name in type interface {} hasTLS := false var config convert.Conversion switch auth.Type(form.Type) {
• templates/admin/auth/new.tmpl
  • @@ -14,7 +14,7 @@
    <div class="inline required field {{if .Err_Type}}error{{end}}"> <label>{{.i18n.Tr "admin.auths.auth_type"}}</label> <div class="ui selection type dropdown"> - <input type="hidden" id="auth_type" name="type" value="{{.type.Int}}"> + <input type="hidden" id="auth_type" name="type" value="{{.type}}"> <div class="text">{{.CurrentTypeName}}</div> {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu">
• templates/admin/auth/source/oauth.tmpl
  • @@ -2,8 +2,8 @@
    <div class="inline required field"> <label>{{.i18n.Tr "admin.auths.oauth2_provider"}}</label> <div class="ui selection type dropdown"> - <input type="hidden" id="oauth2_provider" name="oauth2_provider" value="{{.oauth2_provider.Name}}"> - <div class="text">{{.oauth2_provider.Name}}</div> + <input type="hidden" id="oauth2_provider" name="oauth2_provider" value="{{.oauth2_provider}}"> + <div class="text">{{.oauth2_provider}}</div> {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> {{range .OAuth2Providers}}