@squiz/dx-common-lib 1.39.1-alpha.8 → 1.40.0

package/src/server-utils/apiKeyMiddleware.spec.ts

@@ -1,51 +0,0 @@
-import { UnAuthenticatedRequestError } from '../error/UnAuthenticatedRequestError';
-import { apiKeyMiddleware } from './apiKeyMiddleware';
-
-const keyIsValid = jest.fn().mockImplementation(() => true);
-const matrixKeyIsValid = jest.fn().mockImplementation(() => true);
-const getMatrixKeys = jest.fn(() => []);
-
-describe('apiKeyMiddleware', () => {
-  const middleware = apiKeyMiddleware({ keyIsValid, matrixKeyIsValid, getMatrixKeys });
-
-  it('should return an express middleware which', () => {
-    expect(middleware).toBeInstanceOf(Function);
-  });
-
-  describe('middleware', () => {
-    it('should call next is key is invalid but matrix ke is valid', () => {
-      const nextFunc = jest.fn().mockImplementation(() => {
-        /* no op */
-      });
-      keyIsValid.mockImplementation(() => false);
-      keyIsValid.mockImplementation(() => true);
-
-      middleware({ header: () => 'some-key' } as any, {} as any, nextFunc);
-
-      expect(nextFunc).toHaveBeenCalled();
-    });
-
-    it('should call next if api key is valid', () => {
-      const nextFunc = jest.fn().mockImplementation(() => {
-        /* no op */
-      });
-
-      middleware({ header: () => 'some-key' } as any, {} as any, nextFunc);
-
-      expect(nextFunc).toHaveBeenCalled();
-    });
-
-    it('should throw an UnAuthenticatedRequestError if key is invalid', () => {
-      const nextFunc = jest.fn().mockImplementation(() => {
-        /* no op */
-      });
-
-      keyIsValid.mockImplementation(() => false);
-      matrixKeyIsValid.mockImplementation(() => false);
-
-      expect(() => middleware({ header: () => 'some-key' } as any, {} as any, nextFunc)).toThrowError(
-        new UnAuthenticatedRequestError(`API KEY IS INVALID`),
-      );
-    });
-  });
-});

package/src/server-utils/apiKeyMiddleware.ts

@@ -1,26 +0,0 @@
-import type { Request, Response } from 'express';
-import { ApiKeyValidationService } from '../api-key-validation/ApiKeyValidationService';
-import { UnAuthenticatedRequestError } from '../error/UnAuthenticatedRequestError';
-
-/**
- * @deprecated Use JWT authentication.
- */
-export function apiKeyMiddleware(
-  apiKeyService: ApiKeyValidationService,
-): (req: Request, res: Response, next: any) => void {
-  return function (req: Request, res: Response, next: any) {
-    const key = req.header('x-api-key');
-
-    if (req.path == '/health') {
-      next();
-      return;
-    }
-
-    if (apiKeyService.keyIsValid(key) || apiKeyService.matrixKeyIsValid(key)) {
-      next();
-      return;
-    }
-
-    throw new UnAuthenticatedRequestError(`API KEY IS INVALID`);
-  };
-}