@verdaccio/middleware 6.0.0-6-next.36 → 6.0.0-6-next.38

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @verdaccio/middleware
 
+## 6.0.0-6-next.38
+
+### Patch Changes
+
+- 65f88b82: bump logger packages
+  - @verdaccio/core@6.0.0-6-next.59
+  - @verdaccio/utils@6.0.0-6-next.27
+
+## 6.0.0-6-next.37
+
+### Patch Changes
+
+- fa274ee4: chore: bumb up package
+  - @verdaccio/core@6.0.0-6-next.58
+  - @verdaccio/utils@6.0.0-6-next.26
+
 ## 6.0.0-6-next.36
 
 ### Patch Changes

package/build/middlewares/allow.d.ts

@@ -1 +1,4 @@
-export declare function allow<T>(auth: T): Function;
+export declare function allow<T>(auth: T, options?: {
+    beforeAll: (_a: any, _b: any) => void;
+    afterAll: (_a: any, _b: any) => void;
+}): Function;

package/build/middlewares/allow.js

@@ -5,16 +5,24 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.allow = allow;
 var _core = require("@verdaccio/core");
-var _logger = require("@verdaccio/logger");
 var _utils = require("@verdaccio/utils");
-function allow(auth) {
+function allow(auth, options = {
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  beforeAll: (_a, _b) => {},
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  afterAll: (_a, _b) => {}
+}) {
+  const {
+    beforeAll,
+    afterAll
+  } = options;
   return function (action) {
     return function (req, res, next) {
       req.pause();
       const packageName = req.params.scope ? `@${req.params.scope}/${req.params.package}` : req.params.package;
       const packageVersion = req.params.filename ? (0, _utils.getVersionFromTarball)(req.params.filename) : undefined;
       const remote = req.remote_user;
-      _logger.logger.trace({
+      beforeAll === null || beforeAll === void 0 ? void 0 : beforeAll({
         action,
         user: remote === null || remote === void 0 ? void 0 : remote.name
       }, `[middleware/allow][@{action}] allow for @{user}`);
@@ -26,6 +34,10 @@ function allow(auth) {
         if (error) {
           next(error);
         } else if (allowed) {
+          afterAll === null || afterAll === void 0 ? void 0 : afterAll({
+            action,
+            user: remote === null || remote === void 0 ? void 0 : remote.name
+          }, `[middleware/allow][@{action}] allowed for @{user}`);
           next();
         } else {
           // last plugin (that's our built-in one) returns either

package/build/middlewares/allow.js.map

@@ -1 +1 @@
-{"version":3,"file":"allow.js","names":["allow","auth","action","req","res","next","pause","packageName","params","scope","package","packageVersion","filename","getVersionFromTarball","undefined","remote","remote_user","logger","trace","user","name","error","allowed","resume","errorUtils","getInternalError","API_ERROR","PLUGIN_ERROR"],"sources":["../../src/middlewares/allow.ts"],"sourcesContent":["import { API_ERROR, errorUtils } from '@verdaccio/core';\nimport { logger } from '@verdaccio/logger';\nimport { getVersionFromTarball } from '@verdaccio/utils';\n\nimport { $NextFunctionVer, $RequestExtend, $ResponseExtend } from '../types';\n\nexport function allow<T>(auth: T): Function {\n  return function (action: string): Function {\n    return function (req: $RequestExtend, res: $ResponseExtend, next: $NextFunctionVer): void {\n      req.pause();\n      const packageName = req.params.scope\n        ? `@${req.params.scope}/${req.params.package}`\n        : req.params.package;\n      const packageVersion = req.params.filename\n        ? getVersionFromTarball(req.params.filename)\n        : undefined;\n      const remote = req.remote_user;\n      logger.trace(\n        { action, user: remote?.name },\n        `[middleware/allow][@{action}] allow for @{user}`\n      );\n      auth['allow_' + action](\n        { packageName, packageVersion },\n        remote,\n        function (error, allowed): void {\n          req.resume();\n          if (error) {\n            next(error);\n          } else if (allowed) {\n            next();\n          } else {\n            // last plugin (that's our built-in one) returns either\n            // cb(err) or cb(null, true), so this should never happen\n            throw errorUtils.getInternalError(API_ERROR.PLUGIN_ERROR);\n          }\n        }\n      );\n    };\n  };\n}\n"],"mappings":";;;;;;AAAA;AACA;AACA;AAIO,SAASA,KAAK,CAAIC,IAAO,EAAY;EAC1C,OAAO,UAAUC,MAAc,EAAY;IACzC,OAAO,UAAUC,GAAmB,EAAEC,GAAoB,EAAEC,IAAsB,EAAQ;MACxFF,GAAG,CAACG,KAAK,EAAE;MACX,MAAMC,WAAW,GAAGJ,GAAG,CAACK,MAAM,CAACC,KAAK,GAC/B,IAAGN,GAAG,CAACK,MAAM,CAACC,KAAM,IAAGN,GAAG,CAACK,MAAM,CAACE,OAAQ,EAAC,GAC5CP,GAAG,CAACK,MAAM,CAACE,OAAO;MACtB,MAAMC,cAAc,GAAGR,GAAG,CAACK,MAAM,CAACI,QAAQ,GACtC,IAAAC,4BAAqB,EAACV,GAAG,CAACK,MAAM,CAACI,QAAQ,CAAC,GAC1CE,SAAS;MACb,MAAMC,MAAM,GAAGZ,GAAG,CAACa,WAAW;MAC9BC,cAAM,CAACC,KAAK,CACV;QAAEhB,MAAM;QAAEiB,IAAI,EAAEJ,MAAM,aAANA,MAAM,uBAANA,MAAM,CAAEK;MAAK,CAAC,EAC7B,iDAAgD,CAClD;MACDnB,IAAI,CAAC,QAAQ,GAAGC,MAAM,CAAC,CACrB;QAAEK,WAAW;QAAEI;MAAe,CAAC,EAC/BI,MAAM,EACN,UAAUM,KAAK,EAAEC,OAAO,EAAQ;QAC9BnB,GAAG,CAACoB,MAAM,EAAE;QACZ,IAAIF,KAAK,EAAE;UACThB,IAAI,CAACgB,KAAK,CAAC;QACb,CAAC,MAAM,IAAIC,OAAO,EAAE;UAClBjB,IAAI,EAAE;QACR,CAAC,MAAM;UACL;UACA;UACA,MAAMmB,gBAAU,CAACC,gBAAgB,CAACC,eAAS,CAACC,YAAY,CAAC;QAC3D;MACF,CAAC,CACF;IACH,CAAC;EACH,CAAC;AACH"}
+{"version":3,"file":"allow.js","names":["allow","auth","options","beforeAll","_a","_b","afterAll","action","req","res","next","pause","packageName","params","scope","package","packageVersion","filename","getVersionFromTarball","undefined","remote","remote_user","user","name","error","allowed","resume","errorUtils","getInternalError","API_ERROR","PLUGIN_ERROR"],"sources":["../../src/middlewares/allow.ts"],"sourcesContent":["import { API_ERROR, errorUtils } from '@verdaccio/core';\nimport { getVersionFromTarball } from '@verdaccio/utils';\n\nimport { $NextFunctionVer, $RequestExtend, $ResponseExtend } from '../types';\n\nexport function allow<T>(\n  auth: T,\n  options = {\n    // eslint-disable-next-line @typescript-eslint/no-unused-vars\n    beforeAll: (_a: any, _b: any) => {},\n    // eslint-disable-next-line @typescript-eslint/no-unused-vars\n    afterAll: (_a: any, _b: any) => {},\n  }\n): Function {\n  const { beforeAll, afterAll } = options;\n  return function (action: string): Function {\n    return function (req: $RequestExtend, res: $ResponseExtend, next: $NextFunctionVer): void {\n      req.pause();\n      const packageName = req.params.scope\n        ? `@${req.params.scope}/${req.params.package}`\n        : req.params.package;\n      const packageVersion = req.params.filename\n        ? getVersionFromTarball(req.params.filename)\n        : undefined;\n      const remote = req.remote_user;\n      beforeAll?.(\n        { action, user: remote?.name },\n        `[middleware/allow][@{action}] allow for @{user}`\n      );\n      auth['allow_' + action](\n        { packageName, packageVersion },\n        remote,\n        function (error, allowed): void {\n          req.resume();\n          if (error) {\n            next(error);\n          } else if (allowed) {\n            afterAll?.(\n              { action, user: remote?.name },\n              `[middleware/allow][@{action}] allowed for @{user}`\n            );\n            next();\n          } else {\n            // last plugin (that's our built-in one) returns either\n            // cb(err) or cb(null, true), so this should never happen\n            throw errorUtils.getInternalError(API_ERROR.PLUGIN_ERROR);\n          }\n        }\n      );\n    };\n  };\n}\n"],"mappings":";;;;;;AAAA;AACA;AAIO,SAASA,KAAK,CACnBC,IAAO,EACPC,OAAO,GAAG;EACR;EACAC,SAAS,EAAE,CAACC,EAAO,EAAEC,EAAO,KAAK,CAAC,CAAC;EACnC;EACAC,QAAQ,EAAE,CAACF,EAAO,EAAEC,EAAO,KAAK,CAAC;AACnC,CAAC,EACS;EACV,MAAM;IAAEF,SAAS;IAAEG;EAAS,CAAC,GAAGJ,OAAO;EACvC,OAAO,UAAUK,MAAc,EAAY;IACzC,OAAO,UAAUC,GAAmB,EAAEC,GAAoB,EAAEC,IAAsB,EAAQ;MACxFF,GAAG,CAACG,KAAK,EAAE;MACX,MAAMC,WAAW,GAAGJ,GAAG,CAACK,MAAM,CAACC,KAAK,GAC/B,IAAGN,GAAG,CAACK,MAAM,CAACC,KAAM,IAAGN,GAAG,CAACK,MAAM,CAACE,OAAQ,EAAC,GAC5CP,GAAG,CAACK,MAAM,CAACE,OAAO;MACtB,MAAMC,cAAc,GAAGR,GAAG,CAACK,MAAM,CAACI,QAAQ,GACtC,IAAAC,4BAAqB,EAACV,GAAG,CAACK,MAAM,CAACI,QAAQ,CAAC,GAC1CE,SAAS;MACb,MAAMC,MAAM,GAAGZ,GAAG,CAACa,WAAW;MAC9BlB,SAAS,aAATA,SAAS,uBAATA,SAAS,CACP;QAAEI,MAAM;QAAEe,IAAI,EAAEF,MAAM,aAANA,MAAM,uBAANA,MAAM,CAAEG;MAAK,CAAC,EAC7B,iDAAgD,CAClD;MACDtB,IAAI,CAAC,QAAQ,GAAGM,MAAM,CAAC,CACrB;QAAEK,WAAW;QAAEI;MAAe,CAAC,EAC/BI,MAAM,EACN,UAAUI,KAAK,EAAEC,OAAO,EAAQ;QAC9BjB,GAAG,CAACkB,MAAM,EAAE;QACZ,IAAIF,KAAK,EAAE;UACTd,IAAI,CAACc,KAAK,CAAC;QACb,CAAC,MAAM,IAAIC,OAAO,EAAE;UAClBnB,QAAQ,aAARA,QAAQ,uBAARA,QAAQ,CACN;YAAEC,MAAM;YAAEe,IAAI,EAAEF,MAAM,aAANA,MAAM,uBAANA,MAAM,CAAEG;UAAK,CAAC,EAC7B,mDAAkD,CACpD;UACDb,IAAI,EAAE;QACR,CAAC,MAAM;UACL;UACA;UACA,MAAMiB,gBAAU,CAACC,gBAAgB,CAACC,eAAS,CAACC,YAAY,CAAC;QAC3D;MACF,CAAC,CACF;IACH,CAAC;EACH,CAAC;AACH"}

package/jest.config.js

@@ -4,8 +4,8 @@ module.exports = Object.assign({}, config, {
   coverageThreshold: {
     global: {
       lines: 67,
-      functions: 75,
-      branches: 56,
+      functions: 70,
+      branches: 55,
       statements: 67,
     },
   },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@verdaccio/middleware",
-  "version": "6.0.0-6-next.36",
-  "description": "loaders logic",
+  "version": "6.0.0-6-next.38",
+  "description": "express middleware utils",
   "main": "./build/index.js",
   "types": "build/index.d.ts",
   "author": {
@@ -29,8 +29,8 @@
     "node": ">=12"
   },
   "dependencies": {
-    "@verdaccio/core": "6.0.0-6-next.57",
-    "@verdaccio/utils": "6.0.0-6-next.25",
+    "@verdaccio/core": "6.0.0-6-next.59",
+    "@verdaccio/utils": "6.0.0-6-next.27",
     "debug": "4.3.4",
     "lodash": "4.17.21",
     "mime": "2.6.0"
@@ -40,7 +40,7 @@
     "url": "https://opencollective.com/verdaccio"
   },
   "devDependencies": {
-    "@verdaccio/logger": "6.0.0-6-next.25",
+    "@verdaccio/logger": "6.0.0-6-next.27",
     "body-parser": "1.20.1",
     "supertest": "6.3.3"
   },

package/src/middlewares/allow.ts

@@ -1,10 +1,18 @@
 import { API_ERROR, errorUtils } from '@verdaccio/core';
-import { logger } from '@verdaccio/logger';
 import { getVersionFromTarball } from '@verdaccio/utils';
 
 import { $NextFunctionVer, $RequestExtend, $ResponseExtend } from '../types';
 
-export function allow<T>(auth: T): Function {
+export function allow<T>(
+  auth: T,
+  options = {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    beforeAll: (_a: any, _b: any) => {},
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    afterAll: (_a: any, _b: any) => {},
+  }
+): Function {
+  const { beforeAll, afterAll } = options;
   return function (action: string): Function {
     return function (req: $RequestExtend, res: $ResponseExtend, next: $NextFunctionVer): void {
       req.pause();
@@ -15,7 +23,7 @@ export function allow<T>(auth: T): Function {
         ? getVersionFromTarball(req.params.filename)
         : undefined;
       const remote = req.remote_user;
-      logger.trace(
+      beforeAll?.(
         { action, user: remote?.name },
         `[middleware/allow][@{action}] allow for @{user}`
       );
@@ -27,6 +35,10 @@ export function allow<T>(auth: T): Function {
           if (error) {
             next(error);
           } else if (allowed) {
+            afterAll?.(
+              { action, user: remote?.name },
+              `[middleware/allow][@{action}] allowed for @{user}`
+            );
             next();
           } else {
             // last plugin (that's our built-in one) returns either

package/test/allow.spec.ts

@@ -1,7 +1,7 @@
 import request from 'supertest';
 
 import { HTTP_STATUS } from '@verdaccio/core';
-import { setup } from '@verdaccio/logger';
+import { logger, setup } from '@verdaccio/logger';
 
 import { allow } from '../src';
 import { getApp } from './helper';
@@ -9,11 +9,14 @@ import { getApp } from './helper';
 setup({});
 
 test('should allow request', async () => {
-  const can = allow({
-    allow_publish: (params, remove, cb) => {
-      return cb(null, true);
+  const can = allow(
+    {
+      allow_publish: (params, remove, cb) => {
+        return cb(null, true);
+      },
     },
-  });
+    logger
+  );
   const app = getApp([]);
   // @ts-ignore
   app.get('/:package', can('publish'), (req, res) => {
@@ -24,11 +27,14 @@ test('should allow request', async () => {
 });
 
 test('should allow scope request', async () => {
-  const can = allow({
-    allow_publish: (params, remove, cb) => {
-      return cb(null, true);
+  const can = allow(
+    {
+      allow_publish: (params, remove, cb) => {
+        return cb(null, true);
+      },
     },
-  });
+    logger
+  );
   const app = getApp([]);
   // @ts-ignore
   app.get('/:package/:scope', can('publish'), (req, res) => {
@@ -39,11 +45,14 @@ test('should allow scope request', async () => {
 });
 
 test('should allow filename request', async () => {
-  const can = allow({
-    allow_publish: (params, remove, cb) => {
-      return cb(null, true);
+  const can = allow(
+    {
+      allow_publish: (params, remove, cb) => {
+        return cb(null, true);
+      },
     },
-  });
+    logger
+  );
   const app = getApp([]);
   // @ts-ignore
   app.get('/:filename', can('publish'), (req, res) => {
@@ -54,11 +63,14 @@ test('should allow filename request', async () => {
 });
 
 test('should not allow request', async () => {
-  const can = allow({
-    allow_publish: (params, remove, cb) => {
-      return cb(null, false);
+  const can = allow(
+    {
+      allow_publish: (params, remove, cb) => {
+        return cb(null, false);
+      },
     },
-  });
+    logger
+  );
   const app = getApp([]);
   // @ts-ignore
   app.get('/sec', can('publish'), (req, res) => {
@@ -69,11 +81,14 @@ test('should not allow request', async () => {
 });
 
 test('should handle error request', async () => {
-  const can = allow({
-    allow_publish: (params, remove, cb) => {
-      return cb(Error('foo error'));
+  const can = allow(
+    {
+      allow_publish: (params, remove, cb) => {
+        return cb(Error('foo error'));
+      },
     },
-  });
+    logger
+  );
   const app = getApp([]);
   // @ts-ignore
   app.get('/err', can('publish'));

package/tsconfig.json

@@ -11,7 +11,7 @@
       "path": "../auth"
     },
     {
-      "path": "../logger"
+      "path": "../logger/logger"
     },
     {
       "path": "../utils"