Refactor .snyk to ignore hard-coded appKey in app.config.ts

equinor · Oct 16, 2024 · 06457dd · 06457dd
1 parent d5abfc2
commit 06457dd
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/client/apps/legacyAppLoader/src/config.ts b/client/apps/legacyAppLoader/src/config.ts
@@ -13,16 +13,16 @@ interface Client {
 export const configure: AppModuleInitiator<
 	[NavigationModule],
 	Fusion<unknown>,
-	{ config: { environment: { endpoints: { client: Client; portal: Client } } } }
-> = (configurator, env) => {
-	configurator.configureHttpClient('portal-client', env.env.config?.environment.endpoints.client);
-	configurator.configureHttpClient('portal', env.env.config?.environment.endpoints.portal);
+	{ config: { environment: { endpoints: { client: Client; portal: Client; fusion: Client } } } }
+> = (configurator, { env, fusion }) => {
+	configurator.configureHttpClient('portal-client', env.config?.environment.endpoints.client);
+	configurator.configureHttpClient('portal', env.config?.environment.endpoints.portal);
 
-	window['clientBaseUri'] = env.env.config?.environment.endpoints.client.baseUri;
+	window['clientBaseUri'] = env.config?.environment.endpoints.client.baseUri;
 	// configurator.logger.level = 4;
 	configurator.configureHttpClient('app', {
 		baseUri: new URL('/apps-proxy/', location.origin).href,
-		defaultScopes: ['5a842df8-3238-415d-b168-9f16a6a6031b/.default'],
+		defaultScopes: env.config?.environment.endpoints.fusion.defaultScopes,
 	});
 
 	enableAppModule(configurator);
@@ -41,9 +41,8 @@ export const configure: AppModuleInitiator<
 			if (nav.action !== 'PUSH') return;
 
 			if (
-				nav.location.pathname
-					.split('/')
-					.filter((path) => path === env.fusion.modules.context.currentContext?.id).length > 1
+				nav.location.pathname.split('/').filter((path) => path === fusion.modules.context.currentContext?.id)
+					.length > 1
 			) {
 				instance.navigation.navigator.go(-1);
 			}

diff --git a/client/packages/core/src/app/hooks/use-app-loader.ts b/client/packages/core/src/app/hooks/use-app-loader.ts
@@ -5,7 +5,7 @@ import { useAppModule } from './use-app-module';
 import { useLegacyAppLoader } from './use-legacy-app-loader';
 import { createAppElement } from '../utils/app-element';
 import { appRender } from '../render';
-import { getLegacyClientConfig, getFusionLegacyEnvIdentifier } from '../utils';
+import { getLegacyClientConfig, getFusionLegacyEnvIdentifier, getLegacyFusionConfig } from '../utils';
 
 import { AppConfig } from '@equinor/fusion-framework-app';
 import { ConfigEnvironment } from '@equinor/fusion-framework-module-app';
@@ -57,6 +57,7 @@ export const useAppLoader = (appKey: string) => {
 													loadingText: 'Loading',
 													endpoints: {
 														client: getLegacyClientConfig(),
+														fusion: getLegacyFusionConfig(),
 													},
 												},
 											} as AppConfig<
@@ -66,6 +67,7 @@ export const useAppLoader = (appKey: string) => {
 													loadingText: string;
 													endpoints: {
 														client: Client;
+														fusion: Client;
 													};
 												}
 											>,

diff --git a/client/packages/core/src/app/utils/app-get-legacy-client-config.ts b/client/packages/core/src/app/utils/app-get-legacy-client-config.ts
@@ -4,6 +4,10 @@ export const getLegacyClientConfig = (): Client => ({
 	baseUri: window._config_.portalClient.client.baseUri,
 	defaultScopes: window._config_.portalClient.client.defaultScopes,
 });
+export const getLegacyFusionConfig = (): Client => ({
+	baseUri: window._config_.serviceDiscovery.client.baseUri,
+	defaultScopes: window._config_.serviceDiscovery.client.defaultScopes,
+});
 
 export const getFusionLegacyEnvIdentifier = (): string => {
 	return window._config_.fusionLegacyEnvIdentifier.toUpperCase();

diff --git a/client/packages/portal-client/src/lib/portal-framework-config.tsx b/client/packages/portal-client/src/lib/portal-framework-config.tsx
@@ -115,7 +115,7 @@ export function createPortalFramework(portalConfig: PortalConfig) {
 
 		config.configureHttpClient('app', {
 			baseUri: new URL('/apps-proxy/', location.origin).href,
-			defaultScopes: ['5a842df8-3238-415d-b168-9f16a6a6031b/.default'],
+			defaultScopes: portalConfig.serviceDiscovery.client.defaultScopes,
 		});
 
 		config.configureMsal(portalConfig.msal.client, portalConfig.msal.options);