Change to Skip Local 2fa instead of Override Local 2fa

Signed-off-by: Andrew Thornton <[email protected]>

Author: zeripath

cmd/admin.go

@@ -289,8 +289,8 @@ var (
 			Usage: "Custom icon URL for OAuth2 login source",
 		},
 		cli.BoolFlag{
-			Name:  "override-local-2fa",
-			Usage: "Set to true to override local 2fa settings",
+			Name:  "skip-local-2fa",
+			Usage: "Set to true to skip local 2fa for users authenticated by this source",
 		},
 	}
 
@@ -620,7 +620,7 @@ func parseOAuth2Config(c *cli.Context) *oauth2.Source {
 		OpenIDConnectAutoDiscoveryURL: c.String("auto-discover-url"),
 		CustomURLMapping:              customURLMapping,
 		IconURL:                       c.String("icon-url"),
-		OverrideLocalTwoFA:            c.Bool("override-local-2fa"),
+		SkipLocalTwoFA:                c.Bool("skip-local-2fa"),
 	}
 }
 

options/locale/locale_en-US.ini

@@ -2448,8 +2448,8 @@ auths.oauth2_tokenURL = Token URL
 auths.oauth2_authURL = Authorize URL
 auths.oauth2_profileURL = Profile URL
 auths.oauth2_emailURL = Email URL
-auths.override_local_two_fa = Override local 2FA
-auths.override_local_two_fa_helper = Leaving unset means local users with 2FA set will still have to pass 2FA to log on
+auths.skip_local_two_fa = Skip local 2FA
+auths.skip_local_two_fa_helper = Leaving unset means local users with 2FA set will still have to pass 2FA to log on
 auths.oauth2_tenant = Tenant
 auths.enable_auto_register = Enable Auto Registration
 auths.sspi_auto_create_users = Automatically create users

routers/web/admin/auths.go

@@ -181,7 +181,7 @@ func parseOAuth2Config(form forms.AuthenticationForm) *oauth2.Source {
 		OpenIDConnectAutoDiscoveryURL: form.OpenIDConnectAutoDiscoveryURL,
 		CustomURLMapping:              customURLMapping,
 		IconURL:                       form.Oauth2IconURL,
-		OverrideLocalTwoFA:            form.OverrideLocalTwoFA,
+		SkipLocalTwoFA:                form.SkipLocalTwoFA,
 	}
 }
 

routers/web/user/auth.go

@@ -706,7 +706,7 @@ func handleOAuth2SignIn(ctx *context.Context, source *models.LoginSource, u *mod
 	updateAvatarIfNeed(gothUser.AvatarURL, u)
 
 	needs2FA := false
-	if !source.Cfg.(*oauth2.Source).OverrideLocalTwoFA {
+	if !source.Cfg.(*oauth2.Source).SkipLocalTwoFA {
 		_, err := models.GetTwoFactorByUID(u.ID)
 		if err != nil && !models.IsErrTwoFactorNotEnrolled(err) {
 			ctx.ServerError("UserSignIn", err)

services/auth/source/oauth2/source.go

@@ -24,7 +24,7 @@ type Source struct {
 	OpenIDConnectAutoDiscoveryURL string
 	CustomURLMapping              *CustomURLMapping
 	IconURL                       string
-	OverrideLocalTwoFA            bool
+	SkipLocalTwoFA                bool
 
 	// reference to the loginSource
 	loginSource *models.LoginSource

services/forms/auth_form.go

@@ -66,7 +66,7 @@ type AuthenticationForm struct {
 	Oauth2EmailURL                string
 	Oauth2IconURL                 string
 	Oauth2Tenant                  string
-	OverrideLocalTwoFA            bool
+	SkipLocalTwoFA                bool
 	SSPIAutoCreateUsers           bool
 	SSPIAutoActivateUsers         bool
 	SSPIStripDomainNames          bool

templates/admin/auth/edit.tmpl

@@ -257,9 +257,9 @@
 					</div>
 					<div class="optional field">
 						<div class="ui checkbox">
-							<label for="override_local_two_fa"><strong>{{.i18n.Tr "admin.auths.override_local_two_fa"}}</strong></label>
-							<input id="override_local_two_fa" name="override_local_two_fa" type="checkbox" {{if $cfg.OverrideLocalTwoFA}}checked{{end}}>
-							<p class="help">{{.i18n.Tr "admin.auths.override_local_two_fa_helper"}}</p>
+							<label for="skip_local_two_fa"><strong>{{.i18n.Tr "admin.auths.skip_local_two_fa"}}</strong></label>
+							<input id="skip_local_two_fa" name="skip_local_two_fa" type="checkbox" {{if $cfg.SkipLocalTwoFA}}checked{{end}}>
+							<p class="help">{{.i18n.Tr "admin.auths.skip_local_two_fa_helper"}}</p>
 						</div>
 					</div>
 

templates/admin/auth/source/oauth.tmpl

@@ -30,9 +30,9 @@
 	</div>
 	<div class="optional field">
 		<div class="ui checkbox">
-			<label for="override_local_two_fa"><strong>{{.i18n.Tr "admin.auths.override_local_two_fa"}}</strong></label>
-			<input id="override_local_two_fa" name="override_local_two_fa" type="checkbox" {{if .override_local_two_fa}}checked{{end}}>
-			<p class="help">{{.i18n.Tr "admin.auths.override_local_two_fa_helper"}}</p>
+			<label for="skip_local_two_fa"><strong>{{.i18n.Tr "admin.auths.skip_local_two_fa"}}</strong></label>
+			<input id="skip_local_two_fa" name="skip_local_two_fa" type="checkbox" {{if .skip_local_two_fa}}checked{{end}}>
+			<p class="help">{{.i18n.Tr "admin.auths.skip_local_two_fa_helper"}}</p>
 		</div>
 	</div>