Merge branch 'main' into fix/add-missing-zendesk-config

apps/application-system/api/infra/application-system-api.ts

@@ -339,6 +339,8 @@ export const serviceSetup = (services: {
         '/k8s/api/ALTHINGI_OMBUDSMAN_XROAD_USERNAME',
       ALTHINGI_OMBUDSMAN_XROAD_PASSWORD:
         '/k8s/api/ALTHINGI_OMBUDSMAN_XROAD_PASSWORD',
+      NATIONAL_REGISTRY_B2C_CLIENT_SECRET:
+        '/k8s/api/NATIONAL_REGISTRY_B2C_CLIENT_SECRET',
     })
     .db()
     .migrations()

apps/application-system/api/src/app/modules/application/template-api.service.ts

@@ -24,7 +24,7 @@ export class TemplateApiApplicationService extends BaseTemplateApiApplicationSer
     super()
   }
 
-  async saveAttachmentToApplicaton(
+  async saveAttachmentToApplication(
     application: ApplicationWithAttachments,
     fileName: string,
     buffer: Buffer,

apps/auth-admin-web/specs/index.spec.tsx

@@ -1,6 +1,5 @@
 import React from 'react'
 import { render } from '@testing-library/react'
-import 'whatwg-fetch'
 import Index from '../pages/index'
 jest.mock('next/router', () => ({
   useRouter: () => ({ push: () => jest.fn() }),

charts/islandis/values.dev.yaml

@@ -796,6 +796,7 @@ application-system-api:
     IDENTITY_SERVER_CLIENT_SECRET: '/k8s/application-system/api/IDENTITY_SERVER_CLIENT_SECRET'
     ISLYKILL_SERVICE_BASEPATH: '/k8s/api/ISLYKILL_SERVICE_BASEPATH'
     ISLYKILL_SERVICE_PASSPHRASE: '/k8s/api/ISLYKILL_SERVICE_PASSPHRASE'
+    NATIONAL_REGISTRY_B2C_CLIENT_SECRET: '/k8s/api/NATIONAL_REGISTRY_B2C_CLIENT_SECRET'
     NOVA_PASSWORD: '/k8s/application-system/api/NOVA_PASSWORD'
     NOVA_URL: '/k8s/application-system-api/NOVA_URL'
     SYSLUMENN_HOST: '/k8s/application-system-api/SYSLUMENN_HOST'

charts/islandis/values.prod.yaml

@@ -784,6 +784,7 @@ application-system-api:
     IDENTITY_SERVER_CLIENT_SECRET: '/k8s/application-system/api/IDENTITY_SERVER_CLIENT_SECRET'
     ISLYKILL_SERVICE_BASEPATH: '/k8s/api/ISLYKILL_SERVICE_BASEPATH'
     ISLYKILL_SERVICE_PASSPHRASE: '/k8s/api/ISLYKILL_SERVICE_PASSPHRASE'
+    NATIONAL_REGISTRY_B2C_CLIENT_SECRET: '/k8s/api/NATIONAL_REGISTRY_B2C_CLIENT_SECRET'
     NOVA_PASSWORD: '/k8s/application-system/api/NOVA_PASSWORD'
     NOVA_URL: '/k8s/application-system-api/NOVA_URL'
     SYSLUMENN_HOST: '/k8s/application-system-api/SYSLUMENN_HOST'

charts/islandis/values.staging.yaml

@@ -793,6 +793,7 @@ application-system-api:
     IDENTITY_SERVER_CLIENT_SECRET: '/k8s/application-system/api/IDENTITY_SERVER_CLIENT_SECRET'
     ISLYKILL_SERVICE_BASEPATH: '/k8s/api/ISLYKILL_SERVICE_BASEPATH'
     ISLYKILL_SERVICE_PASSPHRASE: '/k8s/api/ISLYKILL_SERVICE_PASSPHRASE'
+    NATIONAL_REGISTRY_B2C_CLIENT_SECRET: '/k8s/api/NATIONAL_REGISTRY_B2C_CLIENT_SECRET'
     NOVA_PASSWORD: '/k8s/application-system/api/NOVA_PASSWORD'
     NOVA_URL: '/k8s/application-system-api/NOVA_URL'
     SYSLUMENN_HOST: '/k8s/application-system-api/SYSLUMENN_HOST'

libs/api/domains/education/src/lib/education.module.ts

@@ -4,10 +4,10 @@ import { FeatureFlagModule } from '@island.is/nest/feature-flags'
 import { XRoadConfig, MMSApi } from '@island.is/clients/mms'
 import { FriggResolver, InnaResolver, MainResolver } from './graphql'
 import { EducationService } from './education.service'
-import { S3Service } from './s3.service'
 import { InnaClientModule } from '@island.is/clients/inna'
 import { NationalRegistryV3ClientModule } from '@island.is/clients/national-registry-v3'
 import { FriggClientModule } from '@island.is/clients/mms/frigg'
+import { AwsModule } from '@island.is/nest/aws'
 
 export interface Config {
   fileDownloadBucket: string
@@ -23,7 +23,6 @@ export class EducationModule {
         FriggResolver,
         InnaResolver,
         MainResolver,
-        S3Service,
         EducationService,
         {
           provide: 'CONFIG',
@@ -39,6 +38,7 @@ export class EducationModule {
         FeatureFlagModule,
         NationalRegistryV3ClientModule,
         FriggClientModule,
+        AwsModule,
       ],
       exports: [],
     }

libs/api/domains/education/src/lib/education.service.ts

@@ -17,10 +17,11 @@ import {
   ExamResult,
   Student,
 } from './education.type'
-import { S3Service } from './s3.service'
 import { getYearInterval } from './education.utils'
 import { NationalRegistryV3ClientService } from '@island.is/clients/national-registry-v3'
 import { isDefined } from '@island.is/shared/utils'
+import { S3Service } from '@island.is/nest/aws'
+import { LOGGER_PROVIDER, type Logger } from '@island.is/logging'
 
 @Injectable()
 export class EducationService {
@@ -30,6 +31,7 @@ export class EducationService {
     @Inject('CONFIG')
     private readonly config: Config,
     private readonly nationalRegistryApi: NationalRegistryV3ClientService,
+    @Inject(LOGGER_PROVIDER) protected readonly logger: Logger,
   ) {}
 
   async getLicenses(
@@ -53,11 +55,26 @@ export class EducationService {
       nationalId,
       licenseId,
     )
-
-    return this.s3Service.uploadFileFromStream(responseStream, {
-      fileName: uuid(),
-      bucket: this.config.fileDownloadBucket,
-    })
+    try {
+      const fileLocation = await this.s3Service.uploadFile(
+        responseStream.body,
+        { bucket: this.config.fileDownloadBucket, key: uuid() },
+        {
+          ContentType:
+            responseStream.headers?.get('content-type') || 'application/pdf',
+        },
+      )
+
+      // Presigned URL expires in 65 seconds to allow for download initiation
+      const PRESIGNED_URL_EXPIRY = 65
+      return await this.s3Service.getPresignedUrl(
+        fileLocation,
+        PRESIGNED_URL_EXPIRY,
+      )
+    } catch (error) {
+      this.logger.error(`Failed to process PDF license:`, { error, licenseId })
+      return null
+    }
   }
 
   async getFamily(nationalId: string): Promise<Array<Student>> {

libs/api/domains/education/src/lib/education.spec.ts

@@ -15,7 +15,6 @@ import {
   ADULT_STUDENT1,
 } from './__mock-data__/my-family'
 import { MMSApi } from '@island.is/clients/mms'
-import { S3Service } from './s3.service'
 import {
   NationalRegistryV3ClientConfig,
   NationalRegistryV3ClientModule,
@@ -24,6 +23,7 @@ import {
 import { Student } from './education.type'
 import { ConfigModule } from '@nestjs/config'
 import { XRoadConfig } from '@island.is/nest/config'
+import { AwsModule } from '@island.is/nest/aws'
 
 const config = {
   fileDownloadBucket: '',
@@ -39,13 +39,13 @@ describe('EducationService', () => {
       imports: [
         LoggingModule,
         NationalRegistryV3ClientModule,
+        AwsModule,
         ConfigModule.forRoot({
           isGlobal: true,
           load: [XRoadConfig, NationalRegistryV3ClientConfig],
         }),
       ],
       providers: [
-        S3Service,
         {
           provide: MMSApi,
           useValue: new MMSApi(config.xroad),

libs/api/domains/file-upload/src/lib/file-upload.resolver.ts

@@ -1,7 +1,7 @@
 import { Args, Resolver, Mutation } from '@nestjs/graphql'
-import { S3 } from 'aws-sdk'
 import { PresignedPost } from './presignedPost.model'
 import { FileStorageService } from '@island.is/file-storage'
+import { PresignedPost as S3PresignedPost } from '@aws-sdk/s3-presigned-post'
 
 @Resolver()
 export class FileUploadResolver {
@@ -10,7 +10,7 @@ export class FileUploadResolver {
   @Mutation(() => PresignedPost)
   createUploadUrl(
     @Args('filename') filename: string,
-  ): Promise<S3.PresignedPost> {
+  ): Promise<S3PresignedPost> {
     return this.fileStorageService.generatePresignedPost(filename)
   }
 }

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

@@ -1,9 +1,12 @@
 import { getValueViaPath } from '@island.is/application/core'
-import { ApplicationWithAttachments as Application } from '@island.is/application/types'
-import { S3 } from 'aws-sdk'
-import AmazonS3URI from 'amazon-s3-uri'
+import { ApplicationWithAttachments } from '@island.is/application/types'
 import { logger } from '@island.is/logging'
-import { Injectable } from '@nestjs/common'
+import { Inject, Injectable } from '@nestjs/common'
+import { S3Service } from '@island.is/nest/aws'
+import { ApplicationService } from '@island.is/application/api/core'
+import { sharedModuleConfig } from '../shared.config'
+import { ConfigType } from '@nestjs/config'
+import { uuid } from 'uuidv4'
 
 export interface AttachmentData {
   key: string
@@ -14,13 +17,15 @@ export interface AttachmentData {
 
 @Injectable()
 export class AttachmentS3Service {
-  private readonly s3: AWS.S3
-  constructor() {
-    this.s3 = new S3()
-  }
+  constructor(
+    private readonly s3Service: S3Service,
+    @Inject(sharedModuleConfig.KEY)
+    private config: ConfigType<typeof sharedModuleConfig>,
+    private readonly applicationService: ApplicationService,
+  ) {}
 
   public async getFiles(
-    application: Application,
+    application: ApplicationWithAttachments,
     attachmentAnswerKeys: string[],
   ): Promise<AttachmentData[]> {
     const attachments: AttachmentData[] = []
@@ -43,7 +48,7 @@ export class AttachmentS3Service {
       name: string
     }>,
     answerKey: string,
-    application: Application,
+    application: ApplicationWithAttachments,
   ): Promise<AttachmentData[]> {
     return await Promise.all(
       answers.map(async ({ key, name }) => {
@@ -58,30 +63,81 @@ export class AttachmentS3Service {
           return { key: '', fileContent: '', answerKey, fileName: '' }
         }
         const fileContent =
-          (await this.getApplicationFilecontentAsBase64(url)) ?? ''
+          (await this.s3Service.getFileContent(url, 'base64')) ?? ''
 
         return { key, fileContent, answerKey, fileName: name }
       }),
     )
   }
 
-  private async getApplicationFilecontentAsBase64(
+  async addAttachment(
+    application: ApplicationWithAttachments,
     fileName: string,
-  ): Promise<string | undefined> {
-    const { bucket, key } = AmazonS3URI(fileName)
-    const uploadBucket = bucket
-    try {
-      const file = await this.s3
-        .getObject({
-          Bucket: uploadBucket,
-          Key: key,
-        })
-        .promise()
-      const fileContent = file.Body as Buffer
-      return fileContent?.toString('base64')
-    } catch (error) {
-      logger.error(error)
-      return undefined
+    buffer: Buffer,
+    uploadParameters?: {
+      ContentType?: string
+      ContentDisposition?: string
+      ContentEncoding?: string
+    },
+  ): Promise<string> {
+    return this.saveAttachmentToApplication(
+      application,
+      fileName,
+      buffer,
+      uploadParameters,
+    )
+  }
+
+  async saveAttachmentToApplication(
+    application: ApplicationWithAttachments,
+    fileName: string,
+    buffer: Buffer,
+    uploadParameters?: {
+      ContentType?: string
+      ContentDisposition?: string
+      ContentEncoding?: string
+    },
+  ): Promise<string> {
+    const uploadBucket = this.config.templateApi.attachmentBucket
+    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.s3Service.uploadFile(
+      buffer,
+      { bucket: uploadBucket, key: s3key },
+      uploadParameters,
+    )
+
+    await this.applicationService.update(application.id, {
+      attachments: {
+        ...(application.attachments || {}),
+        [attachmentKey]: url,
+      },
+    })
+
+    return attachmentKey
+  }
+
+  async getAttachmentUrl(
+    application: ApplicationWithAttachments,
+    attachmentKey: string,
+    expiration: number,
+  ): Promise<string> {
+    if (expiration <= 0) {
+      throw new Error('Expiration must be positive')
     }
+    const fileName = (
+      application.attachments as {
+        [key: string]: string
+      }
+    )[attachmentKey]
+
+    if (!fileName) {
+      throw new Error('Attachment not found')
+    }
+
+    return this.s3Service.getPresignedUrl(fileName, expiration)
   }
 }