Fix require external registration password (#8885)

* Fix require external registration password

* Fix ctx on error condition by @jolheiser

diff --git a/routers/user/auth.go b/routers/user/auth.go
index b328ac094efabda0e362ec7f885e5113e9a3f5b6..cb5611e0459ba8e053c6083753c7df60448069d6 100644 (file)
--- a/routers/user/auth.go
+++ b/routers/user/auth.go
@@ -707,7 +707,7 @@ func oAuth2UserLoginCallback(loginSource *models.LoginSource, request *http.Requ
 
 // LinkAccount shows the page where the user can decide to login or create a new account
 func LinkAccount(ctx *context.Context) {
-       ctx.Data["DisablePassword"] = !setting.Service.RequireExternalRegistrationCaptcha || setting.Service.AllowOnlyExternalRegistration
+       ctx.Data["DisablePassword"] = !setting.Service.RequireExternalRegistrationPassword || setting.Service.AllowOnlyExternalRegistration
        ctx.Data["Title"] = ctx.Tr("link_account")
        ctx.Data["LinkAccountMode"] = true
        ctx.Data["EnableCaptcha"] = setting.Service.EnableCaptcha && setting.Service.RequireExternalRegistrationCaptcha
@@ -757,7 +757,7 @@ func LinkAccount(ctx *context.Context) {
 
 // LinkAccountPostSignIn handle the coupling of external account with another account using signIn
 func LinkAccountPostSignIn(ctx *context.Context, signInForm auth.SignInForm) {
-       ctx.Data["DisablePassword"] = setting.Service.AllowOnlyExternalRegistration
+       ctx.Data["DisablePassword"] = !setting.Service.RequireExternalRegistrationPassword || setting.Service.AllowOnlyExternalRegistration
        ctx.Data["Title"] = ctx.Tr("link_account")
        ctx.Data["LinkAccountMode"] = true
        ctx.Data["LinkAccountModeSignIn"] = true
@@ -840,7 +840,7 @@ func LinkAccountPostSignIn(ctx *context.Context, signInForm auth.SignInForm) {
 func LinkAccountPostRegister(ctx *context.Context, cpt *captcha.Captcha, form auth.RegisterForm) {
        // TODO Make insecure passwords optional for local accounts also,
        //      once email-based Second-Factor Auth is available
-       ctx.Data["DisablePassword"] = !setting.Service.RequireExternalRegistrationCaptcha || setting.Service.AllowOnlyExternalRegistration
+       ctx.Data["DisablePassword"] = !setting.Service.RequireExternalRegistrationPassword || setting.Service.AllowOnlyExternalRegistration
        ctx.Data["Title"] = ctx.Tr("link_account")
        ctx.Data["LinkAccountMode"] = true
        ctx.Data["LinkAccountModeRegister"] = true