@verdaccio/middleware 6.0.0-6-next.51 → 6.0.0-6-next.53

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @verdaccio/middleware
 
+## 6.0.0-6-next.53
+
+### Minor Changes
+
+- ae93e039d: fix: expose middleware methods
+
+### Patch Changes
+
+- @verdaccio/core@6.0.0-6-next.74
+- @verdaccio/config@6.0.0-6-next.74
+- @verdaccio/url@11.0.0-6-next.40
+- @verdaccio/utils@6.0.0-6-next.42
+
+## 6.0.0-6-next.52
+
+### Patch Changes
+
+- f859d2b1a: fix: official package "-" cannot be synced
+- Updated dependencies [f859d2b1a]
+  - @verdaccio/core@6.0.0-6-next.73
+  - @verdaccio/config@6.0.0-6-next.73
+  - @verdaccio/url@11.0.0-6-next.39
+  - @verdaccio/utils@6.0.0-6-next.41
+
 ## 6.0.0-6-next.51
 
 ### Patch Changes

package/build/index.d.ts

@@ -9,7 +9,7 @@ export { final } from './middlewares/final';
 export { allow } from './middlewares/allow';
 export { rateLimit } from './middlewares/rate-limit';
 export { userAgent } from './middlewares/user-agent';
-export { webMiddleware } from './middlewares/web';
+export { webMiddleware, renderWebMiddleware } from './middlewares/web';
 export { errorReportingMiddleware, handleError } from './middlewares/error';
 export { log, LOG_STATUS_MESSAGE, LOG_VERDACCIO_BYTES, LOG_VERDACCIO_ERROR, } from './middlewares/log';
 export * from './types';

package/build/index.js

@@ -17,6 +17,7 @@ var _exportNames = {
   rateLimit: true,
   userAgent: true,
   webMiddleware: true,
+  renderWebMiddleware: true,
   errorReportingMiddleware: true,
   handleError: true,
   log: true,
@@ -108,6 +109,12 @@ Object.defineProperty(exports, "rateLimit", {
     return _rateLimit.rateLimit;
   }
 });
+Object.defineProperty(exports, "renderWebMiddleware", {
+  enumerable: true,
+  get: function () {
+    return _web.renderWebMiddleware;
+  }
+});
 Object.defineProperty(exports, "setSecurityWebHeaders", {
   enumerable: true,
   get: function () {

package/build/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["_match","require","_securityHeaders","_validation","_media","_encodePkg","_json","_antiLoop","_final","_allow","_rateLimit","_userAgent","_web","_error","_log","_types","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get"],"sources":["../src/index.ts"],"sourcesContent":["export { match } from './middlewares/match';\nexport { setSecurityWebHeaders } from './middlewares/security-headers';\nexport { validateName, validatePackage } from './middlewares/validation';\nexport { media } from './middlewares/media';\nexport { encodeScopePackage } from './middlewares/encode-pkg';\nexport { expectJson } from './middlewares/json';\nexport { antiLoop } from './middlewares/antiLoop';\nexport { final } from './middlewares/final';\nexport { allow } from './middlewares/allow';\nexport { rateLimit } from './middlewares/rate-limit';\nexport { userAgent } from './middlewares/user-agent';\nexport { webMiddleware } from './middlewares/web';\nexport { errorReportingMiddleware, handleError } from './middlewares/error';\nexport {\n  log,\n  LOG_STATUS_MESSAGE,\n  LOG_VERDACCIO_BYTES,\n  LOG_VERDACCIO_ERROR,\n} from './middlewares/log';\nexport * from './types';\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,gBAAA,GAAAD,OAAA;AACA,IAAAE,WAAA,GAAAF,OAAA;AACA,IAAAG,MAAA,GAAAH,OAAA;AACA,IAAAI,UAAA,GAAAJ,OAAA;AACA,IAAAK,KAAA,GAAAL,OAAA;AACA,IAAAM,SAAA,GAAAN,OAAA;AACA,IAAAO,MAAA,GAAAP,OAAA;AACA,IAAAQ,MAAA,GAAAR,OAAA;AACA,IAAAS,UAAA,GAAAT,OAAA;AACA,IAAAU,UAAA,GAAAV,OAAA;AACA,IAAAW,IAAA,GAAAX,OAAA;AACA,IAAAY,MAAA,GAAAZ,OAAA;AACA,IAAAa,IAAA,GAAAb,OAAA;AAMA,IAAAc,MAAA,GAAAd,OAAA;AAAAe,MAAA,CAAAC,IAAA,CAAAF,MAAA,EAAAG,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAC,YAAA,EAAAJ,GAAA;EAAA,IAAAA,GAAA,IAAAK,OAAA,IAAAA,OAAA,CAAAL,GAAA,MAAAJ,MAAA,CAAAI,GAAA;EAAAH,MAAA,CAAAS,cAAA,CAAAD,OAAA,EAAAL,GAAA;IAAAO,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAZ,MAAA,CAAAI,GAAA;IAAA;EAAA;AAAA"}
+{"version":3,"file":"index.js","names":["_match","require","_securityHeaders","_validation","_media","_encodePkg","_json","_antiLoop","_final","_allow","_rateLimit","_userAgent","_web","_error","_log","_types","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get"],"sources":["../src/index.ts"],"sourcesContent":["export { match } from './middlewares/match';\nexport { setSecurityWebHeaders } from './middlewares/security-headers';\nexport { validateName, validatePackage } from './middlewares/validation';\nexport { media } from './middlewares/media';\nexport { encodeScopePackage } from './middlewares/encode-pkg';\nexport { expectJson } from './middlewares/json';\nexport { antiLoop } from './middlewares/antiLoop';\nexport { final } from './middlewares/final';\nexport { allow } from './middlewares/allow';\nexport { rateLimit } from './middlewares/rate-limit';\nexport { userAgent } from './middlewares/user-agent';\nexport { webMiddleware, renderWebMiddleware } from './middlewares/web';\nexport { errorReportingMiddleware, handleError } from './middlewares/error';\nexport {\n  log,\n  LOG_STATUS_MESSAGE,\n  LOG_VERDACCIO_BYTES,\n  LOG_VERDACCIO_ERROR,\n} from './middlewares/log';\nexport * from './types';\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,gBAAA,GAAAD,OAAA;AACA,IAAAE,WAAA,GAAAF,OAAA;AACA,IAAAG,MAAA,GAAAH,OAAA;AACA,IAAAI,UAAA,GAAAJ,OAAA;AACA,IAAAK,KAAA,GAAAL,OAAA;AACA,IAAAM,SAAA,GAAAN,OAAA;AACA,IAAAO,MAAA,GAAAP,OAAA;AACA,IAAAQ,MAAA,GAAAR,OAAA;AACA,IAAAS,UAAA,GAAAT,OAAA;AACA,IAAAU,UAAA,GAAAV,OAAA;AACA,IAAAW,IAAA,GAAAX,OAAA;AACA,IAAAY,MAAA,GAAAZ,OAAA;AACA,IAAAa,IAAA,GAAAb,OAAA;AAMA,IAAAc,MAAA,GAAAd,OAAA;AAAAe,MAAA,CAAAC,IAAA,CAAAF,MAAA,EAAAG,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAC,YAAA,EAAAJ,GAAA;EAAA,IAAAA,GAAA,IAAAK,OAAA,IAAAA,OAAA,CAAAL,GAAA,MAAAJ,MAAA,CAAAI,GAAA;EAAAH,MAAA,CAAAS,cAAA,CAAAD,OAAA,EAAAL,GAAA;IAAAO,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAZ,MAAA,CAAAI,GAAA;IAAA;EAAA;AAAA"}

package/build/middlewares/validation.d.ts

@@ -1,2 +1,3 @@
-export declare function validateName(_req: any, _res: any, next: any, value: string, name: string): void;
-export declare function validatePackage(_req: any, _res: any, next: any, value: string, name: string): void;
+import { NextFunction, Request, Response } from 'express';
+export declare function validateName(_req: Request, _res: Response, next: NextFunction, value: string, name: string): void;
+export declare function validatePackage(_req: Request, _res: any, next: NextFunction, value: string, name: string): void;

package/build/middlewares/validation.js

@@ -6,25 +6,18 @@ Object.defineProperty(exports, "__esModule", {
 exports.validateName = validateName;
 exports.validatePackage = validatePackage;
 var _core = require("@verdaccio/core");
-var _utils = require("@verdaccio/utils");
 function validateName(_req, _res, next, value, name) {
-  if (value === '-') {
-    // special case in couchdb usually
-    next('route');
-  } else if ((0, _utils.validateName)(value)) {
+  if (_core.validationUtils.validateName(value)) {
     next();
   } else {
-    next(_core.errorUtils.getForbidden('invalid ' + name));
+    next(_core.errorUtils.getBadRequest('invalid ' + name));
   }
 }
 function validatePackage(_req, _res, next, value, name) {
-  if (value === '-') {
-    // special case in couchdb usually
-    next('route');
-  } else if ((0, _utils.validatePackage)(value)) {
+  if (_core.validationUtils.validatePackage(value)) {
     next();
   } else {
-    next(_core.errorUtils.getForbidden('invalid ' + name));
+    next(_core.errorUtils.getBadRequest('invalid ' + name));
   }
 }
 //# sourceMappingURL=validation.js.map

package/build/middlewares/validation.js.map

@@ -1 +1 @@
-{"version":3,"file":"validation.js","names":["_core","require","_utils","validateName","_req","_res","next","value","name","utilValidateName","errorUtils","getForbidden","validatePackage","utilValidatePackage"],"sources":["../../src/middlewares/validation.ts"],"sourcesContent":["import { errorUtils } from '@verdaccio/core';\nimport {\n  validateName as utilValidateName,\n  validatePackage as utilValidatePackage,\n} from '@verdaccio/utils';\n\nexport function validateName(_req, _res, next, value: string, name: string) {\n  if (value === '-') {\n    // special case in couchdb usually\n    next('route');\n  } else if (utilValidateName(value)) {\n    next();\n  } else {\n    next(errorUtils.getForbidden('invalid ' + name));\n  }\n}\n\nexport function validatePackage(_req, _res, next, value: string, name: string) {\n  if (value === '-') {\n    // special case in couchdb usually\n    next('route');\n  } else if (utilValidatePackage(value)) {\n    next();\n  } else {\n    next(errorUtils.getForbidden('invalid ' + name));\n  }\n}\n"],"mappings":";;;;;;;AAAA,IAAAA,KAAA,GAAAC,OAAA;AACA,IAAAC,MAAA,GAAAD,OAAA;AAKO,SAASE,YAAYA,CAACC,IAAI,EAAEC,IAAI,EAAEC,IAAI,EAAEC,KAAa,EAAEC,IAAY,EAAE;EAC1E,IAAID,KAAK,KAAK,GAAG,EAAE;IACjB;IACAD,IAAI,CAAC,OAAO,CAAC;EACf,CAAC,MAAM,IAAI,IAAAG,mBAAgB,EAACF,KAAK,CAAC,EAAE;IAClCD,IAAI,CAAC,CAAC;EACR,CAAC,MAAM;IACLA,IAAI,CAACI,gBAAU,CAACC,YAAY,CAAC,UAAU,GAAGH,IAAI,CAAC,CAAC;EAClD;AACF;AAEO,SAASI,eAAeA,CAACR,IAAI,EAAEC,IAAI,EAAEC,IAAI,EAAEC,KAAa,EAAEC,IAAY,EAAE;EAC7E,IAAID,KAAK,KAAK,GAAG,EAAE;IACjB;IACAD,IAAI,CAAC,OAAO,CAAC;EACf,CAAC,MAAM,IAAI,IAAAO,sBAAmB,EAACN,KAAK,CAAC,EAAE;IACrCD,IAAI,CAAC,CAAC;EACR,CAAC,MAAM;IACLA,IAAI,CAACI,gBAAU,CAACC,YAAY,CAAC,UAAU,GAAGH,IAAI,CAAC,CAAC;EAClD;AACF"}
+{"version":3,"file":"validation.js","names":["_core","require","validateName","_req","_res","next","value","name","validationUtils","errorUtils","getBadRequest","validatePackage"],"sources":["../../src/middlewares/validation.ts"],"sourcesContent":["import { NextFunction, Request, Response } from 'express';\n\nimport { errorUtils, validationUtils } from '@verdaccio/core';\n\nexport function validateName(\n  _req: Request,\n  _res: Response,\n  next: NextFunction,\n  value: string,\n  name: string\n) {\n  if (validationUtils.validateName(value)) {\n    next();\n  } else {\n    next(errorUtils.getBadRequest('invalid ' + name));\n  }\n}\n\nexport function validatePackage(\n  _req: Request,\n  _res,\n  next: NextFunction,\n  value: string,\n  name: string\n) {\n  if (validationUtils.validatePackage(value)) {\n    next();\n  } else {\n    next(errorUtils.getBadRequest('invalid ' + name));\n  }\n}\n"],"mappings":";;;;;;;AAEA,IAAAA,KAAA,GAAAC,OAAA;AAEO,SAASC,YAAYA,CAC1BC,IAAa,EACbC,IAAc,EACdC,IAAkB,EAClBC,KAAa,EACbC,IAAY,EACZ;EACA,IAAIC,qBAAe,CAACN,YAAY,CAACI,KAAK,CAAC,EAAE;IACvCD,IAAI,CAAC,CAAC;EACR,CAAC,MAAM;IACLA,IAAI,CAACI,gBAAU,CAACC,aAAa,CAAC,UAAU,GAAGH,IAAI,CAAC,CAAC;EACnD;AACF;AAEO,SAASI,eAAeA,CAC7BR,IAAa,EACbC,IAAI,EACJC,IAAkB,EAClBC,KAAa,EACbC,IAAY,EACZ;EACA,IAAIC,qBAAe,CAACG,eAAe,CAACL,KAAK,CAAC,EAAE;IAC1CD,IAAI,CAAC,CAAC;EACR,CAAC,MAAM;IACLA,IAAI,CAACI,gBAAU,CAACC,aAAa,CAAC,UAAU,GAAGH,IAAI,CAAC,CAAC;EACnD;AACF"}

package/build/middlewares/web/index.d.ts

@@ -1 +1,4 @@
 export { default as webMiddleware } from './web-middleware';
+export { webAPIMiddleware } from './web-api';
+export { setSecurityWebHeaders } from './security';
+export { renderWebMiddleware } from './render-web';

package/build/middlewares/web/index.js

@@ -3,6 +3,24 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+Object.defineProperty(exports, "renderWebMiddleware", {
+  enumerable: true,
+  get: function () {
+    return _renderWeb.renderWebMiddleware;
+  }
+});
+Object.defineProperty(exports, "setSecurityWebHeaders", {
+  enumerable: true,
+  get: function () {
+    return _security.setSecurityWebHeaders;
+  }
+});
+Object.defineProperty(exports, "webAPIMiddleware", {
+  enumerable: true,
+  get: function () {
+    return _webApi.webAPIMiddleware;
+  }
+});
 Object.defineProperty(exports, "webMiddleware", {
   enumerable: true,
   get: function () {
@@ -10,5 +28,8 @@ Object.defineProperty(exports, "webMiddleware", {
   }
 });
 var _webMiddleware = _interopRequireDefault(require("./web-middleware"));
+var _webApi = require("./web-api");
+var _security = require("./security");
+var _renderWeb = require("./render-web");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 //# sourceMappingURL=index.js.map

package/build/middlewares/web/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["_webMiddleware","_interopRequireDefault","require","obj","__esModule","default"],"sources":["../../../src/middlewares/web/index.ts"],"sourcesContent":["export { default as webMiddleware } from './web-middleware';\n"],"mappings":";;;;;;;;;;;AAAA,IAAAA,cAAA,GAAAC,sBAAA,CAAAC,OAAA;AAA4D,SAAAD,uBAAAE,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA"}
+{"version":3,"file":"index.js","names":["_webMiddleware","_interopRequireDefault","require","_webApi","_security","_renderWeb","obj","__esModule","default"],"sources":["../../../src/middlewares/web/index.ts"],"sourcesContent":["export { default as webMiddleware } from './web-middleware';\nexport { webAPIMiddleware } from './web-api';\nexport { setSecurityWebHeaders } from './security';\nexport { renderWebMiddleware } from './render-web';\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,cAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,OAAA,GAAAD,OAAA;AACA,IAAAE,SAAA,GAAAF,OAAA;AACA,IAAAG,UAAA,GAAAH,OAAA;AAAmD,SAAAD,uBAAAK,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA"}

package/build/middlewares/web/web-api.d.ts

@@ -1 +1,2 @@
-export declare function webMiddleware(tokenMiddleware: any, webEndpointsApi: any): import("express-serve-static-core").Router;
+import { RequestHandler, Router } from 'express';
+export declare function webAPIMiddleware(tokenMiddleware: RequestHandler, webEndpointsApi: RequestHandler): Router;

package/build/middlewares/web/web-api.js

@@ -3,13 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.webMiddleware = webMiddleware;
+exports.webAPIMiddleware = webAPIMiddleware;
 var _express = _interopRequireWildcard(require("express"));
 var _validation = require("../validation");
 var _security = require("./security");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-function webMiddleware(tokenMiddleware, webEndpointsApi) {
+function webAPIMiddleware(tokenMiddleware, webEndpointsApi) {
   // eslint-disable-next-line new-cap
   const route = (0, _express.Router)();
   // validate all of these params as a package name
@@ -20,11 +20,11 @@ function webMiddleware(tokenMiddleware, webEndpointsApi) {
   route.use(_express.default.urlencoded({
     extended: false
   }));
+  route.use(_security.setSecurityWebHeaders);
   if (typeof tokenMiddleware === 'function') {
     route.use(tokenMiddleware);
   }
-  route.use(_security.setSecurityWebHeaders);
-  if (webEndpointsApi) {
+  if (typeof webEndpointsApi === 'function') {
     route.use(webEndpointsApi);
   }
   return route;

package/build/middlewares/web/web-api.js.map

@@ -1 +1 @@
-{"version":3,"file":"web-api.js","names":["_express","_interopRequireWildcard","require","_validation","_security","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","webMiddleware","tokenMiddleware","webEndpointsApi","route","Router","param","validatePackage","validateName","use","express","urlencoded","extended","setSecurityWebHeaders"],"sources":["../../../src/middlewares/web/web-api.ts"],"sourcesContent":["import express from 'express';\nimport { Router } from 'express';\n\nimport { validateName, validatePackage } from '../validation';\nimport { setSecurityWebHeaders } from './security';\n\nexport function webMiddleware(tokenMiddleware, webEndpointsApi) {\n  // eslint-disable-next-line new-cap\n  const route = Router();\n  // validate all of these params as a package name\n  // this might be too harsh, so ask if it causes trouble=\n  route.param('package', validatePackage);\n  route.param('filename', validateName);\n  route.param('version', validateName);\n  route.use(express.urlencoded({ extended: false }));\n\n  if (typeof tokenMiddleware === 'function') {\n    route.use(tokenMiddleware);\n  }\n\n  route.use(setSecurityWebHeaders);\n\n  if (webEndpointsApi) {\n    route.use(webEndpointsApi);\n  }\n  return route;\n}\n"],"mappings":";;;;;;AAAA,IAAAA,QAAA,GAAAC,uBAAA,CAAAC,OAAA;AAGA,IAAAC,WAAA,GAAAD,OAAA;AACA,IAAAE,SAAA,GAAAF,OAAA;AAAmD,SAAAG,yBAAAC,WAAA,eAAAC,OAAA,kCAAAC,iBAAA,OAAAD,OAAA,QAAAE,gBAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,WAAA,WAAAA,WAAA,GAAAG,gBAAA,GAAAD,iBAAA,KAAAF,WAAA;AAAA,SAAAL,wBAAAS,GAAA,EAAAJ,WAAA,SAAAA,WAAA,IAAAI,GAAA,IAAAA,GAAA,CAAAC,UAAA,WAAAD,GAAA,QAAAA,GAAA,oBAAAA,GAAA,wBAAAA,GAAA,4BAAAE,OAAA,EAAAF,GAAA,UAAAG,KAAA,GAAAR,wBAAA,CAAAC,WAAA,OAAAO,KAAA,IAAAA,KAAA,CAAAC,GAAA,CAAAJ,GAAA,YAAAG,KAAA,CAAAE,GAAA,CAAAL,GAAA,SAAAM,MAAA,WAAAC,qBAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,GAAA,IAAAX,GAAA,QAAAW,GAAA,kBAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAd,GAAA,EAAAW,GAAA,SAAAI,IAAA,GAAAR,qBAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAV,GAAA,EAAAW,GAAA,cAAAI,IAAA,KAAAA,IAAA,CAAAV,GAAA,IAAAU,IAAA,CAAAC,GAAA,KAAAR,MAAA,CAAAC,cAAA,CAAAH,MAAA,EAAAK,GAAA,EAAAI,IAAA,YAAAT,MAAA,CAAAK,GAAA,IAAAX,GAAA,CAAAW,GAAA,SAAAL,MAAA,CAAAJ,OAAA,GAAAF,GAAA,MAAAG,KAAA,IAAAA,KAAA,CAAAa,GAAA,CAAAhB,GAAA,EAAAM,MAAA,YAAAA,MAAA;AAE5C,SAASW,aAAaA,CAACC,eAAe,EAAEC,eAAe,EAAE;EAC9D;EACA,MAAMC,KAAK,GAAG,IAAAC,eAAM,EAAC,CAAC;EACtB;EACA;EACAD,KAAK,CAACE,KAAK,CAAC,SAAS,EAAEC,2BAAe,CAAC;EACvCH,KAAK,CAACE,KAAK,CAAC,UAAU,EAAEE,wBAAY,CAAC;EACrCJ,KAAK,CAACE,KAAK,CAAC,SAAS,EAAEE,wBAAY,CAAC;EACpCJ,KAAK,CAACK,GAAG,CAACC,gBAAO,CAACC,UAAU,CAAC;IAAEC,QAAQ,EAAE;EAAM,CAAC,CAAC,CAAC;EAElD,IAAI,OAAOV,eAAe,KAAK,UAAU,EAAE;IACzCE,KAAK,CAACK,GAAG,CAACP,eAAe,CAAC;EAC5B;EAEAE,KAAK,CAACK,GAAG,CAACI,+BAAqB,CAAC;EAEhC,IAAIV,eAAe,EAAE;IACnBC,KAAK,CAACK,GAAG,CAACN,eAAe,CAAC;EAC5B;EACA,OAAOC,KAAK;AACd"}
+{"version":3,"file":"web-api.js","names":["_express","_interopRequireWildcard","require","_validation","_security","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","webAPIMiddleware","tokenMiddleware","webEndpointsApi","route","Router","param","validatePackage","validateName","use","express","urlencoded","extended","setSecurityWebHeaders"],"sources":["../../../src/middlewares/web/web-api.ts"],"sourcesContent":["import express from 'express';\nimport { RequestHandler, Router } from 'express';\n\nimport { validateName, validatePackage } from '../validation';\nimport { setSecurityWebHeaders } from './security';\n\nexport function webAPIMiddleware(\n  tokenMiddleware: RequestHandler,\n  webEndpointsApi: RequestHandler\n): Router {\n  // eslint-disable-next-line new-cap\n  const route = Router();\n  // validate all of these params as a package name\n  // this might be too harsh, so ask if it causes trouble=\n  route.param('package', validatePackage);\n  route.param('filename', validateName);\n  route.param('version', validateName);\n  route.use(express.urlencoded({ extended: false }));\n  route.use(setSecurityWebHeaders);\n\n  if (typeof tokenMiddleware === 'function') {\n    route.use(tokenMiddleware);\n  }\n\n  if (typeof webEndpointsApi === 'function') {\n    route.use(webEndpointsApi);\n  }\n\n  return route;\n}\n"],"mappings":";;;;;;AAAA,IAAAA,QAAA,GAAAC,uBAAA,CAAAC,OAAA;AAGA,IAAAC,WAAA,GAAAD,OAAA;AACA,IAAAE,SAAA,GAAAF,OAAA;AAAmD,SAAAG,yBAAAC,WAAA,eAAAC,OAAA,kCAAAC,iBAAA,OAAAD,OAAA,QAAAE,gBAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,WAAA,WAAAA,WAAA,GAAAG,gBAAA,GAAAD,iBAAA,KAAAF,WAAA;AAAA,SAAAL,wBAAAS,GAAA,EAAAJ,WAAA,SAAAA,WAAA,IAAAI,GAAA,IAAAA,GAAA,CAAAC,UAAA,WAAAD,GAAA,QAAAA,GAAA,oBAAAA,GAAA,wBAAAA,GAAA,4BAAAE,OAAA,EAAAF,GAAA,UAAAG,KAAA,GAAAR,wBAAA,CAAAC,WAAA,OAAAO,KAAA,IAAAA,KAAA,CAAAC,GAAA,CAAAJ,GAAA,YAAAG,KAAA,CAAAE,GAAA,CAAAL,GAAA,SAAAM,MAAA,WAAAC,qBAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,GAAA,IAAAX,GAAA,QAAAW,GAAA,kBAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAd,GAAA,EAAAW,GAAA,SAAAI,IAAA,GAAAR,qBAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAV,GAAA,EAAAW,GAAA,cAAAI,IAAA,KAAAA,IAAA,CAAAV,GAAA,IAAAU,IAAA,CAAAC,GAAA,KAAAR,MAAA,CAAAC,cAAA,CAAAH,MAAA,EAAAK,GAAA,EAAAI,IAAA,YAAAT,MAAA,CAAAK,GAAA,IAAAX,GAAA,CAAAW,GAAA,SAAAL,MAAA,CAAAJ,OAAA,GAAAF,GAAA,MAAAG,KAAA,IAAAA,KAAA,CAAAa,GAAA,CAAAhB,GAAA,EAAAM,MAAA,YAAAA,MAAA;AAE5C,SAASW,gBAAgBA,CAC9BC,eAA+B,EAC/BC,eAA+B,EACvB;EACR;EACA,MAAMC,KAAK,GAAG,IAAAC,eAAM,EAAC,CAAC;EACtB;EACA;EACAD,KAAK,CAACE,KAAK,CAAC,SAAS,EAAEC,2BAAe,CAAC;EACvCH,KAAK,CAACE,KAAK,CAAC,UAAU,EAAEE,wBAAY,CAAC;EACrCJ,KAAK,CAACE,KAAK,CAAC,SAAS,EAAEE,wBAAY,CAAC;EACpCJ,KAAK,CAACK,GAAG,CAACC,gBAAO,CAACC,UAAU,CAAC;IAAEC,QAAQ,EAAE;EAAM,CAAC,CAAC,CAAC;EAClDR,KAAK,CAACK,GAAG,CAACI,+BAAqB,CAAC;EAEhC,IAAI,OAAOX,eAAe,KAAK,UAAU,EAAE;IACzCE,KAAK,CAACK,GAAG,CAACP,eAAe,CAAC;EAC5B;EAEA,IAAI,OAAOC,eAAe,KAAK,UAAU,EAAE;IACzCC,KAAK,CAACK,GAAG,CAACN,eAAe,CAAC;EAC5B;EAEA,OAAOC,KAAK;AACd"}

package/build/middlewares/web/web-middleware.js

@@ -18,7 +18,7 @@ var _default = (config, middlewares, pluginOptions) => {
   // render web
   router.use('/', (0, _renderWeb.renderWebMiddleware)(config, tokenMiddleware, pluginOptions));
   // web endpoints, search, packages, etc
-  router.use('/-/verdaccio/', (0, _webApi.webMiddleware)(tokenMiddleware, webEndpointsApi));
+  router.use('/-/verdaccio/', (0, _webApi.webAPIMiddleware)(tokenMiddleware, webEndpointsApi));
   return router;
 };
 exports.default = _default;

package/build/middlewares/web/web-middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"web-middleware.js","names":["_express","_interopRequireDefault","require","_renderWeb","_webApi","obj","__esModule","default","_default","config","middlewares","pluginOptions","router","express","Router","tokenMiddleware","webEndpointsApi","use","renderWebMiddleware","webMiddleware","exports"],"sources":["../../../src/middlewares/web/web-middleware.ts"],"sourcesContent":["import express from 'express';\n\nimport { renderWebMiddleware } from './render-web';\nimport { webMiddleware } from './web-api';\n\nexport default (config, middlewares, pluginOptions): any => {\n  // eslint-disable-next-line new-cap\n  const router = express.Router();\n  const { tokenMiddleware, webEndpointsApi } = middlewares;\n  // render web\n  router.use('/', renderWebMiddleware(config, tokenMiddleware, pluginOptions));\n  // web endpoints, search, packages, etc\n  router.use('/-/verdaccio/', webMiddleware(tokenMiddleware, webEndpointsApi));\n  return router;\n};\n"],"mappings":";;;;;;AAAA,IAAAA,QAAA,GAAAC,sBAAA,CAAAC,OAAA;AAEA,IAAAC,UAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAF,OAAA;AAA0C,SAAAD,uBAAAI,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAAA,IAAAG,QAAA,GAE3BA,CAACC,MAAM,EAAEC,WAAW,EAAEC,aAAa,KAAU;EAC1D;EACA,MAAMC,MAAM,GAAGC,gBAAO,CAACC,MAAM,CAAC,CAAC;EAC/B,MAAM;IAAEC,eAAe;IAAEC;EAAgB,CAAC,GAAGN,WAAW;EACxD;EACAE,MAAM,CAACK,GAAG,CAAC,GAAG,EAAE,IAAAC,8BAAmB,EAACT,MAAM,EAAEM,eAAe,EAAEJ,aAAa,CAAC,CAAC;EAC5E;EACAC,MAAM,CAACK,GAAG,CAAC,eAAe,EAAE,IAAAE,qBAAa,EAACJ,eAAe,EAAEC,eAAe,CAAC,CAAC;EAC5E,OAAOJ,MAAM;AACf,CAAC;AAAAQ,OAAA,CAAAb,OAAA,GAAAC,QAAA"}
+{"version":3,"file":"web-middleware.js","names":["_express","_interopRequireDefault","require","_renderWeb","_webApi","obj","__esModule","default","_default","config","middlewares","pluginOptions","router","express","Router","tokenMiddleware","webEndpointsApi","use","renderWebMiddleware","webAPIMiddleware","exports"],"sources":["../../../src/middlewares/web/web-middleware.ts"],"sourcesContent":["import express from 'express';\n\nimport { renderWebMiddleware } from './render-web';\nimport { webAPIMiddleware } from './web-api';\n\nexport default (config, middlewares, pluginOptions): any => {\n  // eslint-disable-next-line new-cap\n  const router = express.Router();\n  const { tokenMiddleware, webEndpointsApi } = middlewares;\n  // render web\n  router.use('/', renderWebMiddleware(config, tokenMiddleware, pluginOptions));\n  // web endpoints, search, packages, etc\n  router.use('/-/verdaccio/', webAPIMiddleware(tokenMiddleware, webEndpointsApi));\n  return router;\n};\n"],"mappings":";;;;;;AAAA,IAAAA,QAAA,GAAAC,sBAAA,CAAAC,OAAA;AAEA,IAAAC,UAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAF,OAAA;AAA6C,SAAAD,uBAAAI,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAAA,IAAAG,QAAA,GAE9BA,CAACC,MAAM,EAAEC,WAAW,EAAEC,aAAa,KAAU;EAC1D;EACA,MAAMC,MAAM,GAAGC,gBAAO,CAACC,MAAM,CAAC,CAAC;EAC/B,MAAM;IAAEC,eAAe;IAAEC;EAAgB,CAAC,GAAGN,WAAW;EACxD;EACAE,MAAM,CAACK,GAAG,CAAC,GAAG,EAAE,IAAAC,8BAAmB,EAACT,MAAM,EAAEM,eAAe,EAAEJ,aAAa,CAAC,CAAC;EAC5E;EACAC,MAAM,CAACK,GAAG,CAAC,eAAe,EAAE,IAAAE,wBAAgB,EAACJ,eAAe,EAAEC,eAAe,CAAC,CAAC;EAC/E,OAAOJ,MAAM;AACf,CAAC;AAAAQ,OAAA,CAAAb,OAAA,GAAAC,QAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@verdaccio/middleware",
-  "version": "6.0.0-6-next.51",
+  "version": "6.0.0-6-next.53",
   "description": "express middleware utils",
   "main": "./build/index.js",
   "types": "build/index.d.ts",
@@ -29,10 +29,10 @@
     "node": ">=12"
   },
   "dependencies": {
-    "@verdaccio/core": "6.0.0-6-next.72",
-    "@verdaccio/utils": "6.0.0-6-next.40",
-    "@verdaccio/config": "6.0.0-6-next.72",
-    "@verdaccio/url": "11.0.0-6-next.38",
+    "@verdaccio/core": "6.0.0-6-next.74",
+    "@verdaccio/utils": "6.0.0-6-next.42",
+    "@verdaccio/config": "6.0.0-6-next.74",
+    "@verdaccio/url": "11.0.0-6-next.40",
     "debug": "4.3.4",
     "lru-cache": "7.18.3",
     "express": "4.18.2",
@@ -45,7 +45,7 @@
     "url": "https://opencollective.com/verdaccio"
   },
   "devDependencies": {
-    "@verdaccio/logger": "6.0.0-6-next.40",
+    "@verdaccio/logger": "6.0.0-6-next.42",
     "body-parser": "1.20.2",
     "supertest": "6.3.3"
   },

package/src/index.ts

@@ -9,7 +9,7 @@ export { final } from './middlewares/final';
 export { allow } from './middlewares/allow';
 export { rateLimit } from './middlewares/rate-limit';
 export { userAgent } from './middlewares/user-agent';
-export { webMiddleware } from './middlewares/web';
+export { webMiddleware, renderWebMiddleware } from './middlewares/web';
 export { errorReportingMiddleware, handleError } from './middlewares/error';
 export {
   log,

package/src/middlewares/validation.ts

@@ -1,27 +1,31 @@
-import { errorUtils } from '@verdaccio/core';
-import {
-  validateName as utilValidateName,
-  validatePackage as utilValidatePackage,
-} from '@verdaccio/utils';
+import { NextFunction, Request, Response } from 'express';
 
-export function validateName(_req, _res, next, value: string, name: string) {
-  if (value === '-') {
-    // special case in couchdb usually
-    next('route');
-  } else if (utilValidateName(value)) {
+import { errorUtils, validationUtils } from '@verdaccio/core';
+
+export function validateName(
+  _req: Request,
+  _res: Response,
+  next: NextFunction,
+  value: string,
+  name: string
+) {
+  if (validationUtils.validateName(value)) {
     next();
   } else {
-    next(errorUtils.getForbidden('invalid ' + name));
+    next(errorUtils.getBadRequest('invalid ' + name));
   }
 }
 
-export function validatePackage(_req, _res, next, value: string, name: string) {
-  if (value === '-') {
-    // special case in couchdb usually
-    next('route');
-  } else if (utilValidatePackage(value)) {
+export function validatePackage(
+  _req: Request,
+  _res,
+  next: NextFunction,
+  value: string,
+  name: string
+) {
+  if (validationUtils.validatePackage(value)) {
     next();
   } else {
-    next(errorUtils.getForbidden('invalid ' + name));
+    next(errorUtils.getBadRequest('invalid ' + name));
   }
 }

package/src/middlewares/web/index.ts

@@ -1 +1,4 @@
 export { default as webMiddleware } from './web-middleware';
+export { webAPIMiddleware } from './web-api';
+export { setSecurityWebHeaders } from './security';
+export { renderWebMiddleware } from './render-web';

package/src/middlewares/web/web-api.ts

@@ -1,10 +1,13 @@
 import express from 'express';
-import { Router } from 'express';
+import { RequestHandler, Router } from 'express';
 
 import { validateName, validatePackage } from '../validation';
 import { setSecurityWebHeaders } from './security';
 
-export function webMiddleware(tokenMiddleware, webEndpointsApi) {
+export function webAPIMiddleware(
+  tokenMiddleware: RequestHandler,
+  webEndpointsApi: RequestHandler
+): Router {
   // eslint-disable-next-line new-cap
   const route = Router();
   // validate all of these params as a package name
@@ -13,15 +16,15 @@ export function webMiddleware(tokenMiddleware, webEndpointsApi) {
   route.param('filename', validateName);
   route.param('version', validateName);
   route.use(express.urlencoded({ extended: false }));
+  route.use(setSecurityWebHeaders);
 
   if (typeof tokenMiddleware === 'function') {
     route.use(tokenMiddleware);
   }
 
-  route.use(setSecurityWebHeaders);
-
-  if (webEndpointsApi) {
+  if (typeof webEndpointsApi === 'function') {
     route.use(webEndpointsApi);
   }
+
   return route;
 }

package/src/middlewares/web/web-middleware.ts

@@ -1,7 +1,7 @@
 import express from 'express';
 
 import { renderWebMiddleware } from './render-web';
-import { webMiddleware } from './web-api';
+import { webAPIMiddleware } from './web-api';
 
 export default (config, middlewares, pluginOptions): any => {
   // eslint-disable-next-line new-cap
@@ -10,6 +10,6 @@ export default (config, middlewares, pluginOptions): any => {
   // render web
   router.use('/', renderWebMiddleware(config, tokenMiddleware, pluginOptions));
   // web endpoints, search, packages, etc
-  router.use('/-/verdaccio/', webMiddleware(tokenMiddleware, webEndpointsApi));
+  router.use('/-/verdaccio/', webAPIMiddleware(tokenMiddleware, webEndpointsApi));
   return router;
 };

package/test/final.spec.ts

@@ -1,4 +1,3 @@
-import bodyParser from 'body-parser';
 import express from 'express';
 import request from 'supertest';
 
@@ -6,6 +5,8 @@ import { HEADERS, HTTP_STATUS } from '@verdaccio/core';
 
 import { final } from '../src';
 
+const bodyParser = express;
+
 test('handle error as object', async () => {
   const app = express();
   app.use(bodyParser.json({ strict: false, limit: '10mb' }));

package/test/json.spec.ts

@@ -1,4 +1,4 @@
-import bodyParser from 'body-parser';
+import express from 'express';
 import request from 'supertest';
 
 import { HEADERS, HTTP_STATUS } from '@verdaccio/core';
@@ -8,7 +8,7 @@ import { getApp } from './helper';
 
 test('body is json', async () => {
   const app = getApp([]);
-  app.use(bodyParser.json({ strict: false, limit: '10mb' }));
+  app.use(express.json({ strict: false, limit: '10mb' }));
   // @ts-ignore
   app.put('/json', expectJson, (req, res) => {
     res.status(HTTP_STATUS.OK).json({});

package/test/params.spec.ts

@@ -2,55 +2,9 @@ import request from 'supertest';
 
 import { HTTP_STATUS } from '@verdaccio/core';
 
-import { match, validateName, validatePackage } from '../src';
+import { match } from '../src';
 import { getApp } from './helper';
 
-describe('validate params', () => {
-  test('should validate package name', async () => {
-    const app = getApp([]);
-    // @ts-ignore
-    app.param('package', validatePackage);
-    app.get('/pkg/:package', (req, res) => {
-      res.status(HTTP_STATUS.OK).json({});
-    });
-
-    return request(app).get('/pkg/react').expect(HTTP_STATUS.OK);
-  });
-
-  test('should fails validate package name', async () => {
-    const app = getApp([]);
-    // @ts-ignore
-    app.param('package', validatePackage);
-    app.get('/pkg/:package', (req, res) => {
-      res.status(HTTP_STATUS.OK).json({});
-    });
-
-    return request(app).get('/pkg/node_modules').expect(HTTP_STATUS.FORBIDDEN);
-  });
-
-  test('should fails file name package name', async () => {
-    const app = getApp([]);
-    // @ts-ignore
-    app.param('filename', validateName);
-    app.get('/file/:filename', (req, res) => {
-      res.status(HTTP_STATUS.OK).json({});
-    });
-
-    return request(app).get('/file/__proto__').expect(HTTP_STATUS.FORBIDDEN);
-  });
-
-  test('should validate file name package name', async () => {
-    const app = getApp([]);
-    // @ts-ignore
-    app.param('filename', validateName);
-    app.get('/file/:filename', (req, res) => {
-      res.status(HTTP_STATUS.OK).json({});
-    });
-
-    return request(app).get('/file/react.tar.gz').expect(HTTP_STATUS.OK);
-  });
-});
-
 describe('match', () => {
   test('should not match middleware', async () => {
     const app = getApp([]);

package/test/validation.spec.ts

@@ -0,0 +1,92 @@
+import request from 'supertest';
+
+import { HTTP_STATUS } from '@verdaccio/core';
+
+import { validateName, validatePackage } from '../src';
+import { getApp } from './helper';
+
+describe('validate package name middleware', () => {
+  test.each(['jquery', '-'])('%s should be valid package name', (pkg) => {
+    const app = getApp([]);
+    app.param('pkg', validatePackage);
+    app.get('/:pkg', (_req, res) => {
+      res.status(HTTP_STATUS.OK).json({});
+    });
+
+    return request(app).get(`/${pkg}`).expect(HTTP_STATUS.OK);
+  });
+
+  test.each(['node_modules', '%'])('%s should be invalid package name', (pkg) => {
+    const app = getApp([]);
+    app.param('pkg', validatePackage);
+    app.get('/:pkg', (_req, res) => {
+      res.status(HTTP_STATUS.OK).json({});
+    });
+
+    return request(app).get(`/${pkg}`).expect(HTTP_STATUS.BAD_REQUEST);
+  });
+
+  test('should validate package name double level', async () => {
+    const app = getApp([]);
+    // @ts-ignore
+    app.param('package', validatePackage);
+    app.get('/pkg/:package', (req, res) => {
+      res.status(HTTP_STATUS.OK).json({});
+    });
+
+    return request(app).get('/pkg/react').expect(HTTP_STATUS.OK);
+  });
+
+  test('should fails validate package name double level', async () => {
+    const app = getApp([]);
+    // @ts-ignore
+    app.param('package', validatePackage);
+    app.get('/pkg/:package', (req, res) => {
+      res.status(HTTP_STATUS.OK).json({});
+    });
+
+    return request(app).get('/pkg/node_modules').expect(HTTP_STATUS.BAD_REQUEST);
+  });
+});
+
+describe('validate file name name middleware', () => {
+  test.each(['old-package@0.1.2.tgz', '--0.0.1.tgz'])('%s should be valid file name', (pkg) => {
+    const app = getApp([]);
+    app.param('pkg', validateName);
+    app.get('/:pkg', (_req, res) => {
+      res.status(HTTP_STATUS.OK).json({});
+    });
+
+    return request(app).get(`/${pkg}`).expect(HTTP_STATUS.OK);
+  });
+
+  test.each(['some%2Fthing', '.bin'])('%s should be invalid package name', (pkg) => {
+    const app = getApp([]);
+    app.param('pkg', validateName);
+    app.get('/:pkg', (_req, res) => {
+      res.status(HTTP_STATUS.OK).json({});
+    });
+
+    return request(app).get(`/${pkg}`).expect(HTTP_STATUS.BAD_REQUEST);
+  });
+
+  test('should fails file name package name', async () => {
+    const app = getApp([]);
+    app.param('filename', validateName);
+    app.get('/file/:filename', (req, res) => {
+      res.status(HTTP_STATUS.OK).json({});
+    });
+
+    return request(app).get('/file/__proto__').expect(HTTP_STATUS.BAD_REQUEST);
+  });
+
+  test('should validate file name package name', async () => {
+    const app = getApp([]);
+    app.param('filename', validateName);
+    app.get('/file/:filename', (req, res) => {
+      res.status(HTTP_STATUS.OK).json({});
+    });
+
+    return request(app).get('/file/react.tar.gz').expect(HTTP_STATUS.OK);
+  });
+});