diff --git a/Deployment/templates/continuous-deployment.yml b/Deployment/templates/continuous-deployment.yml index a6d1f3ed..c0f33349 100644 --- a/Deployment/templates/continuous-deployment.yml +++ b/Deployment/templates/continuous-deployment.yml @@ -65,8 +65,8 @@ jobs: value: $(essConfig-aioExcludeEncs) - name: essConfig.apiUiUrl value: $(essConfig-apiUiUrl) - - name: essConfig.adminDomains - value: $(essConfig-AdminDomains) + - name: essConfig.privilegedUserDomains + value: $(essConfig-PrivilegedUserDomains) strategy: runOnce: deploy: diff --git a/NVDSuppressions.xml b/NVDSuppressions.xml index 03e4ae75..2d48e7a2 100644 --- a/NVDSuppressions.xml +++ b/NVDSuppressions.xml @@ -53,4 +53,15 @@ ^pkg:npm/webpack@.*$ CVE-2024-43788 + + + + + ^pkg:npm/cookie@.*$ + CVE-2024-47764 + GHSA-pxg6-pf52-xh8x + diff --git a/Tests/UnitTests/fss-header.component.spec.ts b/Tests/UnitTests/fss-header.component.spec.ts index e33f6175..e6cb5a43 100644 --- a/Tests/UnitTests/fss-header.component.spec.ts +++ b/Tests/UnitTests/fss-header.component.spec.ts @@ -105,7 +105,7 @@ describe('FssHeaderComponent', () => { test('should set isPrivilegedUser to true for admin domains', () => { component = new FssHeaderComponent(msalGuardConfiguration, msalService, route, msalBroadcastServie, analyticsService, signInButtonService,essUploadFileService); - component.configAdminDomains = ["test.com","abcd.com"]; + component.configPrivilegedUserDomains = ["test.com","abcd.com"]; const claims = { email: "admin@test.com" }; diff --git a/src/app/shared/components/fss-header/fss-header.component.ts b/src/app/shared/components/fss-header/fss-header.component.ts index 999ddae7..6b4cd6b6 100644 --- a/src/app/shared/components/fss-header/fss-header.component.ts +++ b/src/app/shared/components/fss-header/fss-header.component.ts @@ -36,7 +36,7 @@ export class FssHeaderComponent implements OnInit, AfterViewInit, OnDestroy { isActive: boolean = false; fssSilentTokenRequest: SilentRequest; fssTokenScope: any = []; - configAdminDomains: string[]; + configPrivilegedUserDomains: string[]; constructor(@Inject(MSAL_GUARD_CONFIG) private msalGuardConfig: MsalGuardConfiguration, private msalService: MsalService, private route: Router, @@ -46,7 +46,7 @@ export class FssHeaderComponent implements OnInit, AfterViewInit, OnDestroy { private essUploadFileService: EssUploadFileService) { this.fssTokenScope = AppConfigService.settings["fssConfig"].apiScope; - this.configAdminDomains = AppConfigService.settings["essConfig"].adminDomains; + this.configPrivilegedUserDomains = AppConfigService.settings["essConfig"].privilegedUserDomains; this.fssSilentTokenRequest = { scopes: [this.fssTokenScope], }; @@ -191,8 +191,8 @@ export class FssHeaderComponent implements OnInit, AfterViewInit, OnDestroy { this.signedInName = this.userName; const email = claims ? claims['email'] : null; - this.configAdminDomains.forEach(configAdminDomain => { - if (email && (email.toLowerCase().endsWith(configAdminDomain.toLowerCase()))) { + this.configPrivilegedUserDomains.forEach(configPrivilegedUserDomain => { + if (email && (email.toLowerCase().endsWith(configPrivilegedUserDomain.toLowerCase()))) { this.essUploadFileService.isPrivilegedUser = true; } }) diff --git a/src/assets/config/appconfig.json b/src/assets/config/appconfig.json index 1b0bc46f..8085cd32 100644 --- a/src/assets/config/appconfig.json +++ b/src/assets/config/appconfig.json @@ -57,6 +57,6 @@ "defaultEstimatedSizeinMB": "0.5", "aioExcludeEncs": [ "GB800002", "FR800002" ], "apiUiUrl": "", - "adminDomains":[] + "privilegedUserDomains": [] } }