fix(application-system): using aws-sdkv3 instead of v2 and refactoring

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

@@ -712,10 +712,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 })
@@ -780,8 +780,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',
         },

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

@@ -51,19 +51,23 @@ export class FileService {
   async generatePdf(application: Application, pdfType: PdfTypes) {
     this.validateApplicationType(application.typeId)
 
-    const fileName = `${BucketTypePrefix[pdfType]}/${application.id}.pdf`
+    const key = `${BucketTypePrefix[pdfType]}/${application.id}.pdf`
     const bucket = this.getBucketName()
 
-    if ((await this.awsService.fileExists(bucket, fileName)) === false) {
+    if ((await this.awsService.fileExists({ bucket, key })) === 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 },
+        {
+          ContentEncoding: 'base64',
+          ContentDisposition: 'inline',
+          ContentType: 'application/pdf',
+        },
+      )
     }
 
-    return await this.awsService.getPresignedUrl(bucket, fileName)
+    return await this.awsService.getPresignedUrl({ bucket, key })
   }
 
   async uploadSignedFile(
@@ -79,11 +83,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) {
@@ -128,9 +131,9 @@ export class FileService {
 
     const bucket = this.getBucketName()
 
-    const fileName = `${BucketTypePrefix[pdfType]}/${application.id}.pdf`
+    const key = `${BucketTypePrefix[pdfType]}/${application.id}.pdf`
 
-    return await this.awsService.getPresignedUrl(bucket, fileName)
+    return await this.awsService.getPresignedUrl({ bucket, key })
   }
 
   private async createFile(application: Application, pdfType: PdfTypes) {
@@ -147,9 +150,11 @@ export class FileService {
     pdfType: PdfTypes,
   ) {
     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 key = `${BucketTypePrefix[pdfType]}/${application.id}.pdf`
+    const fileContent = await this.awsService.getFileContent(
+      { bucket, key },
+      'binary',
+    )
 
     const { phoneNumber, name, title } = this.getSigningOptionsFromApplication(
       application,
@@ -223,8 +228,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(fileName)
     return { url }
   }
 
@@ -250,7 +254,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/services/attachment-s3.service.ts

@@ -1,9 +1,14 @@
 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 { ConfigService } from '@nestjs/config'
+import {
+  BaseTemplateApiApplicationService,
+  BaseTemplateAPIModuleConfig,
+} from '../../../types'
+import AmazonS3URI from 'amazon-s3-uri'
+import { AwsService } from '@island.is/nest/aws'
 
 export interface AttachmentData {
   key: string
@@ -14,13 +19,16 @@ export interface AttachmentData {
 
 @Injectable()
 export class AttachmentS3Service {
-  private readonly s3: AWS.S3
-  constructor() {
-    this.s3 = new S3()
-  }
+  constructor(
+    @Inject(AwsService) private awsService: AwsService,
+    @Inject(ConfigService)
+    private readonly configService: ConfigService<BaseTemplateAPIModuleConfig>,
+    @Inject(BaseTemplateApiApplicationService)
+    private readonly applicationService: BaseTemplateApiApplicationService,
+  ) {}
 
   public async getFiles(
-    application: Application,
+    application: ApplicationWithAttachments,
     attachmentAnswerKeys: string[],
   ): Promise<AttachmentData[]> {
     const attachments: AttachmentData[] = []
@@ -43,45 +51,94 @@ export class AttachmentS3Service {
       name: string
     }>,
     answerKey: string,
-    application: Application,
+    application: ApplicationWithAttachments,
   ): Promise<AttachmentData[]> {
     return await Promise.all(
       answers.map(async ({ key, name }) => {
-        const url = (
-          application.attachments as {
-            [key: string]: string
-          }
-        )[key]
-
+        const url = this.getFilenameFromApplication(application, key)
         if (!url) {
           logger.info('Failed to get url from application state')
           return { key: '', fileContent: '', answerKey, fileName: '' }
         }
         const fileContent =
-          (await this.getApplicationFilecontentAsBase64(url)) ?? ''
+          (await this.awsService.getFileContent(url, 'base64')) ?? ''
 
         return { key, fileContent, answerKey, fileName: name }
       }),
     )
   }
 
-  private async getApplicationFilecontentAsBase64(
-    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
+  public async getAttachmentContentAsBase64(
+    application: ApplicationWithAttachments,
+    attachmentKey: string,
+  ): Promise<string> {
+    const { bucket, key } = AmazonS3URI(
+      this.getFilenameFromApplication(application, attachmentKey),
+    )
+    const fileContent = await this.awsService.getFile({ bucket, key })
+    return fileContent?.Body?.transformToString('base64') || ''
+  }
+
+  public async getAttachmentContentAsBlob(
+    application: ApplicationWithAttachments,
+    attachmentKey: string,
+  ): Promise<Blob> {
+    const { bucket, key } = AmazonS3URI(
+      this.getFilenameFromApplication(application, attachmentKey),
+    )
+    const file = await this.awsService.getFile({ bucket, key })
+    const fileArrayBuffer = await file?.Body?.transformToByteArray()
+    return new Blob([fileArrayBuffer as ArrayBuffer], {
+      type: file?.ContentType,
+    })
+  }
+
+  public async getAttachmentUrl(
+    key: string,
+    expiration: number,
+  ): Promise<string> {
+    if (expiration <= 0) {
+      return Promise.reject('expiration must be positive')
     }
+
+    const bucket = this.configService.get('attachmentBucket') as
+      | string
+      | undefined
+
+    if (bucket == undefined) {
+      return Promise.reject('could not find s3 bucket')
+    }
+
+    return this.awsService.getPresignedUrl({ bucket, key }, expiration)
+  }
+
+  public async addAttachment(
+    application: ApplicationWithAttachments,
+    fileName: string,
+    buffer: Buffer,
+    uploadParameters?: {
+      ContentType?: string
+      ContentDisposition?: string
+      ContentEncoding?: string
+    },
+  ): Promise<string> {
+    return this.applicationService.saveAttachmentToApplicaton(
+      application,
+      fileName,
+      buffer,
+      uploadParameters,
+    )
+  }
+
+  private getFilenameFromApplication(
+    application: ApplicationWithAttachments,
+    attachmentKey: string,
+  ): string {
+    const fileName = (
+      application.attachments as {
+        [key: string]: string
+      }
+    )[attachmentKey]
+    return fileName
   }
 }

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

@@ -2,7 +2,7 @@ import { DynamicModule } from '@nestjs/common'
 import { ConfigModule } from '@nestjs/config'
 import { EmailModule } from '@island.is/email-service'
 import { ApplicationApiCoreModule } from '@island.is/application/api/core'
-import { AwsModule } from '@island.is/nest/aws'
+import { AwsModule, AwsService } from '@island.is/nest/aws'
 import {
   BaseTemplateAPIModuleConfig,
   BaseTemplateApiApplicationService,
@@ -35,8 +35,9 @@ export class SharedTemplateAPIModule {
           useClass: config.applicationService,
         },
         AttachmentS3Service,
+        AwsService,
       ],
-      exports: [SharedTemplateApiService, AttachmentS3Service],
+      exports: [SharedTemplateApiService, AttachmentS3Service, AwsService],
     }
   }
 }