From ca1cc4eba509815374199abdbbfcc18fa66d3951 Mon Sep 17 00:00:00 2001
From: norda-gunni <161026627+norda-gunni@users.noreply.github.com>
Date: Thu, 10 Oct 2024 17:29:52 +0000
Subject: [PATCH] fix(shared-utils): Fix addressing in getConfigValue (#16358)

* fix(shared-utils): Fix addressing in getConfigValue

* Fix tests

---------

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
---
 .../lib/modules/shared/shared.utils.spec.ts   | 50 ++++++++++---------
 .../src/lib/modules/shared/shared.utils.ts    |  4 +-
 ...l-insurance-administration.service.spec.ts |  6 ++-
 3 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/libs/application/template-api-modules/src/lib/modules/shared/shared.utils.spec.ts b/libs/application/template-api-modules/src/lib/modules/shared/shared.utils.spec.ts
index 6f45ba224eba..6ad03a4b272f 100644
--- a/libs/application/template-api-modules/src/lib/modules/shared/shared.utils.spec.ts
+++ b/libs/application/template-api-modules/src/lib/modules/shared/shared.utils.spec.ts
@@ -3,30 +3,32 @@ import { ConfigService } from '@nestjs/config'
 import * as utils from './shared.utils'
 
 const mockConfig = {
-  clientLocationOrigin: 'http://localhost:4242',
-  baseApiUrl: 'http://localhost:4444',
-  attachmentBucket: 'attachmentBucket',
-  templateApi: {
-    clientLocationOrigin: 'http://localhost:4242/umsoknir',
-    email: {
-      sender: 'Devland.is',
-      address: 'development@island.is',
-    },
-    jwtSecret: 'supersecret',
-    xRoadBasePathWithEnv: '',
+  SharedModuleConfig: {
+    clientLocationOrigin: 'http://localhost:4242',
     baseApiUrl: 'http://localhost:4444',
-    presignBucket: '',
-    attachmentBucket: 'island-is-dev-storage-application-system',
-    generalPetition: {
-      endorsementApiBasePath: 'http://localhost:4246',
-    },
-    userProfile: {
-      serviceBasePath: 'http://localhost:3366',
-    },
-    islykill: {
-      cert: '',
-      passphrase: '',
-      basePath: '',
+    attachmentBucket: 'attachmentBucket',
+    templateApi: {
+      clientLocationOrigin: 'http://localhost:4242/umsoknir',
+      email: {
+        sender: 'Devland.is',
+        address: 'development@island.is',
+      },
+      jwtSecret: 'supersecret',
+      xRoadBasePathWithEnv: '',
+      baseApiUrl: 'http://localhost:4444',
+      presignBucket: '',
+      attachmentBucket: 'island-is-dev-storage-application-system',
+      generalPetition: {
+        endorsementApiBasePath: 'http://localhost:4246',
+      },
+      userProfile: {
+        serviceBasePath: 'http://localhost:3366',
+      },
+      islykill: {
+        cert: '',
+        passphrase: '',
+        basePath: '',
+      },
     },
   },
 }
@@ -92,7 +94,7 @@ describe('shared utils', () => {
   let configService: ConfigService<SharedModuleConfig>
 
   beforeEach(() => {
-    configService = new ConfigService<SharedModuleConfig>(mockConfig)
+    configService = new ConfigService(mockConfig)
   })
 
   it('should get the client location origin from the config', () => {
diff --git a/libs/application/template-api-modules/src/lib/modules/shared/shared.utils.ts b/libs/application/template-api-modules/src/lib/modules/shared/shared.utils.ts
index e096381aa961..44f6ea9850d7 100644
--- a/libs/application/template-api-modules/src/lib/modules/shared/shared.utils.ts
+++ b/libs/application/template-api-modules/src/lib/modules/shared/shared.utils.ts
@@ -25,10 +25,10 @@ export const createAssignToken = (
 }
 
 export const getConfigValue = (
-  configService: ConfigService<SharedModuleConfig>,
+  configService: ConfigService,
   key: keyof SharedModuleConfig,
 ) => {
-  const value = configService.get(key)
+  const value = configService.get(`SharedModuleConfig.${key}`)
 
   if (value === undefined) {
     throw new Error(
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/social-insurance-administration/social-insurance-administration.service.spec.ts b/libs/application/template-api-modules/src/lib/modules/templates/social-insurance-administration/social-insurance-administration.service.spec.ts
index b8eea35cd156..40d198481d8a 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/social-insurance-administration/social-insurance-administration.service.spec.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/social-insurance-administration/social-insurance-administration.service.spec.ts
@@ -8,8 +8,10 @@ import { ApplicationTypes } from '@island.is/application/types'
 import { sharedModuleConfig } from '../../shared'
 
 const mockConfig = {
-  templateApi: {
-    attachmentBucket: 'island-is-dev-storage-application-system',
+  SharedModuleConfig: {
+    templateApi: {
+      attachmentBucket: 'island-is-dev-storage-application-system',
+    },
   },
 }