From f36c07aa68f5390fee61b88177cb4d65d7be8181 Mon Sep 17 00:00:00 2001
From: adfost <adfost@comcast.net>
Date: Mon, 18 Apr 2022 15:47:16 -0700
Subject: [PATCH] Fixing SSO Operator mode showing CONSOLE (#1808)

---
 models/login_details.go                       | 7 +++++--
 operatorapi/embedded_spec.go                  | 6 ++++--
 operatorapi/login.go                          | 2 +-
 portal-ui/src/screens/LoginPage/LoginPage.tsx | 6 ++++--
 portal-ui/src/screens/LoginPage/types.ts      | 1 +
 swagger-console.yml                           | 2 +-
 swagger-operator.yml                          | 2 +-
 7 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/models/login_details.go b/models/login_details.go
index 112b4467e..fef41dc5a 100644
--- a/models/login_details.go
+++ b/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
diff --git a/operatorapi/embedded_spec.go b/operatorapi/embedded_spec.go
index 9d7e85bbe..3ab8df4a5 100644
--- a/operatorapi/embedded_spec.go
+++ b/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": {
diff --git a/operatorapi/login.go b/operatorapi/login.go
index 2dd86a1aa..53ed118fa 100644
--- a/operatorapi/login.go
+++ b/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 {
diff --git a/portal-ui/src/screens/LoginPage/LoginPage.tsx b/portal-ui/src/screens/LoginPage/LoginPage.tsx
index b84a747ec..7dce819a6 100644
--- a/portal-ui/src/screens/LoginPage/LoginPage.tsx
+++ b/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";
 
diff --git a/portal-ui/src/screens/LoginPage/types.ts b/portal-ui/src/screens/LoginPage/types.ts
index 1a5d31d35..4f28f8c67 100644
--- a/portal-ui/src/screens/LoginPage/types.ts
+++ b/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"
 }
diff --git a/swagger-console.yml b/swagger-console.yml
index d352e092c..8dbe14ef7 100644
--- a/swagger-console.yml
+++ b/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:
diff --git a/swagger-operator.yml b/swagger-operator.yml
index fa13c0005..9738ad5b5 100644
--- a/swagger-operator.yml
+++ b/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: