Merge pull request #2795 from Hyperkid123/sso-url-env-details-dynamic

Add env based SSO url to getEnvDetails chrome method.
RedHatInsights · Mar 20, 2024 · 71cf36c · 71cf36c
2 parents 5c1b0ad + f6b507e
commit 71cf36c
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 3 deletions.
diff --git a/src/auth/ChromeAuthContext.ts b/src/auth/ChromeAuthContext.ts
@@ -4,6 +4,7 @@ import { createContext } from 'react';
 import { OfflineTokenResponse } from './offline';
 
 export type ChromeAuthContextValue<LoginResponse = void> = {
+  ssoUrl: string;
   ready: boolean;
   user: ChromeUser;
   getUser: () => Promise<ChromeUser>;
@@ -30,6 +31,7 @@ const blankUser: ChromeUser = {
 };
 
 const ChromeAuthContext = createContext<ChromeAuthContextValue>({
+  ssoUrl: '',
   ready: false,
   logoutAllTabs: () => undefined,
   loginAllTabs: () => undefined,

diff --git a/src/auth/OIDCConnector/OIDCProvider.tsx b/src/auth/OIDCConnector/OIDCProvider.tsx
@@ -74,7 +74,12 @@ const OIDCProvider: React.FC<React.PropsWithChildren> = ({ children }) => {
 
   return (
     <AuthProvider {...authProviderProps}>
-      <OIDCSecured cookieElement={cookieElement} setCookieElement={setCookieElement} microFrontendConfig={state.microFrontendConfig}>
+      <OIDCSecured
+        ssoUrl={state.ssoUrl}
+        cookieElement={cookieElement}
+        setCookieElement={setCookieElement}
+        microFrontendConfig={state.microFrontendConfig}
+      >
         {children}
       </OIDCSecured>
     </AuthProvider>

diff --git a/src/auth/OIDCConnector/OIDCSecured.tsx b/src/auth/OIDCConnector/OIDCSecured.tsx
@@ -80,7 +80,8 @@ export function OIDCSecured({
   microFrontendConfig,
   cookieElement,
   setCookieElement,
-}: React.PropsWithChildren<{ microFrontendConfig: Record<string, any> } & FooterProps>) {
+  ssoUrl,
+}: React.PropsWithChildren<{ microFrontendConfig: Record<string, any>; ssoUrl: string } & FooterProps>) {
   const auth = useAuth();
   const authRef = useRef(auth);
   const store = useStore();
@@ -91,6 +92,7 @@ export function OIDCSecured({
   const activeModule = useAtomValue(activeModuleDefinitionReadAtom);
   const requiredScopes = activeModule?.config?.ssoScopes || [];
   const [state, setState] = useState<ChromeAuthContextValue>({
+    ssoUrl,
     ready: false,
     logoutAllTabs: (bounce = true) => {
       authChannel.postMessage({ type: 'logout' });

diff --git a/src/chrome/create-chrome.test.ts b/src/chrome/create-chrome.test.ts
@@ -40,6 +40,7 @@ const mockUser: ChromeUser = {
 
 describe('create chrome', () => {
   const chromeAuthMock: ChromeAuthContextValue = {
+    ssoUrl: '',
     doOffline() {
       return Promise.resolve();
     },

diff --git a/src/chrome/create-chrome.ts b/src/chrome/create-chrome.ts
@@ -118,7 +118,19 @@ export const createChromeContext = ({
     getBundleData: useBundle,
     getApp: () => getUrl('app'),
     getEnvironment: () => getEnv(),
-    getEnvironmentDetails: () => getEnvDetails(),
+    getEnvironmentDetails: () => {
+      let environment = getEnvDetails();
+      if (environment && chromeAuth.ssoUrl) {
+        environment.sso = chromeAuth.ssoUrl;
+      } else {
+        environment = {
+          url: [],
+          portal: 'undefined',
+          sso: chromeAuth.ssoUrl,
+        };
+      }
+      return environment;
+    },
     createCase: (fields?: any) => chromeAuth.getUser().then((user) => createSupportCase(user!.identity, chromeAuth.token, fields)),
     getUserPermissions: async (app = '', bypassCache?: boolean) => {
       const token = await chromeAuth.getToken();