SharedTemplateAPIModule no longer dynamically registered

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

@@ -14,7 +14,6 @@ import { environment } from '../../../environments'
 import { ApplicationAccessService } from './tools/applicationAccess.service'
 
 import { LoggingModule } from '@island.is/logging'
-import { TemplateApiApplicationService } from './template-api.service'
 import { AwsModule } from '@island.is/nest/aws'
 import { ApplicationApiCoreModule } from '@island.is/application/api/core'
 import { FeatureFlagModule } from '@island.is/nest/feature-flags'
@@ -35,10 +34,7 @@ import { ApplicationActionService } from './application-action.service'
     PaymentModule,
     AuditModule.forRoot(environment.audit),
     AuthModule.register(environment.auth),
-    TemplateAPIModule.register({
-      ...environment.templateApi,
-      applicationService: TemplateApiApplicationService,
-    }),
+    TemplateAPIModule.register(environment.templateApi),
     ApplicationApiCoreModule,
     createBullModule(),
     ApplicationFilesModule,

libs/application/template-api-modules/README.md

@@ -35,7 +35,7 @@ export class ReferenceTemplateModule {
   static register(config: BaseTemplateAPIModuleConfig): DynamicModule {
     return {
       module: ReferenceTemplateModule,
-      imports: [SharedTemplateAPIModule.register(config)],
+      imports: [SharedTemplateAPIModule],
       providers: [ReferenceTemplateService],
       exports: [ReferenceTemplateService],
     }

libs/application/template-api-modules/src/lib/modules/shared/shared.module.ts

@@ -1,42 +1,23 @@
-import { DynamicModule } from '@nestjs/common'
-import { ConfigModule } from '@nestjs/config'
+import { Module } from '@nestjs/common'
 import { EmailModule } from '@island.is/email-service'
 import { ApplicationApiCoreModule } from '@island.is/application/api/core'
 import { AwsModule } from '@island.is/nest/aws'
-import {
-  BaseTemplateAPIModuleConfig,
-  BaseTemplateApiApplicationService,
-} from '../../types'
 import { SharedTemplateApiService } from './shared.service'
 import { SmsModule } from '@island.is/nova-sms'
 import { PaymentModule } from '@island.is/application/api/payment'
 import { AttachmentS3Service } from './services'
+import { ApplicationModule } from './api/application/application.module'
 
-export class SharedTemplateAPIModule {
-  static register(config: BaseTemplateAPIModuleConfig): DynamicModule {
-    const configuration = () => config
-
-    return {
-      module: SharedTemplateAPIModule,
-      imports: [
-        ConfigModule.forRoot({
-          load: [configuration],
-        }),
-        EmailModule,
-        SmsModule,
-        ApplicationApiCoreModule,
-        AwsModule,
-        PaymentModule,
-      ],
-      providers: [
-        SharedTemplateApiService,
-        {
-          provide: BaseTemplateApiApplicationService,
-          useClass: config.applicationService,
-        },
-        AttachmentS3Service,
-      ],
-      exports: [SharedTemplateApiService, AttachmentS3Service],
-    }
-  }
-}
+@Module({
+  imports: [
+    EmailModule,
+    SmsModule,
+    ApplicationApiCoreModule,
+    AwsModule,
+    PaymentModule,
+    ApplicationModule,
+  ],
+  providers: [SharedTemplateApiService, AttachmentS3Service],
+  exports: [SharedTemplateApiService, AttachmentS3Service],
+})
+export class SharedTemplateAPIModule {}

libs/application/template-api-modules/src/lib/modules/shared/shared.service.ts

@@ -1,5 +1,5 @@
 import { Inject, Injectable } from '@nestjs/common'
-import { ConfigType } from '@nestjs/config'
+import { ConfigService, ConfigType } from '@nestjs/config'
 import { EmailService } from '@island.is/email-service'
 import {
   Application,
@@ -23,6 +23,11 @@ import { PaymentService } from '@island.is/application/api/payment'
 import { User } from '@island.is/auth-nest-tools'
 import { ExtraData } from '@island.is/clients/charge-fjs-v2'
 import { sharedModuleConfig } from './shared.config'
+import { ApplicationService } from '@island.is/application/api/core'
+import jwt from 'jsonwebtoken'
+import { uuid } from 'uuidv4'
+import { TemplateAPIConfig } from '../..'
+import { AwsService } from '@island.is/nest/aws'
 
 @Injectable()
 export class SharedTemplateApiService {
@@ -36,15 +41,17 @@ export class SharedTemplateApiService {
     private readonly smsService: SmsService,
     @Inject(sharedModuleConfig.KEY)
     private config: ConfigType<typeof sharedModuleConfig>,
-    @Inject(BaseTemplateApiApplicationService)
-    private readonly applicationService: BaseTemplateApiApplicationService,
+    @Inject(ConfigService)
+    private readonly configService: ConfigService<TemplateAPIConfig>,
+    private readonly applicationService: ApplicationService,
     private readonly paymentService: PaymentService,
+    private readonly awsService: AwsService,
   ) {
     this.s3 = new S3()
   }
 
   async createAssignToken(application: Application, expiresIn: number) {
-    const token = await this.applicationService.createAssignToken(
+    const token = await this.createToken(
       application,
       this.config.jwtSecret,
       expiresIn,
@@ -204,7 +211,7 @@ export class SharedTemplateApiService {
       ContentEncoding?: string
     },
   ): Promise<string> {
-    return this.applicationService.saveAttachmentToApplicaton(
+    return this.saveAttachmentToApplicaton(
       application,
       fileName,
       buffer,
@@ -265,4 +272,69 @@ export class SharedTemplateApiService {
       Expires: expiration,
     })
   }
+
+  async saveAttachmentToApplicaton(
+    application: ApplicationWithAttachments,
+    fileName: string,
+    buffer: Buffer,
+    uploadParameters?: {
+      ContentType?: string
+      ContentDisposition?: string
+      ContentEncoding?: string
+    },
+  ): Promise<string> {
+    const uploadBucket = this.configService.get('attachmentBucket') as string
+    if (!uploadBucket) throw new Error('No attachment bucket configured')
+
+    const fileId = uuid()
+    const attachmentKey = `${fileId}-${fileName}`
+    const s3key = `${application.id}/${attachmentKey}`
+    const url = await this.awsService.uploadFile(
+      buffer,
+      uploadBucket,
+      s3key,
+      uploadParameters,
+    )
+
+    await this.applicationService.update(application.id, {
+      attachments: {
+        ...application.attachments,
+        [attachmentKey]: url,
+      },
+    })
+
+    return attachmentKey
+  }
+
+  async storeNonceForApplication(application: Application): Promise<string> {
+    const nonce = uuid()
+
+    const applicationToUpdate = await this.applicationService.findOneById(
+      application.id,
+    )
+
+    if (!applicationToUpdate) throw new Error('Application not found')
+
+    await this.applicationService.addNonce(applicationToUpdate, nonce)
+
+    return nonce
+  }
+
+  async createToken(
+    application: Application,
+    secret: string,
+    expiresIn: number,
+  ): Promise<string> {
+    const nonce = await this.storeNonceForApplication(application)
+    const token = jwt.sign(
+      {
+        applicationId: application.id,
+        state: application.state,
+        nonce,
+      },
+      secret,
+      { expiresIn },
+    )
+    return token
+  }
 }

libs/application/template-api-modules/src/lib/modules/templates/accident-notification/accident-notification.module.ts

@@ -24,10 +24,7 @@ export class AccidentNotificationModule {
   static register(config: BaseTemplateAPIModuleConfig): DynamicModule {
     return {
       module: AccidentNotificationModule,
-      imports: [
-        SharedTemplateAPIModule.register(config),
-        HealthInsuranceV2ClientModule,
-      ],
+      imports: [SharedTemplateAPIModule, HealthInsuranceV2ClientModule],
       providers: [
         {
           provide: ACCIDENT_NOTIFICATION_CONFIG,

libs/application/template-api-modules/src/lib/modules/templates/accident-notification/accident-notification.service.spec.ts

@@ -22,8 +22,9 @@ import set from 'lodash/set'
 import { S3Service } from './attachments/s3.service'
 import { SmsService } from '@island.is/nova-sms'
 import { PaymentService } from '@island.is/application/api/payment'
-import { templateAPIConfig } from '../../template-api.config'
 import { sharedModuleConfig } from '../../shared/shared.config'
+import { ApplicationService } from '@island.is/application/api/core'
+import { AwsService } from '@island.is/nest/aws'
 const nationalId = '1234564321'
 let id = 0
 
@@ -125,6 +126,14 @@ describe('AccidentNotificationService', () => {
             applicationSenderEmail: '',
           },
         },
+        {
+          provide: ApplicationService,
+          useValue: {},
+        },
+        {
+          provide: AwsService,
+          useValue: {},
+        },
         AccidentNotificationAttachmentProvider,
         SharedTemplateApiService,
       ],

libs/application/template-api-modules/src/lib/modules/templates/announcement-of-death/announcement-of-death.module.ts

@@ -16,7 +16,7 @@ export class AnnouncementOfDeathModule {
       imports: [
         NationalRegistryClientModule,
         SyslumennClientModule,
-        SharedTemplateAPIModule.register(config),
+        SharedTemplateAPIModule,
         ConfigModule.forRoot({
           isGlobal: true,
           load: [XRoadConfig, NationalRegistryClientConfig],

libs/application/template-api-modules/src/lib/modules/templates/aosh/change-machine-supervisor/change-machine-supervisor.module.ts

@@ -14,7 +14,7 @@ export class ChangeMachineSupervisorTemplateModule {
     return {
       module: ChangeMachineSupervisorTemplateModule,
       imports: [
-        SharedTemplateAPIModule.register(config),
+        SharedTemplateAPIModule,
         WorkMachinesClientModule,
         ConfigModule.forRoot({
           isGlobal: true,

libs/application/template-api-modules/src/lib/modules/templates/aosh/deregister-machine/deregister-machine.module.ts

@@ -14,7 +14,7 @@ export class DeregisterMachineTemplateModule {
     return {
       module: DeregisterMachineTemplateModule,
       imports: [
-        SharedTemplateAPIModule.register(config),
+        SharedTemplateAPIModule,
         WorkMachinesClientModule,
         ConfigModule.forRoot({
           isGlobal: true,

libs/application/template-api-modules/src/lib/modules/templates/aosh/register-new-machine/register-new-machine.module.ts

@@ -14,7 +14,7 @@ export class RegisterNewMachineTemplateModule {
     return {
       module: RegisterNewMachineTemplateModule,
       imports: [
-        SharedTemplateAPIModule.register(config),
+        SharedTemplateAPIModule,
         WorkMachinesClientModule,
         ConfigModule.forRoot({
           isGlobal: true,

libs/application/template-api-modules/src/lib/modules/templates/aosh/request-inspection/request-inspection.module.ts

@@ -14,7 +14,7 @@ export class RequestInspectionTemplateModule {
     return {
       module: RequestInspectionTemplateModule,
       imports: [
-        SharedTemplateAPIModule.register(config),
+        SharedTemplateAPIModule,
         WorkMachinesClientModule,
         ConfigModule.forRoot({
           isGlobal: true,

libs/application/template-api-modules/src/lib/modules/templates/aosh/street-registration/street-registration.module.ts

@@ -17,7 +17,7 @@ export class StreetRegistrationTemplateModule {
     return {
       module: StreetRegistrationTemplateModule,
       imports: [
-        SharedTemplateAPIModule.register(config),
+        SharedTemplateAPIModule,
         WorkMachinesClientModule,
         ChargeFjsV2ClientModule,
         ConfigModule.forRoot({

libs/application/template-api-modules/src/lib/modules/templates/aosh/transfer-of-machine-ownership/transfer-of-machine-ownership.module.ts

@@ -17,7 +17,7 @@ export class TransferOfMachineOwnershipTemplateModule {
     return {
       module: TransferOfMachineOwnershipTemplateModule,
       imports: [
-        SharedTemplateAPIModule.register(config),
+        SharedTemplateAPIModule,
         WorkMachinesClientModule,
         ChargeFjsV2ClientModule,
         ConfigModule.forRoot({

libs/application/template-api-modules/src/lib/modules/templates/car-recycling/car-recycling.module.ts

@@ -13,7 +13,7 @@ export class CarRecyclingModule {
       module: CarRecyclingModule,
       imports: [
         CarRecyclingClientModule,
-        SharedTemplateAPIModule.register(config),
+        SharedTemplateAPIModule,
         ApplicationApiCoreModule,
         VehiclesClientModule,
       ],

libs/application/template-api-modules/src/lib/modules/templates/children-residence-change-v2/children-residence-change.module.ts

@@ -12,7 +12,7 @@ export class ChildrenResidenceChangeModuleV2 {
       module: ChildrenResidenceChangeModuleV2,
       imports: [
         SyslumennClientModule,
-        SharedTemplateAPIModule.register(config),
+        SharedTemplateAPIModule,
         SmsModule,
         NationalRegistryClientModule,
       ],

libs/application/template-api-modules/src/lib/modules/templates/children-residence-change/children-residence-change.module.ts

@@ -15,7 +15,7 @@ export class ChildrenResidenceChangeModule {
       module: ChildrenResidenceChangeModule,
       imports: [
         SyslumennClientModule,
-        SharedTemplateAPIModule.register(config),
+        SharedTemplateAPIModule,
         SmsModule,
         NationalRegistryClientModule,
       ],

libs/application/template-api-modules/src/lib/modules/templates/complaints-to-althingi-ombudsman/complaints-to-althingi-ombudsman.module.ts

@@ -24,7 +24,7 @@ export class ComplaintsToAlthingiOmbudsmanTemplateModule {
     return {
       module: ComplaintsToAlthingiOmbudsmanTemplateModule,
       imports: [
-        SharedTemplateAPIModule.register(config),
+        SharedTemplateAPIModule,
         FileStorageModule,
         ClientsAlthingiOmbudsmanModule,
       ],

libs/application/template-api-modules/src/lib/modules/templates/criminal-record-submission/criminal-record-submission.module.ts

@@ -13,7 +13,7 @@ export class CriminalRecordSubmissionModule {
     return {
       module: CriminalRecordSubmissionModule,
       imports: [
-        SharedTemplateAPIModule.register(baseConfig),
+        SharedTemplateAPIModule,
         CriminalRecordModule,
         SyslumennClientModule,
       ],

libs/application/template-api-modules/src/lib/modules/templates/data-protection-complaint/data-protection-complaint.module.ts

@@ -20,7 +20,7 @@ export class DataProtectionComplaintModule {
     return {
       module: DataProtectionComplaintModule,
       imports: [
-        SharedTemplateAPIModule.register(config),
+        SharedTemplateAPIModule,
         FileStorageModule,
         ClientsDataProtectionComplaintModule,
       ],

libs/application/template-api-modules/src/lib/modules/templates/directorate-of-immigration/citizenship/citizenship.module.ts

@@ -14,7 +14,7 @@ export class CitizenshipModule {
     return {
       module: CitizenshipModule,
       imports: [
-        SharedTemplateAPIModule.register(baseConfig),
+        SharedTemplateAPIModule,
         DirectorateOfImmigrationClientModule,
         NationalRegistryClientModule,
         ConfigModule.forRoot({

libs/application/template-api-modules/src/lib/modules/templates/document-provider-onboarding/document-provider-onboarding.module.ts

@@ -12,7 +12,7 @@ export class DocumentProviderOnboardingModule {
     return {
       module: DocumentProviderOnboardingModule,
       imports: [
-        SharedTemplateAPIModule.register(config),
+        SharedTemplateAPIModule,
         ClientsDocumentProviderModule.register({
           basePath: SERVICE_DOCUMENTS_BASEPATH,
         }),

libs/application/template-api-modules/src/lib/modules/templates/driving-learners-permit/driving-learners-permit.module.ts

@@ -15,10 +15,7 @@ export class DrivingLearnersPermitModule {
   static register(config: BaseTemplateAPIModuleConfig): DynamicModule {
     return {
       module: DrivingLearnersPermitModule,
-      imports: [
-        DrivingLicenseApiModule,
-        SharedTemplateAPIModule.register(config),
-      ],
+      imports: [DrivingLicenseApiModule, SharedTemplateAPIModule],
       providers: [DrivingLearnersPermitService],
       exports: [DrivingLearnersPermitService],
     }