Add sharedConfig to appModule

island-is · Sep 4, 2024 · a3cb4f6 · a3cb4f6
1 parent c8aeaa3
commit a3cb4f6
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 20 deletions.
diff --git a/apps/application-system/api/src/app/app.module.ts b/apps/application-system/api/src/app/app.module.ts
@@ -58,6 +58,7 @@ import { VmstClientConfig } from '@island.is/clients/vmst'
 import { FriggClientConfig } from '@island.is/clients/mms/frigg'
 import { smsModuleConfig } from '@island.is/nova-sms'
 import { emailModuleConfig } from '@island.is/email-service'
+import { sharedModuleConfig } from '@island.is/application/template-api-modules'
 
 @Module({
   imports: [
@@ -115,6 +116,7 @@ import { emailModuleConfig } from '@island.is/email-service'
         FriggClientConfig,
         smsModuleConfig,
         emailModuleConfig,
+        sharedModuleConfig,
       ],
     }),
   ],

diff --git a/apps/application-system/api/src/app/modules/application/e2e/application.spec.ts b/apps/application-system/api/src/app/modules/application/e2e/application.spec.ts
@@ -57,19 +57,15 @@ class MockContentfulRepository {
   }
 }
 
-class MockSharedConfig {
-  load() {
-    return {
-      jwtSecret: 'supersecret',
-      clientLocationOrigin: 'http://localhost:4200',
-      email: {
-        sender: 'Devland.is',
-        address: 'development@island.is',
-      },
-      baseApiUrl: 'http://localhost:4444',
-      attachmentBucket: 'attachmentBucket',
-    }
-  }
+const mockConfig = {
+  jwtSecret: 'supersecret',
+  clientLocationOrigin: 'http://localhost:4200',
+  email: {
+    sender: 'Devland.is',
+    address: 'development@island.is',
+  },
+  baseApiUrl: 'http://localhost:4444',
+  attachmentBucket: 'attachmentBucket',
 }
 
 let server: request.SuperTest<request.Test>
@@ -91,7 +87,7 @@ beforeAll(async () => {
         .overrideProvider(EmailService)
         .useClass(MockEmailService)
         .overrideProvider(sharedModuleConfig.KEY)
-        .useClass(MockSharedConfig)
+        .useValue(mockConfig)
         .overrideGuard(IdsUserGuard)
         .useValue(mockAuthGuard),
   })

diff --git a/...les/src/lib/modules/templates/accident-notification/accident-notification.service.spec.ts b/...les/src/lib/modules/templates/accident-notification/accident-notification.service.spec.ts
@@ -114,9 +114,7 @@ describe('AccidentNotificationService', () => {
         },
         {
           provide: sharedModuleConfig.KEY,
-          useValue: {
-            clientLocationOrigin: 'http://localhost:4200',
-          },
+          useValue: {},
         },
         {
           provide: ACCIDENT_NOTIFICATION_CONFIG,

diff --git a/...plate-api-modules/src/lib/modules/templates/parental-leave/parental-leave.service.spec.ts b/...plate-api-modules/src/lib/modules/templates/parental-leave/parental-leave.service.spec.ts
@@ -237,9 +237,7 @@ describe('ParentalLeaveService', () => {
         },
         {
           provide: sharedModuleConfig.KEY,
-          useValue: {
-            clientLocationOrigin: 'http://localhost:4200',
-          },
+          useValue: {},
         },
         SharedTemplateApiService,
         {