OSD-22376 | fix: prevents overwriting the client id if set for fedram…

…p with keycloak
openshift · May 3, 2024 · 0f92d57 · 0f92d57
1 parent d1c0f59
commit 0f92d57
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/cmd/login/cmd.go b/cmd/login/cmd.go
@@ -346,9 +346,16 @@ func runWithRuntime(r *rosa.Runtime, cmd *cobra.Command, argv []string) error {
 			if !ok {
 				tokenURL = args.tokenURL
 			}
-			clientID, ok = fedramp.ClientIDs[env]
-			if !ok {
+
+			// if client-id is provided, we don't want to just override it
+			// with Keycloak flow
+			if args.clientID != "" {
 				clientID = args.clientID
+			} else {
+				clientID, ok = fedramp.ClientIDs[env]
+				if !ok {
+					clientID = args.clientID
+				}
 			}
 		}
 	}