chore(j-s): SMS and Email Config (#15514)

* Moves sms config from environment file

* Updates test

* Moves email config to config file

* Removes deprecsted options form environment file

* Updates tests

---------

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

apps/api/src/app/app.module.ts

@@ -106,10 +106,7 @@ import {
   OfficialJournalOfIcelandClientConfig,
   OfficialJournalOfIcelandClientModule,
 } from '@island.is/clients/official-journal-of-iceland'
-import {
-  OfficialJournalOfIcelandApplicationClientConfig,
-  OfficialJournalOfIcelandApplicationClientModule,
-} from '@island.is/clients/official-journal-of-iceland/application'
+import { OfficialJournalOfIcelandApplicationClientConfig } from '@island.is/clients/official-journal-of-iceland/application'
 import { HmsLoansClientConfig } from '@island.is/clients/hms-loans'
 import { HousingBenefitCalculatorClientConfig } from '@island.is/clients/housing-benefit-calculator'
 import { IcelandicGovernmentInstitutionVacanciesClientConfig } from '@island.is/clients/icelandic-government-institution-vacancies'
@@ -194,6 +191,7 @@ import { VmstClientConfig } from '@island.is/clients/vmst'
 import { FriggClientConfig } from '@island.is/clients/mms/frigg'
 import { UmbodsmadurSkuldaraModule } from '@island.is/api/domains/umbodsmadur-skuldara'
 import { UmbodsmadurSkuldaraClientConfig } from '@island.is/clients/ums-cost-of-living-calculator'
+import { emailModuleConfig } from '@island.is/email-service'
 
 const environment = getConfig
 
@@ -417,6 +415,7 @@ const environment = getConfig
         HealthInsuranceV2ClientConfig,
         CriminalRecordClientConfig,
         UmbodsmadurSkuldaraClientConfig,
+        emailModuleConfig,
       ],
     }),
   ],

apps/application-system/api/src/app/app.module.ts

@@ -52,6 +52,8 @@ import { CriminalRecordClientConfig } from '@island.is/clients/criminal-record'
 import { HealthInsuranceV2ClientConfig } from '@island.is/clients/icelandic-health-insurance/health-insurance'
 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'
 
 @Module({
   imports: [
@@ -105,6 +107,8 @@ import { FriggClientConfig } from '@island.is/clients/mms/frigg'
         HealthInsuranceV2ClientConfig,
         VmstClientConfig,
         FriggClientConfig,
+        smsModuleConfig,
+        emailModuleConfig,
       ],
     }),
   ],

apps/application-system/api/src/environments/environment.interface.ts

@@ -1,7 +1,6 @@
 import type { AuthConfig } from '@island.is/auth-nest-tools'
 import { TemplateAPIConfig } from '@island.is/application/template-api-modules'
 import { AuditOptions } from '@island.is/nest/audit'
-import { SmsServiceOptions } from '@island.is/nova-sms'
 
 export interface Environment {
   production: boolean
@@ -11,7 +10,6 @@ export interface Environment {
   audit: AuditOptions
   auth: AuthConfig
   templateApi: TemplateAPIConfig
-  smsOptions: SmsServiceOptions
   contentful: {
     accessToken: string
   }

apps/application-system/api/src/environments/environment.ts

@@ -17,26 +17,13 @@ const devConfig = {
     clientLocationOrigin: `http://localhost:${
       process.env.WEB_FRONTEND_PORT ?? '4242'
     }/umsoknir`,
-    emailOptions: {
-      useTestAccount: !(process.env.USE_SES === 'true'),
-      useNodemailerApp: process.env.USE_NODEMAILER_APP === 'true' ?? false,
-      options: {
-        region: process.env.EMAIL_REGION ?? 'eu-west-1',
-      },
-    },
     email: {
       sender: 'Devland.is',
       address: '[email protected]',
     },
     jwtSecret: 'supersecret',
     xRoadBasePathWithEnv: process.env.XROAD_BASE_PATH_WITH_ENV ?? '',
     baseApiUrl: 'http://localhost:4444',
-    smsOptions: {
-      url: 'https://smsapi.devnova.is',
-      username: 'IslandIs_User_Development',
-      password: process.env.NOVA_PASSWORD,
-      acceptUnauthorized: true,
-    },
     presignBucket: process.env.FILE_SERVICE_PRESIGN_BUCKET,
     attachmentBucket: process.env.APPLICATION_ATTACHMENT_BUCKET,
     generalPetition: {
@@ -74,26 +61,13 @@ const prodConfig = {
   },
   templateApi: {
     clientLocationOrigin: process.env.CLIENT_LOCATION_ORIGIN,
-    emailOptions: {
-      useTestAccount: false,
-      useNodemailerApp: false,
-      options: {
-        region: process.env.EMAIL_REGION,
-      },
-    },
     email: {
       sender: process.env.EMAIL_FROM_NAME,
       address: process.env.EMAIL_FROM,
     },
     jwtSecret: process.env.AUTH_JWT_SECRET,
     xRoadBasePathWithEnv: process.env.XROAD_BASE_PATH_WITH_ENV ?? '',
     baseApiUrl: process.env.GRAPHQL_API_URL,
-    smsOptions: {
-      url: process.env.NOVA_URL,
-      username: process.env.NOVA_USERNAME,
-      password: process.env.NOVA_PASSWORD,
-      acceptUnauthorized: process.env.NOVA_ACCEPT_UNAUTHORIZED === 'true',
-    },
     presignBucket: process.env.FILE_SERVICE_PRESIGN_BUCKET,
     attachmentBucket: process.env.APPLICATION_ATTACHMENT_BUCKET,
     generalPetition: {

apps/financial-aid/backend/src/app/app.module.ts

@@ -1,9 +1,11 @@
 import { AuthModule } from '@island.is/auth-nest-tools'
 import { Module } from '@nestjs/common'
 import { SequelizeModule } from '@nestjs/sequelize'
-import { environment } from '../environments'
 import { AuditModule } from '@island.is/nest/audit'
+import { ConfigModule } from '@island.is/nest/config'
+import { emailModuleConfig } from '@island.is/email-service'
 
+import { environment } from '../environments'
 import {
   ApplicationModule,
   FileModule,
@@ -42,6 +44,10 @@ import { SequelizeConfigService } from './sequelizeConfig.service'
     PersonalTaxReturnModule,
     ApiUserModule,
     AuditModule.forRoot(environment.audit),
+    ConfigModule.forRoot({
+      isGlobal: true,
+      load: [emailModuleConfig],
+    }),
   ],
 })
 export class AppModule {}

apps/financial-aid/backend/src/app/modules/application/application.module.ts

@@ -5,7 +5,6 @@ import { ApplicationModel } from './models/application.model'
 import { EmailModule } from '@island.is/email-service'
 import { ApplicationController } from './application.controller'
 import { ApplicationService } from './application.service'
-import { environment } from '../../../environments'
 import {
   AmountModule,
   MunicipalityModule,
@@ -20,7 +19,7 @@ import {
   imports: [
     forwardRef(() => StaffModule),
     forwardRef(() => FileModule),
-    EmailModule.register(environment.emailOptions),
+    EmailModule,
     forwardRef(() => ApplicationEventModule),
     forwardRef(() => ChildrenModule),
     forwardRef(() => MunicipalityModule),

apps/financial-aid/backend/src/app/modules/staff/staff.module.ts

@@ -1,17 +1,13 @@
 import { EmailModule } from '@island.is/email-service'
 import { Module } from '@nestjs/common'
 import { SequelizeModule } from '@nestjs/sequelize'
-import { environment } from '../../../environments'
 
 import { StaffModel } from './models/staff.model'
 import { StaffController } from './staff.controller'
 import { StaffService } from './staff.service'
 
 @Module({
-  imports: [
-    SequelizeModule.forFeature([StaffModel]),
-    EmailModule.register(environment.emailOptions),
-  ],
+  imports: [SequelizeModule.forFeature([StaffModel]), EmailModule],
   providers: [StaffService],
   controllers: [StaffController],
   exports: [StaffService],

apps/financial-aid/backend/src/environments/environment.ts

@@ -26,10 +26,6 @@ const prodConfig = {
   emailOptions: {
     fromEmail: process.env.SEND_FROM_EMAIL,
     replyToEmail: process.env.SEND_FROM_EMAIL,
-    useTestAccount: false,
-    options: {
-      region: process.env.EMAIL_REGION ?? '',
-    },
   },
   oskBaseUrl: process.env.OSK_BASE_URL,
   applicationSystemBaseUrl: process.env.APPLICATION_SYSTEM_BASE_URL,
@@ -62,10 +58,6 @@ const devConfig = {
   emailOptions: {
     fromEmail: process.env.SEND_FROM_EMAIL,
     replyToEmail: process.env.SEND_FROM_EMAIL,
-    useTestAccount: (process.env.EMAIL_USE_TEST_ACCOUNT ?? 'true') === 'true',
-    options: {
-      region: process.env.EMAIL_REGION ?? '',
-    },
   },
   oskBaseUrl: process.env.OSK_BASE_URL ?? 'http://localhost:4200',
   applicationSystemBaseUrl:

apps/judicial-system/backend/src/app/app.module.ts

@@ -2,8 +2,10 @@ import { Module } from '@nestjs/common'
 import { SequelizeModule } from '@nestjs/sequelize'
 
 import { signingModuleConfig } from '@island.is/dokobit-signing'
+import { emailModuleConfig } from '@island.is/email-service'
 import { ConfigModule } from '@island.is/nest/config'
 import { ProblemModule } from '@island.is/nest/problem'
+import { smsModuleConfig } from '@island.is/nova-sms'
 
 import {
   SharedAuthModule,
@@ -54,6 +56,8 @@ import { SequelizeConfigService } from './sequelizeConfig.service'
       load: [
         sharedAuthModuleConfig,
         signingModuleConfig,
+        smsModuleConfig,
+        emailModuleConfig,
         courtClientModuleConfig,
         messageModuleConfig,
         caseModuleConfig,

apps/judicial-system/backend/src/app/modules/court/court.module.ts

@@ -5,7 +5,6 @@ import { EmailModule } from '@island.is/email-service'
 
 import { CourtClientModule } from '@island.is/judicial-system/court-client'
 
-import { environment } from '../../../environments'
 import { EventModule } from '../index'
 import { RobotLog } from './models/robotLog.model'
 import { CourtService } from './court.service'
@@ -14,7 +13,7 @@ import { CourtService } from './court.service'
   imports: [
     SequelizeModule.forFeature([RobotLog]),
     CourtClientModule,
-    EmailModule.register(environment.emailOptions),
+    EmailModule,
     forwardRef(() => EventModule),
   ],
   providers: [CourtService],

apps/judicial-system/backend/src/app/modules/notification/notification.module.ts

@@ -7,7 +7,6 @@ import { SmsModule } from '@island.is/nova-sms'
 
 import { MessageModule } from '@island.is/judicial-system/message'
 
-import { environment } from '../../../environments'
 import { CaseModule, CourtModule, DefendantModule, EventModule } from '../index'
 import { Notification } from './models/notification.model'
 import { InternalNotificationController } from './internalNotification.controller'
@@ -16,8 +15,8 @@ import { NotificationService } from './notification.service'
 
 @Module({
   imports: [
-    EmailModule.register(environment.emailOptions),
-    SmsModule.register(environment.smsOptions),
+    EmailModule,
+    SmsModule,
     CmsTranslationsModule,
     MessageModule,
     forwardRef(() => CaseModule),

apps/services/auth/ids-api/src/app/app.module.ts

@@ -20,6 +20,7 @@ import {
 } from '@island.is/nest/config'
 import { FeatureFlagConfig } from '@island.is/nest/feature-flags'
 import { ProblemModule } from '@island.is/nest/problem'
+import { smsModuleConfig } from '@island.is/nova-sms'
 
 import { environment } from '../environments'
 import { ClientsModule } from './clients/clients.module'
@@ -66,6 +67,7 @@ import { PasskeysModule } from './passkeys/passkeys.module'
         XRoadConfig,
         PasskeysCoreConfig,
         NationalRegistryV3ClientConfig,
+        smsModuleConfig,
       ],
     }),
   ],

apps/services/auth/ids-api/src/app/notifications/notifications.module.ts

@@ -2,12 +2,11 @@ import { Module } from '@nestjs/common'
 
 import { SmsModule } from '@island.is/nova-sms'
 
-import environment from '../../environments/environment'
 import { NotificationsController } from './notifications.controller'
 import { NotificationsService } from './notifications.service'
 
 @Module({
-  imports: [SmsModule.register(environment.smsOptions)],
+  imports: [SmsModule],
   controllers: [NotificationsController],
   providers: [NotificationsService],
 })

apps/services/auth/ids-api/src/environments/environment.ts

@@ -8,12 +8,6 @@ const devConfig = {
     defaultNamespace: '@island.is/auth-api',
   },
   port: 4333,
-  smsOptions: {
-    url: 'https://smsapi.devnova.is',
-    username: 'IslandIs_User_Development',
-    password: process.env.NOVA_PASSWORD ?? '',
-    acceptUnauthorized: true,
-  },
 }
 
 if (process.env.NODE_ENV === 'production') {
@@ -35,12 +29,6 @@ const prodConfig = {
     serviceName: 'services-auth-api',
   },
   port: 3333,
-  smsOptions: {
-    url: process.env.NOVA_URL ?? '',
-    username: process.env.NOVA_USERNAME ?? '',
-    password: process.env.NOVA_PASSWORD ?? '',
-    acceptUnauthorized: process.env.NOVA_ACCEPT_UNAUTHORIZED === 'true',
-  },
 }
 
 export default process.env.PROD_MODE === 'true' ||

apps/services/endorsements/api/src/app/app.module.ts

@@ -20,6 +20,7 @@ import {
   IdsClientConfig,
   XRoadConfig,
 } from '@island.is/nest/config'
+import { emailModuleConfig } from '@island.is/email-service'
 
 @Module({
   imports: [
@@ -33,7 +34,12 @@ import {
     LoggingModule,
     ConfigModule.forRoot({
       isGlobal: true,
-      load: [NationalRegistryV3ClientConfig, IdsClientConfig, XRoadConfig],
+      load: [
+        NationalRegistryV3ClientConfig,
+        IdsClientConfig,
+        XRoadConfig,
+        emailModuleConfig,
+      ],
     }),
   ],
   providers: [

apps/services/endorsements/api/src/app/modules/endorsement/endorsement.module.ts

@@ -5,15 +5,14 @@ import { EndorsementController } from './endorsement.controller'
 import { EndorsementService } from './endorsement.service'
 import { EndorsementList } from '../endorsementList/endorsementList.model'
 import { EndorsementListService } from '../endorsementList/endorsementList.service'
-import { environment } from '../../../environments'
 import { EmailModule } from '@island.is/email-service'
 import { NationalRegistryV3ClientModule } from '@island.is/clients/national-registry-v3'
 
 @Module({
   imports: [
     NationalRegistryV3ClientModule,
     SequelizeModule.forFeature([Endorsement, EndorsementList]),
-    EmailModule.register(environment.emailOptions),
+    EmailModule,
   ],
   controllers: [EndorsementController],
   providers: [EndorsementService, EndorsementListService],