auth through oathkeeper (#6)

Author: hero101

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "whiteboard-collaboration-service",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "description": "Alkemio Whiteboard Collaboration Service for Excalidraw backend",
   "author": "Alkemio Foundation",
   "private": false,

package.json

@@ -410,6 +410,7 @@ export class Server {
 
   private getUserInfo(socket: SocketIoSocket): Promise<UserInfo | undefined> {
     return this.utilService.getUserInfo({
+      authorization: socket.handshake.headers.authorization,
       cookie: socket.handshake.headers.cookie,
     });
   }

src/excalidraw-backend/server.ts

@@ -16,17 +16,16 @@ export class UtilService {
 
   public async getUserInfo(opts: {
     cookie?: string;
-    authorizationHeader?: string;
+    authorization?: string;
   }): Promise<UserInfo | never> {
-    const { cookie, authorizationHeader } = opts;
+    const { cookie, authorization } = opts;
 
-    if (cookie) {
-      return this.integrationService.who(new WhoInputData(cookie));
+    if (authorization) {
+      return this.integrationService.who(new WhoInputData({ authorization }));
     }
 
-    if (authorizationHeader) {
-      const [, token] = authorizationHeader.split(' ');
-      return this.integrationService.who(new WhoInputData(token));
+    if (cookie) {
+      return this.integrationService.who(new WhoInputData({ cookie }));
     }
 
     throw new Error('No cookie or authorization header provided');

src/services/util/util.service.ts

@@ -2,9 +2,11 @@ import { BaseInputData } from './base.input.data';
 
 export class WhoInputData extends BaseInputData {
   constructor(
-    public cookie?: string,
-    public token?: string,
+    public auth: {
+      cookie?: string;
+      authorization?: string;
+    },
   ) {
-    super('who');
+    super('who-input');
   }
 }

src/services/whiteboard-integration/inputs/who.input.data.ts

@@ -129,7 +129,7 @@ export class WhiteboardIntegrationAdapterService {
       timeInterval(),
       map((x) => {
         this.logger.debug?.({
-          method: `sendWithResponse response took ${x.interval}`,
+          method: `sendWithResponse response took ${x.interval}ms`,
           pattern,
           data,
           value: x.value,
@@ -141,13 +141,13 @@ export class WhiteboardIntegrationAdapterService {
 
     return firstValueFrom(result$).catch((err) => {
       this.logger.error(
-        err?.message ?? err,
-        err?.stack,
-        JSON.stringify({
+        {
+          message: `Error was received while waiting for response: ${err?.message ?? err}`,
           pattern,
           data,
           timeout: this.timeoutMs,
-        }),
+        },
+        err?.stack,
       );
 
       throw new Error('Error while processing integration request.');