fix(download-service): Update usage of accesstoken in jwt strategy an…

…d download service controllers (#16216)

* Update jsw strategy to return access token in authorisation field if avaliable in body. Also updated all controllers in download service to get the access token from the user context instead

* fix optional

* Update test

* Remove unused import

* Update test because of unwanted new line

* Remove/update body from finance controller and update headers

* Remove unused import

---------

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

apps/download-service/src/app/modules/documents/document.controller.ts

@@ -1,25 +1,16 @@
-import {
-  Body,
-  Controller,
-  Header,
-  Post,
-  Res,
-  Param,
-  UseGuards,
-} from '@nestjs/common'
-import { ApiOkResponse, ApiTags } from '@nestjs/swagger'
-import { GetDocumentDto } from './dto/getDocument.dto'
-import { Response } from 'express'
-import { DocumentClient } from '@island.is/clients/documents'
-import { DocumentsScope } from '@island.is/auth/scopes'
 import type { User } from '@island.is/auth-nest-tools'
 import {
   CurrentUser,
   IdsUserGuard,
   Scopes,
   ScopesGuard,
 } from '@island.is/auth-nest-tools'
+import { DocumentsScope } from '@island.is/auth/scopes'
+import { DocumentClient } from '@island.is/clients/documents'
 import { AuditService } from '@island.is/nest/audit'
+import { Controller, Header, Param, Post, Res, UseGuards } from '@nestjs/common'
+import { ApiOkResponse, ApiTags } from '@nestjs/swagger'
+import { Response } from 'express'
 
 @UseGuards(IdsUserGuard, ScopesGuard)
 @Scopes(DocumentsScope.main)
@@ -40,7 +31,6 @@ export class DocumentController {
   async getPdf(
     @Param('pdfId') pdfId: string,
     @CurrentUser() user: User,
-    @Body() resource: GetDocumentDto,
     @Res() res: Response,
   ) {
     const rawDocumentDTO = await this.documentClient.customersDocument({

apps/download-service/src/app/modules/education-documents/education-document.controller.ts

@@ -1,30 +1,21 @@
-import {
-  Body,
-  Controller,
-  Header,
-  Post,
-  Res,
-  Param,
-  UseGuards,
-} from '@nestjs/common'
-import { ApiOkResponse } from '@nestjs/swagger'
-import { Response } from 'express'
-import { ApiScope } from '@island.is/auth/scopes'
 import type { User } from '@island.is/auth-nest-tools'
 import {
   CurrentUser,
   IdsUserGuard,
   Scopes,
   ScopesGuard,
 } from '@island.is/auth-nest-tools'
-import { AuditService } from '@island.is/nest/audit'
-import { GetEducationGraduationDocumentDto } from './dto/getEducationGraduationDocument'
+import { ApiScope } from '@island.is/auth/scopes'
 import {
   UniversityCareersClientService,
   UniversityIdShort,
+  UniversityShortIdMap,
 } from '@island.is/clients/university-careers'
+import { AuditService } from '@island.is/nest/audit'
 import { Locale } from '@island.is/shared/types'
-import { UniversityShortIdMap } from '@island.is/clients/university-careers'
+import { Controller, Header, Param, Post, Res, UseGuards } from '@nestjs/common'
+import { ApiOkResponse } from '@nestjs/swagger'
+import { Response } from 'express'
 
 @UseGuards(IdsUserGuard, ScopesGuard)
 @Scopes(ApiScope.education)
@@ -48,16 +39,10 @@ export class EducationController {
     @Param('university') uni: UniversityIdShort,
     @CurrentUser()
     user: User,
-    @Body() resource: GetEducationGraduationDocumentDto,
     @Res() res: Response,
   ) {
-    const authUser: User = {
-      ...user,
-      authorization: `Bearer ${resource.__accessToken}`,
-    }
-
     const documentResponse = await this.universitiesApi.getStudentTrackPdf(
-      authUser,
+      user,
       parseInt(trackNumber),
       UniversityShortIdMap[uni],
       lang as Locale,
@@ -78,10 +63,10 @@ export class EducationController {
         'Content-Disposition',
         `inline; filename=${user.nationalId}-skoli-${UniversityShortIdMap[uni]}-brautskraning-${trackNumber}.pdf`,
       )
-      res.header('Content-Type: application/pdf')
-      res.header('Pragma: no-cache')
-      res.header('Cache-Control: no-cache')
-      res.header('Cache-Control: nmax-age=0')
+      res.header('Content-Type', 'application/pdf')
+      res.header('Pragma', 'no-cache')
+      res.header('Cache-Control', 'no-cache')
+      res.header('Cache-Control', 'nmax-age=0')
       return res.status(200).end(buffer)
     }
     return res.end()

apps/download-service/src/app/modules/finance-documents/document.controller.ts

@@ -1,25 +1,24 @@
+import type { User } from '@island.is/auth-nest-tools'
+import {
+  CurrentUser,
+  IdsUserGuard,
+  Scopes,
+  ScopesGuard,
+} from '@island.is/auth-nest-tools'
+import { ApiScope } from '@island.is/auth/scopes'
+import { FinanceClientService } from '@island.is/clients/finance'
+import { AuditService } from '@island.is/nest/audit'
 import {
   Body,
   Controller,
   Header,
+  Param,
   Post,
   Res,
-  Param,
   UseGuards,
 } from '@nestjs/common'
 import { ApiOkResponse } from '@nestjs/swagger'
 import { Response } from 'express'
-import { FinanceClientService } from '@island.is/clients/finance'
-import { ApiScope } from '@island.is/auth/scopes'
-import type { User } from '@island.is/auth-nest-tools'
-import {
-  CurrentUser,
-  IdsUserGuard,
-  Scopes,
-  ScopesGuard,
-} from '@island.is/auth-nest-tools'
-import { AuditService } from '@island.is/nest/audit'
-import { GetFinanceDocumentDto } from './dto/getFinanceDocument.dto'
 
 @UseGuards(IdsUserGuard, ScopesGuard)
 @Scopes(ApiScope.financeOverview, ApiScope.financeSalary)
@@ -37,28 +36,25 @@ export class FinanceDocumentController {
     description: 'Get a PDF document from the Finance service',
   })
   async getFinancePdf(
-    @Param('pdfId') pdfId: string,
     @CurrentUser() user: User,
-    @Body() resource: GetFinanceDocumentDto,
     @Res() res: Response,
+    @Param('pdfId') pdfId: string,
+    @Body('annualDoc') annualDoc?: string,
   ) {
-    const authUser: User = {
-      ...user,
-      authorization: `Bearer ${resource.__accessToken}`,
-    }
-    const documentResponse = resource.annualDoc
+    const documentResponse = annualDoc
       ? await this.financeService.getAnnualStatusDocument(
           user.nationalId,
           pdfId,
-          authUser,
+          user,
         )
       : await this.financeService.getFinanceDocument(
           user.nationalId,
           pdfId,
-          authUser,
+          user,
         )
 
     const documentBase64 = documentResponse?.docment?.document
+
     if (documentBase64) {
       this.auditService.audit({
         action: 'getFinancePdf',
@@ -70,9 +66,9 @@ export class FinanceDocumentController {
 
       res.header('Content-length', buffer.length.toString())
       res.header('Content-Disposition', `inline; filename=${pdfId}.pdf`)
-      res.header('Pragma: no-cache')
-      res.header('Cache-Control: no-cache')
-      res.header('Cache-Control: nmax-age=0')
+      res.header('Pragma', 'no-cache')
+      res.header('Cache-Control', 'no-cache')
+      res.header('Cache-Control', 'nmax-age=0')
 
       return res.status(200).end(buffer)
     }

apps/download-service/src/app/modules/health/payment-overview-documents.controller.ts

@@ -1,16 +1,3 @@
-import {
-  Controller,
-  Header,
-  Post,
-  Res,
-  Param,
-  UseGuards,
-  Inject,
-  Body,
-} from '@nestjs/common'
-import { ApiOkResponse } from '@nestjs/swagger'
-import { Response } from 'express'
-import { ApiScope } from '@island.is/auth/scopes'
 import type { User } from '@island.is/auth-nest-tools'
 import {
   AuthMiddleware,
@@ -19,9 +6,12 @@ import {
   Scopes,
   ScopesGuard,
 } from '@island.is/auth-nest-tools'
-import { AuditService } from '@island.is/nest/audit'
+import { ApiScope } from '@island.is/auth/scopes'
 import { PaymentsOverviewApi } from '@island.is/clients/icelandic-health-insurance/rights-portal'
-import { GetGetHealthPaymentDocumentDto } from './dto/getHealthPaymentDocument.dto'
+import { AuditService } from '@island.is/nest/audit'
+import { Controller, Header, Param, Post, Res, UseGuards } from '@nestjs/common'
+import { ApiOkResponse } from '@nestjs/swagger'
+import { Response } from 'express'
 
 @UseGuards(IdsUserGuard, ScopesGuard)
 @Scopes(ApiScope.healthPayments)
@@ -42,16 +32,10 @@ export class HealthPaymentsOverviewController {
   async getHealthPaymentOverviewPdf(
     @Param('documentId') documentId: string,
     @CurrentUser() user: User,
-    @Body() resource: GetGetHealthPaymentDocumentDto,
     @Res() res: Response,
   ) {
-    const authUser = {
-      ...user,
-      authorization: `Bearer ${resource.__accessToken}`,
-    }
-
     const documentResponse = await this.paymentApi
-      .withMiddleware(new AuthMiddleware(authUser))
+      .withMiddleware(new AuthMiddleware(user))
       .getPaymentsOverviewDocument({
         documentId: parseInt(documentId),
       })
@@ -73,19 +57,15 @@ export class HealthPaymentsOverviewController {
 
       const buffer = Buffer.from(documentResponse.data, 'base64')
 
-      // const contentArrayBuffer =
-      //   await documentResponse.contentType.arrayBuffer()
-      // const buffer = Buffer.from(contentArrayBuffer)
-
       res.header('Content-length', buffer.length.toString())
       res.header(
         'Content-Disposition',
         `inline; filename=${user.nationalId}-health-payment-overview-${documentResponse.fileName}.pdf`,
       )
-      res.header('Content-Type: application/pdf')
-      res.header('Pragma: no-cache')
-      res.header('Cache-Control: no-cache')
-      res.header('Cache-Control: nmax-age=0')
+      res.header('Content-Type', 'application/pdf')
+      res.header('Pragma', 'no-cache')
+      res.header('Cache-Control', 'no-cache')
+      res.header('Cache-Control', 'nmax-age=0')
       return res.status(200).end(buffer)
     }
     return res.end()

apps/download-service/src/app/modules/occupational-licenses/occupational-license.controller.ts

@@ -11,14 +11,12 @@ import {
 } from '@island.is/auth-nest-tools'
 import { AuditService } from '@island.is/nest/audit'
 import { MMSApi } from '@island.is/clients/mms'
-import { DistrictCommissionersLicensesService } from '@island.is/clients/district-commissioners-licenses'
 
 @UseGuards(IdsUserGuard, ScopesGuard)
 @Scopes(ApiScope.education)
 @Controller('occupational-licenses')
 export class OccupationalLicensesController {
   constructor(
-    private readonly dcApi: DistrictCommissionersLicensesService,
     private readonly mmsApi: MMSApi,
     private readonly auditService: AuditService,
   ) {}
@@ -55,10 +53,10 @@ export class OccupationalLicensesController {
         'Content-Disposition',
         `inline; filename=${user.nationalId}-starfsleyfi-${licenceId}.pdf`,
       )
-      res.header('Content-Type: application/pdf')
-      res.header('Pragma: no-cache')
-      res.header('Cache-Control: no-cache')
-      res.header('Cache-Control: nmax-age=0')
+      res.header('Content-Type', 'application/pdf')
+      res.header('Pragma', 'no-cache')
+      res.header('Cache-Control', 'no-cache')
+      res.header('Cache-Control', 'nmax-age=0')
       return res.status(200).end(buffer)
     }
     return res.end()