#RI-4454 - resolve pr comments

Author: egor-zalenski

redisinsight/api/src/common/constants/api.ts

@@ -1,4 +1,4 @@
 export const API_PARAM_DATABASE_ID = 'dbInstance';
 export const API_HEADER_DATABASE_INDEX = 'ri-db-index';
-export const API_HEADER_WINDOW_ID = 'ri-window-id';
+export const API_HEADER_WINDOW_ID = 'x-window-id';
 export const API_PARAM_CLI_CLIENT_ID = 'uuid';

redisinsight/api/src/constants/custom-error-codes.ts

@@ -0,0 +1,3 @@
+export enum CustomErrorCodes {
+  WindowUnauthorized = 'WindowUnauthorizedException',
+}

redisinsight/api/src/constants/index.ts

@@ -10,3 +10,4 @@ export * from './telemetry-events';
 export * from './app-events';
 export * from './redis-connection';
 export * from './recommendations';
+export * from './custom-error-codes';

redisinsight/api/src/modules/auth/window-auth/constants/exceptions.ts

@@ -1,12 +1,14 @@
 import { HttpException, HttpStatus } from '@nestjs/common';
+import { CustomErrorCodes } from 'src/constants';
 
 export class WindowUnauthorizedException extends HttpException {
   constructor(message) {
     super(
       {
         statusCode: HttpStatus.UNAUTHORIZED,
+        errorCode: CustomErrorCodes.WindowUnauthorized,
         message,
-        error: 'Unauthorized',
+        error: 'Window Unauthorized',
       },
       HttpStatus.UNAUTHORIZED,
     );

redisinsight/api/src/modules/auth/window-auth/middleware/window.auth.middleware.ts

@@ -1,26 +1,19 @@
-import {
-  Injectable,
-  Logger,
-  NestMiddleware,
-} from '@nestjs/common';
+import { Injectable, Logger, NestMiddleware } from '@nestjs/common';
 import { NextFunction, Request, Response } from 'express';
 import ERROR_MESSAGES from 'src/constants/error-messages';
 import { API_HEADER_WINDOW_ID } from 'src/common/constants';
-import { WindowAuthManager } from '../window-auth.manager';
+import { WindowAuthService } from '../window-auth.service';
 import { WindowUnauthorizedException } from '../constants/exceptions';
 
 @Injectable()
 export class WindowAuthMiddleware implements NestMiddleware {
   private logger = new Logger('WindowAuthMiddleware');
 
-  constructor(
-    private windowAuthService: WindowAuthManager,
-  ) {}
+  constructor(private windowAuthService: WindowAuthService) {}
 
   async use(req: Request, res: Response, next: NextFunction): Promise<any> {
     const { windowId } = WindowAuthMiddleware.getWindowIdFromReq(req);
-    const { isExists: isWindowExists = false } = await this.windowAuthService.getStrategy()?.isWindowExists(windowId)
-      ?? {};
+    const isWindowExists = (await this.windowAuthService.getStrategy()?.isWindowExists(windowId)) ?? false;
 
     if (!isWindowExists) {
       this.throwError(req, ERROR_MESSAGES.UNDEFINED_WINDOW_ID);

redisinsight/api/src/modules/auth/window-auth/strategies/abstract.window.auth.strategy.ts

@@ -1,5 +1,3 @@
-import { IWindowAuthStrategy, IWindowAuthStrategyData } from '../window.auth.strategy.interface';
-
-export abstract class AbstractWindowAuthStrategy implements IWindowAuthStrategy {
-  abstract isWindowExists(data: any): Promise<IWindowAuthStrategyData>;
+export abstract class AbstractWindowAuthStrategy {
+  abstract isWindowExists(data: any): Promise<boolean>;
 }

redisinsight/api/src/modules/auth/window-auth/window-auth.manager.spec.ts

@@ -1,16 +1,13 @@
 import { MiddlewareConsumer, Module, NestModule } from '@nestjs/common';
 import config from 'src/utils/config';
-import { WindowAuthManager } from './window-auth.manager';
+import { WindowAuthService } from './window-auth.service';
 import { WindowAuthMiddleware } from './middleware/window.auth.middleware';
 
 const SERVER_CONFIG = config.get('server');
 
 @Module({
-  providers: [
-    WindowAuthManager,
-  ],
+  providers: [WindowAuthService],
 })
-
 export class WindowAuthModule implements NestModule {
   configure(consumer: MiddlewareConsumer) {
     consumer

redisinsight/api/src/modules/auth/window-auth/window-auth.manager.ts

@@ -0,0 +1,28 @@
+import { Test, TestingModule } from '@nestjs/testing';
+import { WindowAuthService } from './window-auth.service';
+import { AbstractWindowAuthStrategy } from './strategies/abstract.window.auth.strategy';
+
+export class TestAuthStrategy extends AbstractWindowAuthStrategy {
+  async isWindowExists(): Promise<boolean> {
+    return false;
+  }
+}
+
+const testStrategy = new TestAuthStrategy();
+
+describe('WindowAuthService', () => {
+  let windowAuthService: WindowAuthService;
+
+  beforeAll(async () => {
+    const module: TestingModule = await Test.createTestingModule({
+      providers: [WindowAuthService],
+      exports: [WindowAuthService],
+    }).compile();
+
+    windowAuthService = module.get<WindowAuthService>(WindowAuthService);
+  });
+  it('Should set strategy to window auth manager and get it back', () => {
+    windowAuthService.setStrategy(testStrategy);
+    expect(windowAuthService.getStrategy()).toEqual(testStrategy);
+  });
+});