Fixing SSO Operator mode showing CONSOLE (#1808)

models/login_details.go

@@ -38,7 +38,7 @@ import (
 type LoginDetails struct {
 
 	// login strategy
-	// Enum: [form redirect service-account]
+	// Enum: [form redirect service-account redirect-service-account]
 	LoginStrategy string `json:"loginStrategy,omitempty"`
 
 	// redirect
@@ -63,7 +63,7 @@ var loginDetailsTypeLoginStrategyPropEnum []interface{}
 
 func init() {
 	var res []string
-	if err := json.Unmarshal([]byte(`["form","redirect","service-account"]`), &res); err != nil {
+	if err := json.Unmarshal([]byte(`["form","redirect","service-account","redirect-service-account"]`), &res); err != nil {
 		panic(err)
 	}
 	for _, v := range res {
@@ -81,6 +81,9 @@ const (
 
 	// LoginDetailsLoginStrategyServiceDashAccount captures enum value "service-account"
 	LoginDetailsLoginStrategyServiceDashAccount string = "service-account"
+
+	// LoginDetailsLoginStrategyRedirectDashServiceDashAccount captures enum value "redirect-service-account"
+	LoginDetailsLoginStrategyRedirectDashServiceDashAccount string = "redirect-service-account"
 )
 
 // prop value enum

operatorapi/embedded_spec.go

@@ -2754,7 +2754,8 @@ func init() {
           "enum": [
             "form",
             "redirect",
-            "service-account"
+            "service-account",
+            "redirect-service-account"
           ]
         },
         "redirect": {
@@ -7604,7 +7605,8 @@ func init() {
           "enum": [
             "form",
             "redirect",
-            "service-account"
+            "service-account",
+            "redirect-service-account"
           ]
         },
         "redirect": {

operatorapi/login.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 {

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

@@ -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";
 

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

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

swagger-console.yml

@@ -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:

swagger-operator.yml

@@ -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: