Merge pull request #2338 from bcgov/feature/2309-QA-1

Allow public docs to load when not authenticated

Author: trslater

portal-frontend/src/app/app-routing.module.ts

@@ -10,7 +10,6 @@ import { DocumentFileLoader } from './shared/document-file-loader/document-file-
 const routes: Routes = [
   {
     path: 'document/:uuid',
-    canActivate: [AuthGuard],
     component: DocumentFileLoader,
   },
   {

portal-frontend/src/app/services/document/document.service.ts

@@ -12,6 +12,7 @@ import { UploadDocumentUrlDto } from './document.dto';
 })
 export class DocumentService {
   private serviceUrl = `${environment.apiUrl}/document`;
+  private publicServiceUrl = `${environment.authUrl}/public/document`;
   private httpClientNoAuth: HttpClient | null = null;
 
   constructor(
@@ -78,9 +79,15 @@ export class DocumentService {
     }
   }
 
-  async getDownloadUrlAndFileName(uuid: string, isInline = true): Promise<{ url: string; fileName: string }> {
+  async getDownloadUrlAndFileName(
+    uuid: string,
+    isInline: boolean,
+    isAuthenticated: boolean,
+  ): Promise<{ url: string; fileName: string }> {
     const url =
-      `${this.serviceUrl}/getDownloadUrlAndFileName/${uuid}` + (isInline ? `?isInline=${isInline.toString()}` : '');
+      (isAuthenticated ? this.serviceUrl : this.publicServiceUrl) +
+      `/download-url-and-filename/${uuid}` +
+      (isInline ? `?isInline=${isInline.toString()}` : '');
 
     return await firstValueFrom(this.httpClient.get<{ url: string; fileName: string }>(url));
   }

portal-frontend/src/app/shared/document-file-loader/document-file-loader.component.ts

@@ -1,31 +1,44 @@
-import { Component } from '@angular/core';
+import { Component, OnDestroy } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { DocumentService } from '../../services/document/document.service';
+import { AuthenticationService } from '../../services/authentication/authentication.service';
+import { Subject, takeUntil } from 'rxjs';
 
 @Component({
   selector: 'app-temp',
   templateUrl: './document-file-loader.component.html',
   styleUrl: './document-file-loader.component.scss',
 })
-export class DocumentFileLoader {
+export class DocumentFileLoader implements OnDestroy {
+  $destroy = new Subject<void>();
+  isAuthenticated = false;
   uuid: string | null = null;
 
   constructor(
     private route: ActivatedRoute,
     private documentService: DocumentService,
-  ) {
+    private authenticationService: AuthenticationService,
+  ) {}
+
+  ngAfterViewInit() {
     this.uuid = this.route.snapshot.paramMap.get('uuid');
+
+    this.authenticationService.$currentProfile.pipe(takeUntil(this.$destroy)).subscribe((user) => {
+      const isAuthenticated = !!user;
+
+      if (this.uuid !== null) {
+        this.open(this.uuid, isAuthenticated);
+      }
+    });
   }
 
-  ngAfterViewInit() {
-    if (this.uuid !== null) {
-      this.open(this.uuid);
-    }
+  ngOnDestroy(): void {
+    this.$destroy.next();
+    this.$destroy.complete();
   }
 
-  async open(uuid: string) {
-    const { url, fileName } = await this.documentService.getDownloadUrlAndFileName(uuid);
-    console.log(url, fileName);
+  async open(uuid: string, isAuthenticated: boolean) {
+    const { url, fileName } = await this.documentService.getDownloadUrlAndFileName(uuid, true, isAuthenticated);
     const object = window.document.createElement('object');
 
     object.data = url;

services/apps/alcs/src/document/document.service.spec.ts

@@ -10,7 +10,7 @@ import { Test, TestingModule } from '@nestjs/testing';
 import { getRepositoryToken } from '@nestjs/typeorm';
 import { mockClient } from 'aws-sdk-client-mock';
 import * as config from 'config';
-import { Repository } from 'typeorm';
+import { DataSource, Repository } from 'typeorm';
 import { ClamAVService } from '../clamav/clamav.service';
 import { User } from '../user/user.entity';
 import {
@@ -31,11 +31,13 @@ describe('DocumentService', () => {
   const mockS3Client = mockClient(S3Client);
   let mockRepository: DeepMocked<Repository<Document>>;
   let mockClamAVService: DeepMocked<ClamAVService>;
+  let mockDataSource: DeepMocked<DataSource>;
 
   beforeEach(async () => {
     mockS3Client.reset();
     mockRepository = createMock();
     mockClamAVService = createMock();
+    mockDataSource = createMock();
 
     const module: TestingModule = await Test.createTestingModule({
       providers: [
@@ -52,6 +54,10 @@ describe('DocumentService', () => {
           provide: ClamAVService,
           useValue: mockClamAVService,
         },
+        {
+          provide: DataSource,
+          useValue: mockDataSource,
+        },
       ],
     }).compile();
 

services/apps/alcs/src/document/document.service.ts

@@ -1,20 +1,21 @@
 import { CONFIG_TOKEN, IConfig } from '@app/common/config/config.module';
-import { BaseServiceException, ServiceValidationException } from '@app/common/exceptions/base.exception';
+import {
+  BaseServiceException,
+  ServiceNotFoundException,
+  ServiceValidationException,
+} from '@app/common/exceptions/base.exception';
 import { DeleteObjectCommand, GetObjectCommand, PutObjectCommand, S3Client } from '@aws-sdk/client-s3';
 import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
 import { MultipartFile } from '@fastify/multipart';
 import { Inject, Injectable, Logger } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { Repository } from 'typeorm';
+import { DataSource, Repository } from 'typeorm';
 import { v4 } from 'uuid';
 import { ClamAVService } from '../clamav/clamav.service';
 import { User } from '../user/user.entity';
-import {
-  CreateDocumentDto,
-  DOCUMENT_SOURCE,
-  DOCUMENT_SYSTEM,
-} from './document.dto';
+import { CreateDocumentDto, DOCUMENT_SOURCE, DOCUMENT_SYSTEM } from './document.dto';
 import { Document } from './document.entity';
+import { VISIBILITY_FLAG } from '../alcs/application/application-document/application-document.entity';
 
 const DEFAULT_DB_TAGS = ['ORCS Classification: 85100-20'];
 const DEFAULT_S3_TAGS = 'ORCS-Classification=85100-20';
@@ -31,6 +32,7 @@ export class DocumentService {
     @InjectRepository(Document)
     private documentRepository: Repository<Document>,
     private clamAvService: ClamAVService,
+    private dataSource: DataSource,
   ) {
     this.dataStore = new S3Client({
       region: 'us-east-1',
@@ -156,6 +158,47 @@ export class DocumentService {
     return { url: await this.getDownloadUrl(document, openInline), fileName: document.fileName };
   }
 
+  async getPublicDownloadUrlAndFileNameByUuid(
+    uuid: string,
+    openInline = false,
+  ): Promise<{ url: string; fileName: string }> {
+    const document = await this.getDocument(uuid);
+
+    const fileDocuments = await this.dataSource.query(
+      `
+      select
+        ad.visibility_flags
+      from
+        alcs.application_document ad 
+      where 
+        ad.document_uuid = $1
+      union
+      select
+        noid.visibility_flags
+      from
+        alcs.notice_of_intent_document noid
+      where
+        noid.document_uuid = $1
+      union
+      select
+        nd2.visibility_flags
+      from
+        alcs.notification_document nd2
+      where 
+        nd2.document_uuid = $1
+      `,
+      [uuid],
+    );
+
+    // Unlikely a document is attached to more than one file document, but if it
+    // is, as long as any of them have made the doc public, show it
+    if (!fileDocuments.some((doc) => doc.visibility_flags.includes(VISIBILITY_FLAG.PUBLIC))) {
+      throw new ServiceNotFoundException('Failed to find document');
+    }
+
+    return { url: await this.getDownloadUrl(document, openInline), fileName: document.fileName };
+  }
+
   async createDocumentRecord(data: CreateDocumentDto) {
     const command = new GetObjectCommand({
       Bucket: this.config.get('STORAGE.BUCKET'),

services/apps/alcs/src/portal/public/public.controller.spec.ts

@@ -6,17 +6,20 @@ import { PublicApplicationService } from './application/public-application.servi
 import { PublicNoticeOfIntentService } from './notice-of-intent/public-notice-of-intent.service';
 import { PublicNotificationService } from './notification/public-notification.service';
 import { PublicController } from './public.controller';
+import { DocumentService } from '../../document/document.service';
 
 describe('PublicController', () => {
   let controller: PublicController;
   let mockAppService: DeepMocked<PublicApplicationService>;
   let mockNOIService: DeepMocked<PublicNoticeOfIntentService>;
   let mockNotificationService: DeepMocked<PublicNotificationService>;
+  let mockDocumentService: DeepMocked<DocumentService>;
 
   beforeEach(async () => {
     mockAppService = createMock();
     mockNOIService = createMock();
     mockNotificationService = createMock();
+    mockDocumentService = createMock();
 
     const module: TestingModule = await Test.createTestingModule({
       providers: [
@@ -32,6 +35,10 @@ describe('PublicController', () => {
           provide: PublicNotificationService,
           useValue: mockNotificationService,
         },
+        {
+          provide: DocumentService,
+          useValue: mockDocumentService,
+        },
         {
           provide: ClsService,
           useValue: {},

services/apps/alcs/src/portal/public/public.controller.ts

@@ -1,8 +1,9 @@
-import { Controller, Get, Param } from '@nestjs/common';
+import { Controller, Get, Param, Query } from '@nestjs/common';
 import { Public } from 'nest-keycloak-connect';
 import { PublicApplicationService } from './application/public-application.service';
 import { PublicNoticeOfIntentService } from './notice-of-intent/public-notice-of-intent.service';
 import { PublicNotificationService } from './notification/public-notification.service';
+import { DocumentService } from '../../document/document.service';
 
 @Public()
 @Controller('/public')
@@ -11,6 +12,7 @@ export class PublicController {
     private publicAppService: PublicApplicationService,
     private publicNoticeOfIntentService: PublicNoticeOfIntentService,
     private publicNotificationService: PublicNotificationService,
+    private documentService: DocumentService,
   ) {}
 
   @Get('/application/:fileId')
@@ -75,4 +77,12 @@ export class PublicController {
   ) {
     return await this.publicNotificationService.getInlineUrl(documentUuid);
   }
+
+  @Get('/document/download-url-and-filename/:uuid')
+  async getDownloadUrlAndFileName(
+    @Param('uuid') uuid: string,
+    @Query('isInline') isInline: boolean = false,
+  ): Promise<{ url: string; fileName: string }> {
+    return await this.documentService.getPublicDownloadUrlAndFileNameByUuid(uuid, isInline);
+  }
 }

services/apps/alcs/src/portal/public/public.module.ts

@@ -20,6 +20,7 @@ import { PublicNotificationService } from './notification/public-notification.se
 import { PublicController } from './public.controller';
 import { PublicSearchModule } from './search/public-search.module';
 import { PublicStatusController } from './status/public-status.controller';
+import { DocumentModule } from '../../document/document.module';
 
 @Module({
   imports: [
@@ -35,6 +36,7 @@ import { PublicStatusController } from './status/public-status.controller';
     NoticeOfIntentDecisionModule,
     NotificationModule,
     NotificationSubmissionModule,
+    DocumentModule,
     RouterModule.register([{ path: 'public', module: PublicSearchModule }]),
   ],
   controllers: [