chore(application-system): using aws-sdkv3 initial implementation

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

@@ -42,8 +42,7 @@ export class TemplateApiApplicationService extends BaseTemplateApiApplicationSer
     const s3key = `${application.id}/${attachmentKey}`
     const url = await this.awsService.uploadFile(
       buffer,
-      uploadBucket,
-      s3key,
+      { bucket: uploadBucket, key: s3key },
       uploadParameters,
     )
 

apps/services/endorsements/api/src/app/modules/endorsementList/endorsementList.service.ts

@@ -810,10 +810,10 @@ export class EndorsementListService {
       await this.uploadFileToS3(fileBuffer, filename, fileType)
 
       // Generate presigned URL with 60 minutes expiration
-      const url = await this.awsService.getPresignedUrl(
-        environment.exportsBucketName,
-        filename,
-      )
+      const url = await this.awsService.getPresignedUrl({
+        bucket: environment.exportsBucketName,
+        key: filename,
+      })
       return { url }
     } catch (error) {
       this.logger.error(`Failed to export list ${listId}`, { error })
@@ -878,8 +878,7 @@ export class EndorsementListService {
     try {
       await this.awsService.uploadFile(
         fileBuffer,
-        environment.exportsBucketName,
-        filename,
+        { bucket: environment.exportsBucketName, key: filename },
         {
           ContentType: fileType === 'pdf' ? 'application/pdf' : 'text/csv',
         },

apps/system-e2e/src/tests/islandis/application-system/acceptance/parental-leave.spec.ts

@@ -23,6 +23,7 @@ import {
 import { helpers } from '../../../../support/locator-helpers'
 import { session } from '../../../../support/session'
 import { setupXroadMocks } from './setup-xroad.mocks'
+import { createMockPdf, deleteMockPdf } from '../../../../support/utils'
 
 test.use({ baseURL: urls.islandisBaseUrl })
 
@@ -323,6 +324,19 @@ test.describe('Parental leave', () => {
         name: label(parentalLeaveFormMessages.attachmentScreen.title),
       }),
     ).toBeVisible()
+
+    // Upload additional document
+    createMockPdf()
+    const fileChooserPromise = page.waitForEvent('filechooser')
+    await page
+      .getByRole('button', {
+        name: label(parentalLeaveFormMessages.fileUpload.attachmentButton),
+      })
+      .click()
+    const filechooser = await fileChooserPromise
+    await filechooser.setFiles('./mockPdf.pdf')
+    await page.waitForTimeout(1000)
+    deleteMockPdf()
     await proceed()
 
     // These are your rights

libs/application/api/files/src/lib/file.service.spec.ts

@@ -5,7 +5,7 @@ import {
   signingModuleConfig,
   SigningService,
 } from '@island.is/dokobit-signing'
-import { AwsService } from '@island.is/nest/aws'
+import { AwsModule, AwsService } from '@island.is/nest/aws'
 import * as pdf from './pdfGenerators'
 import { Application } from '@island.is/application/api/core'
 import { ApplicationTypes, PdfTypes } from '@island.is/application/types'
@@ -115,6 +115,7 @@ describe('FileService', () => {
       imports: [
         LoggingModule,
         SigningModule,
+        AwsModule,
         ConfigModule.forRoot({
           isGlobal: true,
           load: [
@@ -124,14 +125,14 @@ describe('FileService', () => {
           ],
         }),
       ],
-      providers: [FileService, AwsService],
+      providers: [FileService],
     }).compile()
 
     awsService = module.get(AwsService)
 
     jest
-      .spyOn(awsService, 'getFile')
-      .mockImplementation(() => Promise.resolve({ Body: 'body' }))
+      .spyOn(awsService, 'getFileContent')
+      .mockImplementation(() => Promise.resolve('body'))
 
     jest.spyOn(awsService, 'fileExists').mockResolvedValue(false)
 
@@ -174,16 +175,18 @@ describe('FileService', () => {
 
     expect(awsService.uploadFile).toHaveBeenCalledWith(
       Buffer.from('buffer'),
-      bucket,
-      fileName,
+      { bucket, key: fileName },
       {
         ContentEncoding: 'base64',
         ContentDisposition: 'inline',
         ContentType: 'application/pdf',
       },
     )
 
-    expect(awsService.getPresignedUrl).toHaveBeenCalledWith(bucket, fileName)
+    expect(awsService.getPresignedUrl).toHaveBeenCalledWith({
+      bucket: bucket,
+      key: fileName,
+    })
 
     expect(response).toEqual('url')
   })
@@ -195,9 +198,9 @@ describe('FileService', () => {
       PdfTypes.CHILDREN_RESIDENCE_CHANGE,
     )
 
-    expect(awsService.getFile).toHaveBeenCalledWith(
-      bucket,
-      `children-residence-change/${application.id}.pdf`,
+    expect(awsService.getFileContent).toHaveBeenCalledWith(
+      { bucket, key: `children-residence-change/${application.id}.pdf` },
+      'binary',
     )
 
     expect(signingService.requestSignature).toHaveBeenCalledWith(
@@ -221,8 +224,8 @@ describe('FileService', () => {
     const application = createApplication()
 
     jest
-      .spyOn(awsService, 'getFile')
-      .mockImplementation(() => Promise.resolve({ Body: '' }))
+      .spyOn(awsService, 'getFileContent')
+      .mockImplementation(() => Promise.resolve(''))
 
     const act = async () =>
       await service.requestFileSignature(
@@ -232,9 +235,9 @@ describe('FileService', () => {
 
     await expect(act).rejects.toThrowError(NotFoundException)
 
-    expect(awsService.getFile).toHaveBeenCalledWith(
-      bucket,
-      `children-residence-change/${applicationId}.pdf`,
+    expect(awsService.getFileContent).toHaveBeenCalledWith(
+      { bucket: bucket, key: `children-residence-change/${applicationId}.pdf` },
+      'binary',
     )
 
     expect(signingService.requestSignature).not.toHaveBeenCalled()
@@ -268,7 +271,10 @@ describe('FileService', () => {
       PdfTypes.CHILDREN_RESIDENCE_CHANGE,
     )
 
-    expect(awsService.getPresignedUrl).toHaveBeenCalledWith(bucket, fileName)
+    expect(awsService.getPresignedUrl).toHaveBeenCalledWith({
+      bucket,
+      key: fileName,
+    })
     expect(result).toEqual('url')
   })
 

libs/application/api/files/src/lib/file.service.ts

@@ -54,16 +54,22 @@ export class FileService {
     const fileName = `${BucketTypePrefix[pdfType]}/${application.id}.pdf`
     const bucket = this.getBucketName()
 
-    if ((await this.awsService.fileExists(bucket, fileName)) === false) {
+    if (
+      (await this.awsService.fileExists({ bucket, key: fileName })) === false
+    ) {
       const content = await this.createFile(application, pdfType)
-      await this.awsService.uploadFile(content, bucket, fileName, {
-        ContentEncoding: 'base64',
-        ContentDisposition: 'inline',
-        ContentType: 'application/pdf',
-      })
+      await this.awsService.uploadFile(
+        content,
+        { bucket, key: fileName },
+        {
+          ContentEncoding: 'base64',
+          ContentDisposition: 'inline',
+          ContentType: 'application/pdf',
+        },
+      )
     }
 
-    return await this.awsService.getPresignedUrl(bucket, fileName)
+    return await this.awsService.getPresignedUrl({ bucket, key: fileName })
   }
 
   async uploadSignedFile(
@@ -79,11 +85,10 @@ export class FileService {
       .waitForSignature(DokobitFileName[pdfType], documentToken)
       .then(async (file) => {
         const s3FileName = `${BucketTypePrefix[pdfType]}/${application.id}.pdf`
-        await this.awsService.uploadFile(
-          Buffer.from(file, 'binary'),
+        await this.awsService.uploadFile(Buffer.from(file, 'binary'), {
           bucket,
-          s3FileName,
-        )
+          key: s3FileName,
+        })
       })
       .catch((error) => {
         if (error.code === DokobitErrorCodes.NoMobileSignature) {
@@ -130,7 +135,7 @@ export class FileService {
 
     const fileName = `${BucketTypePrefix[pdfType]}/${application.id}.pdf`
 
-    return await this.awsService.getPresignedUrl(bucket, fileName)
+    return await this.awsService.getPresignedUrl({ bucket, key: fileName })
   }
 
   private async createFile(application: Application, pdfType: PdfTypes) {
@@ -148,8 +153,10 @@ export class FileService {
   ) {
     const bucket = this.getBucketName()
     const s3FileName = `${BucketTypePrefix[pdfType]}/${application.id}.pdf`
-    const s3File = await this.awsService.getFile(bucket, s3FileName)
-    const fileContent = s3File.Body?.toString('binary')
+    const fileContent = await this.awsService.getFileContent(
+      { bucket, key: s3FileName },
+      'binary',
+    )
 
     const { phoneNumber, name, title } = this.getSigningOptionsFromApplication(
       application,
@@ -224,7 +231,7 @@ export class FileService {
 
   async getAttachmentPresignedURL(fileName: string) {
     const { bucket, key } = AmazonS3URI(fileName)
-    const url = await this.awsService.getPresignedUrl(bucket, key)
+    const url = await this.awsService.getPresignedUrl({ bucket, key })
     return { url }
   }
 
@@ -250,7 +257,7 @@ export class FileService {
 
         try {
           this.logger.info(`Deleting attachment ${s3key} from bucket ${bucket}`)
-          await this.awsService.deleteObject(bucket, s3key)
+          await this.awsService.deleteObject({ bucket, key: s3key })
           result = {
             ...result,
             deleted: result.deleted++,

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

@@ -269,8 +269,7 @@ export class SharedTemplateApiService {
     const s3key = `${application.id}/${attachmentKey}`
     const url = await this.awsService.uploadFile(
       buffer,
-      uploadBucket,
-      s3key,
+      { bucket: uploadBucket, key: s3key },
       uploadParameters,
     )
 

libs/application/template-api-modules/src/lib/modules/templates/parental-leave/parental-leave.module.ts

@@ -9,6 +9,7 @@ import {
   NationalRegistryClientModule,
   NationalRegistryClientService,
 } from '@island.is/clients/national-registry-v2'
+import { AwsModule } from '@island.is/nest/aws'
 
 @Module({
   imports: [
@@ -17,6 +18,7 @@ import {
     SmsModule,
     ApplicationApiCoreModule,
     NationalRegistryClientModule,
+    AwsModule,
   ],
   providers: [
     ChildrenService,

libs/application/template-api-modules/src/lib/modules/templates/parental-leave/parental-leave.service.ts

@@ -1,6 +1,5 @@
 import { Inject, Injectable } from '@nestjs/common'
-import { S3 } from 'aws-sdk'
-
+import { AwsService } from '@island.is/nest/aws'
 import { getValueViaPath } from '@island.is/application/core'
 import {
   ADOPTION,
@@ -102,8 +101,6 @@ interface VMSTError {
 
 @Injectable()
 export class ParentalLeaveService extends BaseTemplateApiService {
-  s3 = new S3()
-
   constructor(
     @Inject(LOGGER_PROVIDER) private logger: Logger,
     private parentalLeaveApi: ParentalLeaveApi,
@@ -114,6 +111,7 @@ export class ParentalLeaveService extends BaseTemplateApiService {
     private readonly configService: ConfigService<SharedModuleConfig>,
     private readonly childrenService: ChildrenService,
     private readonly nationalRegistryApi: NationalRegistryClientService,
+    private readonly awsService: AwsService,
   ) {
     super(ApplicationTypes.PARENTAL_LEAVE)
   }
@@ -384,16 +382,19 @@ export class ParentalLeaveService extends BaseTemplateApiService {
       )
 
       const Key = `${application.id}/${filename}`
-      const file = await this.s3
-        .getObject({ Bucket: this.config.templateApi.attachmentBucket, Key })
-        .promise()
-      const fileContent = file.Body as Buffer
+      const fileContent = await this.awsService.getFileContent(
+        {
+          bucket: this.config.templateApi.attachmentBucket,
+          key: Key,
+        },
+        'base64',
+      )
 
       if (!fileContent) {
         throw new Error('File content was undefined')
       }
 
-      return fileContent.toString('base64')
+      return fileContent
     } catch (e) {
       this.logger.error('Cannot get ' + fileUpload + ' attachment', { e })
       throw new Error('Failed to get the ' + fileUpload + ' attachment')

libs/nest/aws/src/lib/aws.module.ts

@@ -1,9 +1,16 @@
 import { Module } from '@nestjs/common'
 import { AwsService } from './aws.service'
+import { S3Client } from '@aws-sdk/client-s3'
 
 @Module({
   controllers: [],
-  providers: [AwsService],
+  providers: [
+    AwsService,
+    {
+      provide: S3Client,
+      useValue: new S3Client(),
+    },
+  ],
   exports: [AwsService],
 })
 export class AwsModule {}