Fixing SSO Operator mode showing CONSOLE (#1808)

Author: adfost

models/login_details.go

@@ -98,7 +98,7 @@ func getLoginDetailsResponse(r *http.Request) (*models.LoginDetails, *models.Err
 	redirectURL := ""
 
 	if oauth2.IsIDPEnabled() {
-		loginStrategy = models.LoginDetailsLoginStrategyRedirect
+		loginStrategy = models.LoginDetailsLoginStrategyRedirectDashServiceDashAccount
 		// initialize new oauth2 client
 		oauth2Client, err := oauth2.NewOauth2ProviderClient(nil, r, restapi.GetConsoleHTTPClient())
 		if err != nil {

operatorapi/embedded_spec.go

@@ -502,7 +502,8 @@ const Login = ({
       );
       break;
     }
-    case loginStrategyType.redirect: {
+    case loginStrategyType.redirect:
+    case loginStrategyType.redirectServiceAccount: {
       loginComponent = (
         <React.Fragment>
           <Button
@@ -605,7 +606,8 @@ const Login = ({
   }
 
   const consoleText =
-    loginStrategy.loginStrategy === loginStrategyType.serviceAccount
+    loginStrategy.loginStrategy === loginStrategyType.serviceAccount ||
+    loginStrategy.loginStrategy === loginStrategyType.redirectServiceAccount
       ? "Operator"
       : "Console";
 

operatorapi/login.go

@@ -24,4 +24,5 @@ export enum loginStrategyType {
   form = "form",
   redirect = "redirect",
   serviceAccount = "service-account",
+  redirectServiceAccount = "redirect-service-account"
 }

portal-ui/src/screens/LoginPage/LoginPage.tsx

@@ -3579,7 +3579,7 @@ definitions:
     properties:
       loginStrategy:
         type: string
-        enum: [form, redirect, service-account]
+        enum: [form, redirect, service-account, redirect-service-account]
       redirect:
         type: string
   loginOauth2AuthRequest:

portal-ui/src/screens/LoginPage/types.ts

@@ -1240,7 +1240,7 @@ definitions:
     properties:
       loginStrategy:
         type: string
-        enum: [ form, redirect, service-account ]
+        enum: [form, redirect, service-account, redirect-service-account]
       redirect:
         type: string
   loginRequest: