Merge pull request #8 from alkem-io/develop

authentication through header (#7)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "file-service",
-  "version": "0.0.4",
+  "version": "0.1.0",
   "description": "A file serving microservice for the Alkemio platform",
   "main": "main.ts",
   "scripts": {

src/services/file-reader/file.service.ts

@@ -5,11 +5,20 @@ import { Readable } from 'stream';
 import { ConfigService } from '@nestjs/config';
 import { ConfigType } from '../../config';
 import { pathResolve } from '../../core/utils/files';
-import { Inject, Injectable, LoggerService, StreamableFile } from '@nestjs/common';
+import {
+  Inject,
+  Injectable,
+  LoggerService,
+  StreamableFile,
+} from '@nestjs/common';
 import { FileAdapterService } from './file.adapter.service';
 import { FileInfoInputData } from './inputs';
 import { FileInfoOutputData, isFileInfoOutputWithErrorData } from './outputs';
-import { FileInfoException, FileReadException, LocalStorageReadFailedException } from './exceptions';
+import {
+  FileInfoException,
+  FileReadException,
+  LocalStorageReadFailedException,
+} from './exceptions';
 import { DocumentData } from './types';
 import { WINSTON_MODULE_NEST_PROVIDER } from 'nest-winston';
 
@@ -38,14 +47,12 @@ export class FileService {
     auth: {
       cookie?: string;
       authorization?: string;
-      apiToken?: string;
     },
   ): Promise<FileInfoOutputData> {
-    const cookie = auth.cookie;
-    const apiToken = auth?.apiToken ?? auth?.authorization?.split(' ')?.[1];
+    const { cookie, authorization } = auth;
 
     return this.adapter.fileInfo(
-      new FileInfoInputData(docId, { cookie, apiToken }),
+      new FileInfoInputData(docId, { cookie, authorization }),
     );
   }
 
@@ -62,7 +69,6 @@ export class FileService {
     auth: {
       cookie?: string;
       authorization?: string;
-      apiToken?: string;
     },
   ): Promise<DocumentData | never> {
     const { data } = await this.fileInfo(docId, auth);

src/services/file-reader/inputs/file.info.input.data.ts

@@ -5,7 +5,7 @@ export class FileInfoInputData extends BaseInputData {
     public docId: string,
     public auth: {
       cookie?: string;
-      apiToken?: string;
+      authorization?: string;
     },
   ) {
     super('file-info-input');