feat(OIDC): get clientId from server (#16378)

* feat(OIDC): get clientId from server

* chore: remove types file

* chore: optional secret

src/script/E2EIdentity/OIDCService/OIDCService.ts

@@ -21,12 +21,13 @@ import {UserManager, User, UserManagerSettings} from 'oidc-client-ts';
 
 import {clearKeysStartingWith} from 'Util/localStorage';
 
-import {OidcClientData} from './OIDCService.types';
-
 interface OIDCServiceConfig {
   authorityUrl: string;
   redirectUri: string;
-  oidcClient: OidcClientData;
+  oidcClient: {
+    id: string;
+    secret?: string;
+  };
 }
 
 export class OIDCService {

src/script/E2EIdentity/OIDCService/OIDCServiceStorage.ts

@@ -17,44 +17,22 @@
  *
  */
 
-import {OidcClientData} from './OIDCService.types';
-
 const TargetURLKey = 'E2EIdentity_OIDCService_TargetURL';
-const clientDataKey = 'E2EIdentity_OIDCService_ClientData';
 
 const OIDCServiceStore = {
   store: {
-    clientData: (data: OidcClientData) => localStorage.setItem(clientDataKey, JSON.stringify(data)),
     targetURL: (url: string) => localStorage.setItem(TargetURLKey, url),
   },
   get: {
-    clientData: (): OidcClientData => {
-      // MOCK: store targetURL and clientData in OIDCServiceStore
-      // TODO: remove this once we have a proper OIDC service
-      return {
-        id: 'wireapp',
-        secret: 'dUpVSGx2dVdFdGQ0dmsxWGhDalQ0SldU',
-      };
-      /*
-      const clientData = localStorage.getItem(clientDataKey);
-      if (!clientData) {
-        throw new Error('No client data found in OIDCServiceStore');
-      }
-      return JSON.parse(clientData);
-      */
-    },
     targetURL: () => localStorage.getItem(TargetURLKey),
   },
   has: {
-    clientData: () => localStorage.getItem(clientDataKey) !== null,
     targetURL: () => localStorage.getItem(TargetURLKey) !== null,
   },
   clear: {
-    clientData: () => localStorage.removeItem(clientDataKey),
     targetURL: () => localStorage.removeItem(TargetURLKey),
     all: () => {
       OIDCServiceStore.clear.targetURL();
-      OIDCServiceStore.clear.clientData();
     },
   },
 };

src/script/E2EIdentity/OIDCService/index.ts

@@ -23,20 +23,27 @@ import {OIDCServiceStore} from './OIDCServiceStorage';
 // lots of hardcoded values here, but this is just for testing until we have a proper OIDC service
 export const getOIDCServiceInstance = (): OIDCService => {
   const targetURL = OIDCServiceStore.get.targetURL();
-  const clientData = OIDCServiceStore.get.clientData();
 
   // if there is no targetURL, we cannot create an OIDCService
   if (!targetURL) {
     throw new Error('No target URL found in OIDCServiceStore');
   }
+
+  const idpUrl = new URL(targetURL);
+  const idpClientId = idpUrl.searchParams.get('clientId');
+
   // if there is no clientData ID, we cannot create an OIDCService
-  if (!clientData || !clientData.id) {
-    throw new Error('No client data found in OIDCServiceStore');
+  if (!idpClientId) {
+    throw new Error('No clientId provided by the targetUrl');
   }
 
   const oidcService = new OIDCService({
-    oidcClient: clientData,
-    authorityUrl: targetURL,
+    oidcClient: {
+      id: idpClientId,
+      // this is a secret that is only used for testing and needs to be removed by backend
+      secret: 'dUpVSGx2dVdFdGQ0dmsxWGhDalQ0SldU',
+    },
+    authorityUrl: idpUrl.origin + idpUrl.pathname,
     redirectUri: `${location.origin}/oidc`,
   });
   return oidcService;