improve auth flexibility allowing to pass any library on type field

Author: ricardo-devis-agullo

src/registry/domain/authentication.ts

@@ -2,17 +2,7 @@ import basicAuth from 'basic-auth-connect';
 import { RequestHandler } from 'express';
 
 import strings from '../../resources/';
-
-type Validate<T = unknown> = (config: T) => {
-  isValid: boolean;
-  message: string;
-};
-type Middleware<T> = (config: T) => any;
-
-type Authentication<T = any> = {
-  validate: Validate<T>;
-  middleware: Middleware<T>;
-};
+import { Authentication, PublishAuthConfig } from '../../types';
 
 const basicAuthentication: Authentication<{
   username: string;
@@ -40,8 +30,10 @@ const builtin: Record<string, Authentication> = {
 
 let scheme: Authentication;
 
-export function validate(authConfig: { type: string }) {
-  if (builtin[authConfig.type]) {
+export function validate(authConfig: PublishAuthConfig) {
+  if (typeof authConfig.type !== 'string') {
+    scheme = authConfig.type;
+  } else if (builtin[authConfig.type]) {
     scheme = builtin[authConfig.type];
   } else {
     const moduleName = `oc-auth-${authConfig.type}`;

src/types.ts

@@ -113,6 +113,22 @@ export interface VM {
   type: 'oc-registry' | 'oc-registry-local';
 }
 
+export type Authentication<T = any> = {
+  validate: (config: T) => {
+    isValid: boolean;
+    message: string;
+  };
+  middleware: (config: T) => any;
+};
+
+export type PublishAuthConfig =
+  | {
+      type: 'basic';
+      username: string;
+      password: string;
+    }
+  | ({ type: string | Authentication } & Record<string, any>);
+
 export interface Config {
   baseUrl: string;
   baseUrlFunc?: (opts: { host?: string; secure: boolean }) => string;
@@ -135,11 +151,7 @@ export interface Config {
   port: number;
   postRequestPayloadSize?: number;
   prefix: string;
-  publishAuth?: {
-    type: string;
-    username: string;
-    password: string;
-  };
+  publishAuth?: PublishAuthConfig;
   publishValidation: (data: unknown) =>
     | {
         isValid: boolean;