BLENDER: Always login with Blender ID, unless noredirect is specified

Author: brechtvl

routers/web/auth/auth.go

@@ -164,6 +164,26 @@ func CheckAutoLogin(ctx *context.Context) bool {
 	return false
 }
 
+// BLENDER: always use OAuth unless ?noredirect=true is set
+func checkForceOAuth(ctx *context.Context) bool {
+	// Check if authentication is forced to OAuth
+	if ctx.FormBool("noredirect") {
+		return false
+	}
+
+	oauth2Providers, err := oauth2.GetOAuth2Providers(ctx, optional.Some(true))
+	if err != nil {
+		return false
+	}
+
+	for _, provider := range oauth2Providers {
+		ctx.Redirect(setting.AppSubURL + "/user/oauth2/" + provider.Name())
+		return true
+	}
+
+	return false
+}
+
 func prepareSignInPageData(ctx *context.Context) {
 	ctx.Data["Title"] = ctx.Tr("sign_in")
 	ctx.Data["OAuth2Providers"], _ = oauth2.GetOAuth2Providers(ctx, optional.Some(true))
@@ -185,6 +205,10 @@ func SignIn(ctx *context.Context) {
 	if CheckAutoLogin(ctx) {
 		return
 	}
+	// BLENDER: Check if authentication is forced to OAuth
+	if checkForceOAuth(ctx) {
+		return
+	}
 	if ctx.IsSigned {
 		RedirectAfterLogin(ctx)
 		return