Add /user/login?noredirect=true, skipping forced login through OAuth2…

…/OpenID
blender · Jan 30, 2023 · 979a48c · 979a48c
1 parent d6cddbd
commit 979a48c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
@@ -2740,7 +2740,7 @@ auths.oauth2_emailURL = Email URL
 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.force_o_auth = Force login via this authentication
-auths.force_o_auth_helper = Set this to automatically redirect sign in to this OAuth provider
+auths.force_o_auth_helper = Set this to automatically redirect sign in to this OAuth provider (unless ?noredirect=true is set)
 auths.oauth2_tenant = Tenant
 auths.oauth2_scopes = Additional Scopes
 auths.oauth2_required_claim_name = Required Claim Name

diff --git a/routers/web/auth/auth.go b/routers/web/auth/auth.go
@@ -139,6 +139,9 @@ func checkAutoLogin(ctx *context.Context) bool {
 
 func checkForceOAuth(ctx *context.Context) bool {
 	// Check if authentication is forced to OAuth
+	if ctx.FormBool("noredirect") {
+		return false
+	}
 
 	authSources, err := auth.GetActiveOAuth2ProviderSources()
 	if err != nil {