verdaccio 6.5.0 → 6.5.2

package/build/api/index.js

@@ -24,7 +24,7 @@ var _endpoint = _interopRequireDefault(require("./endpoint"));
 var _middleware2 = require("./middleware");
 var _web = _interopRequireDefault(require("./web"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const version = "6.5.0" || 'dev';
+const version = "6.5.2" || 'dev';
 const defineAPI = async function (config, storage) {
   const auth = new _auth.Auth(config, _logger.logger, {
     legacyMergeConfigs: true

package/build/api/web/api/index.js

@@ -23,9 +23,9 @@ var _default = (auth, storage, config) => {
   router.use((0, _package.default)(storage, auth, config));
   router.use((0, _search.default)(storage, auth));
   if ((0, _utils.hasLogin)(config)) {
-    router.use((0, _user.default)(auth, storage));
+    router.use((0, _user.default)(auth, config));
   }
   return router;
 };
 exports.default = _default;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJfZXhwcmVzcyIsInJlcXVpcmUiLCJfbWlkZGxld2FyZSIsIl91dGlscyIsIl9wYWNrYWdlIiwiX2ludGVyb3BSZXF1aXJlRGVmYXVsdCIsIl9zZWFyY2giLCJfdXNlciIsImUiLCJfX2VzTW9kdWxlIiwiZGVmYXVsdCIsIl9kZWZhdWx0IiwiYXV0aCIsInN0b3JhZ2UiLCJjb25maWciLCJyb3V0ZXIiLCJSb3V0ZXIiLCJ1c2UiLCJyYXRlTGltaXQiLCJ3aW5kb3dNcyIsIm1heCIsIndlYiIsInBhY2thZ2VBcGkiLCJzZWFyY2giLCJoYXNMb2dpbiIsInVzZXIiLCJleHBvcnRzIl0sInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2FwaS93ZWIvYXBpL2luZGV4LnRzIl0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFJvdXRlciB9IGZyb20gJ2V4cHJlc3MnO1xuXG5pbXBvcnQgeyByYXRlTGltaXQgfSBmcm9tICdAdmVyZGFjY2lvL21pZGRsZXdhcmUnO1xuXG5pbXBvcnQgeyBoYXNMb2dpbiB9IGZyb20gJy4uLy4uLy4uL2xpYi91dGlscyc7XG5pbXBvcnQgcGFja2FnZUFwaSBmcm9tICcuL3BhY2thZ2UnO1xuaW1wb3J0IHNlYXJjaCBmcm9tICcuL3NlYXJjaCc7XG5pbXBvcnQgdXNlciBmcm9tICcuL3VzZXInO1xuXG5leHBvcnQgZGVmYXVsdCAoYXV0aCwgc3RvcmFnZSwgY29uZmlnKSA9PiB7XG4gIGNvbnN0IHJvdXRlciA9IFJvdXRlcigpO1xuICByb3V0ZXIudXNlKFxuICAgIHJhdGVMaW1pdCh7XG4gICAgICB3aW5kb3dNczogMiAqIDYwICogMTAwMCwgLy8gMiAgbWludXRlc1xuICAgICAgbWF4OiA1MDAwLCAvLyBsaW1pdCBlYWNoIElQIHRvIDEwMDAgcmVxdWVzdHMgcGVyIHdpbmRvd01zXG4gICAgICAuLi5jb25maWc/LndlYj8ucmF0ZUxpbWl0LFxuICAgIH0pXG4gICk7XG4gIHJvdXRlci51c2UocGFja2FnZUFwaShzdG9yYWdlLCBhdXRoLCBjb25maWcpKTtcbiAgcm91dGVyLnVzZShzZWFyY2goc3RvcmFnZSwgYXV0aCkpO1xuICBpZiAoaGFzTG9naW4oY29uZmlnKSkge1xuICAgIHJvdXRlci51c2UodXNlcihhdXRoLCBzdG9yYWdlKSk7XG4gIH1cbiAgcmV0dXJuIHJvdXRlcjtcbn07XG4iXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLElBQUFBLFFBQUEsR0FBQUMsT0FBQTtBQUVBLElBQUFDLFdBQUEsR0FBQUQsT0FBQTtBQUVBLElBQUFFLE1BQUEsR0FBQUYsT0FBQTtBQUNBLElBQUFHLFFBQUEsR0FBQUMsc0JBQUEsQ0FBQUosT0FBQTtBQUNBLElBQUFLLE9BQUEsR0FBQUQsc0JBQUEsQ0FBQUosT0FBQTtBQUNBLElBQUFNLEtBQUEsR0FBQUYsc0JBQUEsQ0FBQUosT0FBQTtBQUEwQixTQUFBSSx1QkFBQUcsQ0FBQSxXQUFBQSxDQUFBLElBQUFBLENBQUEsQ0FBQUMsVUFBQSxHQUFBRCxDQUFBLEtBQUFFLE9BQUEsRUFBQUYsQ0FBQTtBQUFBLElBQUFHLFFBQUEsR0FFWEEsQ0FBQ0MsSUFBSSxFQUFFQyxPQUFPLEVBQUVDLE1BQU0sS0FBSztFQUN4QyxNQUFNQyxNQUFNLEdBQUcsSUFBQUMsZUFBTSxFQUFDLENBQUM7RUFDdkJELE1BQU0sQ0FBQ0UsR0FBRyxDQUNSLElBQUFDLHFCQUFTLEVBQUM7SUFDUkMsUUFBUSxFQUFFLENBQUMsR0FBRyxFQUFFLEdBQUcsSUFBSTtJQUFFO0lBQ3pCQyxHQUFHLEVBQUUsSUFBSTtJQUFFO0lBQ1gsR0FBR04sTUFBTSxFQUFFTyxHQUFHLEVBQUVIO0VBQ2xCLENBQUMsQ0FDSCxDQUFDO0VBQ0RILE1BQU0sQ0FBQ0UsR0FBRyxDQUFDLElBQUFLLGdCQUFVLEVBQUNULE9BQU8sRUFBRUQsSUFBSSxFQUFFRSxNQUFNLENBQUMsQ0FBQztFQUM3Q0MsTUFBTSxDQUFDRSxHQUFHLENBQUMsSUFBQU0sZUFBTSxFQUFDVixPQUFPLEVBQUVELElBQUksQ0FBQyxDQUFDO0VBQ2pDLElBQUksSUFBQVksZUFBUSxFQUFDVixNQUFNLENBQUMsRUFBRTtJQUNwQkMsTUFBTSxDQUFDRSxHQUFHLENBQUMsSUFBQVEsYUFBSSxFQUFDYixJQUFJLEVBQUVDLE9BQU8sQ0FBQyxDQUFDO0VBQ2pDO0VBQ0EsT0FBT0UsTUFBTTtBQUNmLENBQUM7QUFBQVcsT0FBQSxDQUFBaEIsT0FBQSxHQUFBQyxRQUFBIiwiaWdub3JlTGlzdCI6W119
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJfZXhwcmVzcyIsInJlcXVpcmUiLCJfbWlkZGxld2FyZSIsIl91dGlscyIsIl9wYWNrYWdlIiwiX2ludGVyb3BSZXF1aXJlRGVmYXVsdCIsIl9zZWFyY2giLCJfdXNlciIsImUiLCJfX2VzTW9kdWxlIiwiZGVmYXVsdCIsIl9kZWZhdWx0IiwiYXV0aCIsInN0b3JhZ2UiLCJjb25maWciLCJyb3V0ZXIiLCJSb3V0ZXIiLCJ1c2UiLCJyYXRlTGltaXQiLCJ3aW5kb3dNcyIsIm1heCIsIndlYiIsInBhY2thZ2VBcGkiLCJzZWFyY2giLCJoYXNMb2dpbiIsInVzZXIiLCJleHBvcnRzIl0sInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2FwaS93ZWIvYXBpL2luZGV4LnRzIl0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFJvdXRlciB9IGZyb20gJ2V4cHJlc3MnO1xuXG5pbXBvcnQgeyByYXRlTGltaXQgfSBmcm9tICdAdmVyZGFjY2lvL21pZGRsZXdhcmUnO1xuXG5pbXBvcnQgeyBoYXNMb2dpbiB9IGZyb20gJy4uLy4uLy4uL2xpYi91dGlscyc7XG5pbXBvcnQgcGFja2FnZUFwaSBmcm9tICcuL3BhY2thZ2UnO1xuaW1wb3J0IHNlYXJjaCBmcm9tICcuL3NlYXJjaCc7XG5pbXBvcnQgdXNlciBmcm9tICcuL3VzZXInO1xuXG5leHBvcnQgZGVmYXVsdCAoYXV0aCwgc3RvcmFnZSwgY29uZmlnKSA9PiB7XG4gIGNvbnN0IHJvdXRlciA9IFJvdXRlcigpO1xuICByb3V0ZXIudXNlKFxuICAgIHJhdGVMaW1pdCh7XG4gICAgICB3aW5kb3dNczogMiAqIDYwICogMTAwMCwgLy8gMiAgbWludXRlc1xuICAgICAgbWF4OiA1MDAwLCAvLyBsaW1pdCBlYWNoIElQIHRvIDEwMDAgcmVxdWVzdHMgcGVyIHdpbmRvd01zXG4gICAgICAuLi5jb25maWc/LndlYj8ucmF0ZUxpbWl0LFxuICAgIH0pXG4gICk7XG4gIHJvdXRlci51c2UocGFja2FnZUFwaShzdG9yYWdlLCBhdXRoLCBjb25maWcpKTtcbiAgcm91dGVyLnVzZShzZWFyY2goc3RvcmFnZSwgYXV0aCkpO1xuICBpZiAoaGFzTG9naW4oY29uZmlnKSkge1xuICAgIHJvdXRlci51c2UodXNlcihhdXRoLCBjb25maWcpKTtcbiAgfVxuICByZXR1cm4gcm91dGVyO1xufTtcbiJdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsSUFBQUEsUUFBQSxHQUFBQyxPQUFBO0FBRUEsSUFBQUMsV0FBQSxHQUFBRCxPQUFBO0FBRUEsSUFBQUUsTUFBQSxHQUFBRixPQUFBO0FBQ0EsSUFBQUcsUUFBQSxHQUFBQyxzQkFBQSxDQUFBSixPQUFBO0FBQ0EsSUFBQUssT0FBQSxHQUFBRCxzQkFBQSxDQUFBSixPQUFBO0FBQ0EsSUFBQU0sS0FBQSxHQUFBRixzQkFBQSxDQUFBSixPQUFBO0FBQTBCLFNBQUFJLHVCQUFBRyxDQUFBLFdBQUFBLENBQUEsSUFBQUEsQ0FBQSxDQUFBQyxVQUFBLEdBQUFELENBQUEsS0FBQUUsT0FBQSxFQUFBRixDQUFBO0FBQUEsSUFBQUcsUUFBQSxHQUVYQSxDQUFDQyxJQUFJLEVBQUVDLE9BQU8sRUFBRUMsTUFBTSxLQUFLO0VBQ3hDLE1BQU1DLE1BQU0sR0FBRyxJQUFBQyxlQUFNLEVBQUMsQ0FBQztFQUN2QkQsTUFBTSxDQUFDRSxHQUFHLENBQ1IsSUFBQUMscUJBQVMsRUFBQztJQUNSQyxRQUFRLEVBQUUsQ0FBQyxHQUFHLEVBQUUsR0FBRyxJQUFJO0lBQUU7SUFDekJDLEdBQUcsRUFBRSxJQUFJO0lBQUU7SUFDWCxHQUFHTixNQUFNLEVBQUVPLEdBQUcsRUFBRUg7RUFDbEIsQ0FBQyxDQUNILENBQUM7RUFDREgsTUFBTSxDQUFDRSxHQUFHLENBQUMsSUFBQUssZ0JBQVUsRUFBQ1QsT0FBTyxFQUFFRCxJQUFJLEVBQUVFLE1BQU0sQ0FBQyxDQUFDO0VBQzdDQyxNQUFNLENBQUNFLEdBQUcsQ0FBQyxJQUFBTSxlQUFNLEVBQUNWLE9BQU8sRUFBRUQsSUFBSSxDQUFDLENBQUM7RUFDakMsSUFBSSxJQUFBWSxlQUFRLEVBQUNWLE1BQU0sQ0FBQyxFQUFFO0lBQ3BCQyxNQUFNLENBQUNFLEdBQUcsQ0FBQyxJQUFBUSxhQUFJLEVBQUNiLElBQUksRUFBRUUsTUFBTSxDQUFDLENBQUM7RUFDaEM7RUFDQSxPQUFPQyxNQUFNO0FBQ2YsQ0FBQztBQUFBVyxPQUFBLENBQUFoQixPQUFBLEdBQUFDLFFBQUEiLCJpZ25vcmVMaXN0IjpbXX0=

package/build/api/web/api/user.js

@@ -24,47 +24,53 @@ function addUserAuthApi(auth, config) {
     auth.authenticate(username, password, async (err, user) => {
       if (err) {
         const errorCode = err.message ? _constants.HTTP_STATUS.UNAUTHORIZED : _constants.HTTP_STATUS.INTERNAL_ERROR;
-        next(_utils.ErrorCode.getCode(errorCode, err.message));
+        if (errorCode === _constants.HTTP_STATUS.UNAUTHORIZED) {
+          res.set(_constants.HEADERS.WWW_AUTH, _constants.TOKEN_BEARER);
+        }
+        return next(_utils.ErrorCode.getCode(errorCode, err.message));
       } else {
         req.remote_user = user;
         const jWTSignOptions = (0, _authUtils.getSecurity)(config).web.sign;
         res.set(_constants.HEADERS.CACHE_CONTROL, 'no-cache, no-store');
-        next({
+        return next({
           token: await auth.jwtEncrypt(user, jWTSignOptions),
           username: req.remote_user.name
         });
       }
     });
   });
-  route.put((0, _utils2.wrapSecPath)(_middleware.WebUrls.reset_password), function (req, res, next) {
-    if (_lodash.default.isNil(req.remote_user.name)) {
-      res.status(_constants.HTTP_STATUS.UNAUTHORIZED);
-      return next({
-        // FUTURE: update to a more meaningful message
-        message: _constants.API_ERROR.MUST_BE_LOGGED
-      });
-    }
-    const {
-      password
-    } = req.body;
-    const {
-      name
-    } = req.remote_user;
-    if (_core.validationUtils.validatePassword(password.new) === false) {
+  if (config?.flags?.changePassword === true) {
+    route.put((0, _utils2.wrapSecPath)(_middleware.WebUrls.reset_password), function (req, res, next) {
+      if (_lodash.default.isNil(req.remote_user.name)) {
+        res.status(_constants.HTTP_STATUS.UNAUTHORIZED);
+        return next({
+          // FUTURE: update to a more meaningful message
+          message: _constants.API_ERROR.MUST_BE_LOGGED
+        });
+      }
+      const {
+        password
+      } = req.body;
+      const {
+        name
+      } = req.remote_user;
+      if (_core.validationUtils.validatePassword(password.new) === false) {
+        return next(_utils.ErrorCode.getCode(_constants.HTTP_STATUS.BAD_REQUEST, _constants.APP_ERROR.PASSWORD_VALIDATION));
+      }
       auth.changePassword(name, password.old, password.new, (err, isUpdated) => {
         if (_lodash.default.isNil(err) && isUpdated) {
           next({
             ok: true
           });
+        } else if (!_lodash.default.isNil(err)) {
+          return next(_utils.ErrorCode.getCode(_lodash.default.isNil(err.status) ? _constants.HTTP_STATUS.CONFLICT : err.status, err.message));
         } else {
           return next(_utils.ErrorCode.getInternalError(_constants.API_ERROR.INTERNAL_SERVER_ERROR));
         }
       });
-    } else {
-      return next(_utils.ErrorCode.getCode(_constants.HTTP_STATUS.BAD_REQUEST, _constants.APP_ERROR.PASSWORD_VALIDATION));
-    }
-  });
+    });
+  }
   return route;
 }
 var _default = exports.default = addUserAuthApi;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJfZXhwcmVzcyIsInJlcXVpcmUiLCJfbG9kYXNoIiwiX2ludGVyb3BSZXF1aXJlRGVmYXVsdCIsIl9jb3JlIiwiX21pZGRsZXdhcmUiLCJfYXV0aFV0aWxzIiwiX2NvbnN0YW50cyIsIl91dGlscyIsIl91dGlsczIiLCJlIiwiX19lc01vZHVsZSIsImRlZmF1bHQiLCJhZGRVc2VyQXV0aEFwaSIsImF1dGgiLCJjb25maWciLCJyb3V0ZSIsIlJvdXRlciIsInBvc3QiLCJ3cmFwU2VjUGF0aCIsIldlYlVybHMiLCJ1c2VyX2xvZ2luIiwicmF0ZUxpbWl0IiwidXNlclJhdGVMaW1pdCIsInJlcSIsInJlcyIsIm5leHQiLCJ1c2VybmFtZSIsInBhc3N3b3JkIiwiYm9keSIsImF1dGhlbnRpY2F0ZSIsImVyciIsInVzZXIiLCJlcnJvckNvZGUiLCJtZXNzYWdlIiwiSFRUUF9TVEFUVVMiLCJVTkFVVEhPUklaRUQiLCJJTlRFUk5BTF9FUlJPUiIsIkVycm9yQ29kZSIsImdldENvZGUiLCJyZW1vdGVfdXNlciIsImpXVFNpZ25PcHRpb25zIiwiZ2V0U2VjdXJpdHkiLCJ3ZWIiLCJzaWduIiwic2V0IiwiSEVBREVSUyIsIkNBQ0hFX0NPTlRST0wiLCJ0b2tlbiIsImp3dEVuY3J5cHQiLCJuYW1lIiwicHV0IiwicmVzZXRfcGFzc3dvcmQiLCJfIiwiaXNOaWwiLCJzdGF0dXMiLCJBUElfRVJST1IiLCJNVVNUX0JFX0xPR0dFRCIsInZhbGlkYXRpb25VdGlscyIsInZhbGlkYXRlUGFzc3dvcmQiLCJuZXciLCJjaGFuZ2VQYXNzd29yZCIsIm9sZCIsImlzVXBkYXRlZCIsIm9rIiwiZ2V0SW50ZXJuYWxFcnJvciIsIklOVEVSTkFMX1NFUlZFUl9FUlJPUiIsIkJBRF9SRVFVRVNUIiwiQVBQX0VSUk9SIiwiUEFTU1dPUkRfVkFMSURBVElPTiIsIl9kZWZhdWx0IiwiZXhwb3J0cyJdLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9hcGkvd2ViL2FwaS91c2VyLnRzIl0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB0eXBlIHsgUmVxdWVzdCwgUmVzcG9uc2UgfSBmcm9tICdleHByZXNzJztcbmltcG9ydCB7IFJvdXRlciB9IGZyb20gJ2V4cHJlc3MnO1xuaW1wb3J0IF8gZnJvbSAnbG9kYXNoJztcblxuaW1wb3J0IHR5cGUgeyBBdXRoIH0gZnJvbSAnQHZlcmRhY2Npby9hdXRoJztcbmltcG9ydCB7IHZhbGlkYXRpb25VdGlscyB9IGZyb20gJ0B2ZXJkYWNjaW8vY29yZSc7XG5pbXBvcnQgeyBXZWJVcmxzLCByYXRlTGltaXQgfSBmcm9tICdAdmVyZGFjY2lvL21pZGRsZXdhcmUnO1xuaW1wb3J0IHR5cGUgeyBDb25maWcsIEpXVFNpZ25PcHRpb25zLCBSZW1vdGVVc2VyIH0gZnJvbSAnQHZlcmRhY2Npby90eXBlcyc7XG5cbmltcG9ydCB7IGdldFNlY3VyaXR5IH0gZnJvbSAnLi4vLi4vLi4vbGliL2F1dGgtdXRpbHMnO1xuaW1wb3J0IHsgQVBJX0VSUk9SLCBBUFBfRVJST1IsIEhFQURFUlMsIEhUVFBfU1RBVFVTIH0gZnJvbSAnLi4vLi4vLi4vbGliL2NvbnN0YW50cyc7XG5pbXBvcnQgeyBFcnJvckNvZGUgfSBmcm9tICcuLi8uLi8uLi9saWIvdXRpbHMnO1xuaW1wb3J0IHR5cGUgeyAkTmV4dEZ1bmN0aW9uVmVyIH0gZnJvbSAnLi4vLi4vLi4vdHlwZXMnO1xuaW1wb3J0IHsgd3JhcFNlY1BhdGggfSBmcm9tICcuL3V0aWxzJztcblxuZnVuY3Rpb24gYWRkVXNlckF1dGhBcGkoYXV0aDogQXV0aCwgY29uZmlnOiBDb25maWcpOiBSb3V0ZXIge1xuICAvKiBlc2xpbnQgbmV3LWNhcDpvZmYgKi9cbiAgY29uc3Qgcm91dGUgPSBSb3V0ZXIoKTtcbiAgcm91dGUucG9zdChcbiAgICB3cmFwU2VjUGF0aChXZWJVcmxzLnVzZXJfbG9naW4pLFxuICAgIHJhdGVMaW1pdChjb25maWc/LnVzZXJSYXRlTGltaXQpLFxuICAgIGZ1bmN0aW9uIChyZXE6IFJlcXVlc3QsIHJlczogUmVzcG9uc2UsIG5leHQ6ICROZXh0RnVuY3Rpb25WZXIpOiB2b2lkIHtcbiAgICAgIGNvbnN0IHsgdXNlcm5hbWUsIHBhc3N3b3JkIH0gPSByZXEuYm9keTtcblxuICAgICAgYXV0aC5hdXRoZW50aWNhdGUodXNlcm5hbWUsIHBhc3N3b3JkLCBhc3luYyAoZXJyLCB1c2VyPzogUmVtb3RlVXNlcik6IFByb21pc2U8dm9pZD4gPT4ge1xuICAgICAgICBpZiAoZXJyKSB7XG4gICAgICAgICAgY29uc3QgZXJyb3JDb2RlID0gZXJyLm1lc3NhZ2UgPyBIVFRQX1NUQVRVUy5VTkFVVEhPUklaRUQgOiBIVFRQX1NUQVRVUy5JTlRFUk5BTF9FUlJPUjtcbiAgICAgICAgICBuZXh0KEVycm9yQ29kZS5nZXRDb2RlKGVycm9yQ29kZSwgZXJyLm1lc3NhZ2UpKTtcbiAgICAgICAgfSBlbHNlIHtcbiAgICAgICAgICByZXEucmVtb3RlX3VzZXIgPSB1c2VyIGFzIFJlbW90ZVVzZXI7XG4gICAgICAgICAgY29uc3QgaldUU2lnbk9wdGlvbnM6IEpXVFNpZ25PcHRpb25zID0gZ2V0U2VjdXJpdHkoY29uZmlnKS53ZWIuc2lnbjtcbiAgICAgICAgICByZXMuc2V0KEhFQURFUlMuQ0FDSEVfQ09OVFJPTCwgJ25vLWNhY2hlLCBuby1zdG9yZScpO1xuICAgICAgICAgIG5leHQoe1xuICAgICAgICAgICAgdG9rZW46IGF3YWl0IGF1dGguand0RW5jcnlwdCh1c2VyIGFzIFJlbW90ZVVzZXIsIGpXVFNpZ25PcHRpb25zKSxcbiAgICAgICAgICAgIHVzZXJuYW1lOiByZXEucmVtb3RlX3VzZXIubmFtZSxcbiAgICAgICAgICB9KTtcbiAgICAgICAgfVxuICAgICAgfSk7XG4gICAgfVxuICApO1xuXG4gIHJvdXRlLnB1dChcbiAgICB3cmFwU2VjUGF0aChXZWJVcmxzLnJlc2V0X3Bhc3N3b3JkKSxcbiAgICBmdW5jdGlvbiAocmVxOiBSZXF1ZXN0LCByZXM6IFJlc3BvbnNlLCBuZXh0OiAkTmV4dEZ1bmN0aW9uVmVyKTogdm9pZCB7XG4gICAgICBpZiAoXy5pc05pbChyZXEucmVtb3RlX3VzZXIubmFtZSkpIHtcbiAgICAgICAgcmVzLnN0YXR1cyhIVFRQX1NUQVRVUy5VTkFVVEhPUklaRUQpO1xuICAgICAgICByZXR1cm4gbmV4dCh7XG4gICAgICAgICAgLy8gRlVUVVJFOiB1cGRhdGUgdG8gYSBtb3JlIG1lYW5pbmdmdWwgbWVzc2FnZVxuICAgICAgICAgIG1lc3NhZ2U6IEFQSV9FUlJPUi5NVVNUX0JFX0xPR0dFRCxcbiAgICAgICAgfSk7XG4gICAgICB9XG5cbiAgICAgIGNvbnN0IHsgcGFzc3dvcmQgfSA9IHJlcS5ib2R5O1xuICAgICAgY29uc3QgeyBuYW1lIH0gPSByZXEucmVtb3RlX3VzZXI7XG5cbiAgICAgIGlmICh2YWxpZGF0aW9uVXRpbHMudmFsaWRhdGVQYXNzd29yZChwYXNzd29yZC5uZXcpID09PSBmYWxzZSkge1xuICAgICAgICBhdXRoLmNoYW5nZVBhc3N3b3JkKG5hbWUgYXMgc3RyaW5nLCBwYXNzd29yZC5vbGQsIHBhc3N3b3JkLm5ldywgKGVyciwgaXNVcGRhdGVkKTogdm9pZCA9PiB7XG4gICAgICAgICAgaWYgKF8uaXNOaWwoZXJyKSAmJiBpc1VwZGF0ZWQpIHtcbiAgICAgICAgICAgIG5leHQoe1xuICAgICAgICAgICAgICBvazogdHJ1ZSxcbiAgICAgICAgICAgIH0pO1xuICAgICAgICAgIH0gZWxzZSB7XG4gICAgICAgICAgICByZXR1cm4gbmV4dChFcnJvckNvZGUuZ2V0SW50ZXJuYWxFcnJvcihBUElfRVJST1IuSU5URVJOQUxfU0VSVkVSX0VSUk9SKSk7XG4gICAgICAgICAgfVxuICAgICAgICB9KTtcbiAgICAgIH0gZWxzZSB7XG4gICAgICAgIHJldHVybiBuZXh0KEVycm9yQ29kZS5nZXRDb2RlKEhUVFBfU1RBVFVTLkJBRF9SRVFVRVNULCBBUFBfRVJST1IuUEFTU1dPUkRfVkFMSURBVElPTikpO1xuICAgICAgfVxuICAgIH1cbiAgKTtcblxuICByZXR1cm4gcm91dGU7XG59XG5cbmV4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
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["_express","require","_lodash","_interopRequireDefault","_core","_middleware","_authUtils","_constants","_utils","_utils2","e","__esModule","default","addUserAuthApi","auth","config","route","Router","post","wrapSecPath","WebUrls","user_login","rateLimit","userRateLimit","req","res","next","username","password","body","authenticate","err","user","errorCode","message","HTTP_STATUS","UNAUTHORIZED","INTERNAL_ERROR","set","HEADERS","WWW_AUTH","TOKEN_BEARER","ErrorCode","getCode","remote_user","jWTSignOptions","getSecurity","web","sign","CACHE_CONTROL","token","jwtEncrypt","name","flags","changePassword","put","reset_password","_","isNil","status","API_ERROR","MUST_BE_LOGGED","validationUtils","validatePassword","new","BAD_REQUEST","APP_ERROR","PASSWORD_VALIDATION","old","isUpdated","ok","CONFLICT","getInternalError","INTERNAL_SERVER_ERROR","_default","exports"],"sources":["../../../../src/api/web/api/user.ts"],"sourcesContent":["import type { Request, Response } from 'express';\nimport { Router } from 'express';\nimport _ from 'lodash';\n\nimport type { Auth } from '@verdaccio/auth';\nimport { validationUtils } from '@verdaccio/core';\nimport { WebUrls, rateLimit } from '@verdaccio/middleware';\nimport type { Config, JWTSignOptions, RemoteUser } from '@verdaccio/types';\n\nimport { getSecurity } from '../../../lib/auth-utils';\nimport { API_ERROR, APP_ERROR, HEADERS, HTTP_STATUS, TOKEN_BEARER } from '../../../lib/constants';\nimport { ErrorCode } from '../../../lib/utils';\nimport type { $NextFunctionVer } from '../../../types';\nimport { wrapSecPath } from './utils';\n\nfunction addUserAuthApi(auth: Auth, config: Config): Router {\n  /* eslint new-cap:off */\n  const route = Router();\n  route.post(\n    wrapSecPath(WebUrls.user_login),\n    rateLimit(config?.userRateLimit),\n    function (req: Request, res: Response, next: $NextFunctionVer): void {\n      const { username, password } = req.body;\n\n      auth.authenticate(username, password, async (err, user?: RemoteUser): Promise<void> => {\n        if (err) {\n          const errorCode = err.message ? HTTP_STATUS.UNAUTHORIZED : HTTP_STATUS.INTERNAL_ERROR;\n          if (errorCode === HTTP_STATUS.UNAUTHORIZED) {\n            res.set(HEADERS.WWW_AUTH, TOKEN_BEARER);\n          }\n          return next(ErrorCode.getCode(errorCode, err.message));\n        } else {\n          req.remote_user = user as RemoteUser;\n          const jWTSignOptions: JWTSignOptions = getSecurity(config).web.sign;\n          res.set(HEADERS.CACHE_CONTROL, 'no-cache, no-store');\n          return next({\n            token: await auth.jwtEncrypt(user as RemoteUser, jWTSignOptions),\n            username: req.remote_user.name,\n          });\n        }\n      });\n    }\n  );\n\n  if (config?.flags?.changePassword === true) {\n    route.put(\n      wrapSecPath(WebUrls.reset_password),\n      function (req: Request, res: Response, next: $NextFunctionVer): void {\n        if (_.isNil(req.remote_user.name)) {\n          res.status(HTTP_STATUS.UNAUTHORIZED);\n          return next({\n            // FUTURE: update to a more meaningful message\n            message: API_ERROR.MUST_BE_LOGGED,\n          });\n        }\n\n        const { password } = req.body;\n        const { name } = req.remote_user;\n\n        if (validationUtils.validatePassword(password.new) === false) {\n          return next(ErrorCode.getCode(HTTP_STATUS.BAD_REQUEST, APP_ERROR.PASSWORD_VALIDATION));\n        }\n\n        auth.changePassword(\n          name as string,\n          password.old,\n          password.new,\n          (err, isUpdated): void => {\n            if (_.isNil(err) && isUpdated) {\n              next({\n                ok: true,\n              });\n            } else if (!_.isNil(err)) {\n              return next(\n                ErrorCode.getCode(\n                  _.isNil(err.status) ? HTTP_STATUS.CONFLICT : err.status,\n                  err.message\n                )\n              );\n            } else {\n              return next(ErrorCode.getInternalError(API_ERROR.INTERNAL_SERVER_ERROR));\n            }\n          }\n        );\n      }\n    );\n  }\n\n  return route;\n}\n\nexport default addUserAuthApi;\n"],"mappings":"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","ignoreList":[]}

package/build/lib/auth-utils.js

@@ -9,8 +9,8 @@ var _config = require("@verdaccio/config");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function getSecurity(config) {
   if (_lodash.default.isNil(config.security) === false) {
-    return _lodash.default.merge(_config.defaultSecurity, config.security);
+    return _lodash.default.merge({}, _config.defaultSecurity, config.security);
   }
-  return _config.defaultSecurity;
+  return _lodash.default.merge({}, _config.defaultSecurity);
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJfbG9kYXNoIiwiX2ludGVyb3BSZXF1aXJlRGVmYXVsdCIsInJlcXVpcmUiLCJfY29uZmlnIiwiZSIsIl9fZXNNb2R1bGUiLCJkZWZhdWx0IiwiZ2V0U2VjdXJpdHkiLCJjb25maWciLCJfIiwiaXNOaWwiLCJzZWN1cml0eSIsIm1lcmdlIiwiZGVmYXVsdFNlY3VyaXR5Il0sInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xpYi9hdXRoLXV0aWxzLnRzIl0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBfIGZyb20gJ2xvZGFzaCc7XG5cbmltcG9ydCB7IGRlZmF1bHRTZWN1cml0eSB9IGZyb20gJ0B2ZXJkYWNjaW8vY29uZmlnJztcbmltcG9ydCB7IENvbmZpZywgU2VjdXJpdHkgfSBmcm9tICdAdmVyZGFjY2lvL3R5cGVzJztcblxuZXhwb3J0IGZ1bmN0aW9uIGdldFNlY3VyaXR5KGNvbmZpZzogQ29uZmlnKTogU2VjdXJpdHkge1xuICBpZiAoXy5pc05pbChjb25maWcuc2VjdXJpdHkpID09PSBmYWxzZSkge1xuICAgIHJldHVybiBfLm1lcmdlKGRlZmF1bHRTZWN1cml0eSwgY29uZmlnLnNlY3VyaXR5KTtcbiAgfVxuXG4gIHJldHVybiBkZWZhdWx0U2VjdXJpdHk7XG59XG4iXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLElBQUFBLE9BQUEsR0FBQUMsc0JBQUEsQ0FBQUMsT0FBQTtBQUVBLElBQUFDLE9BQUEsR0FBQUQsT0FBQTtBQUFvRCxTQUFBRCx1QkFBQUcsQ0FBQSxXQUFBQSxDQUFBLElBQUFBLENBQUEsQ0FBQUMsVUFBQSxHQUFBRCxDQUFBLEtBQUFFLE9BQUEsRUFBQUYsQ0FBQTtBQUc3QyxTQUFTRyxXQUFXQSxDQUFDQyxNQUFjLEVBQVk7RUFDcEQsSUFBSUMsZUFBQyxDQUFDQyxLQUFLLENBQUNGLE1BQU0sQ0FBQ0csUUFBUSxDQUFDLEtBQUssS0FBSyxFQUFFO0lBQ3RDLE9BQU9GLGVBQUMsQ0FBQ0csS0FBSyxDQUFDQyx1QkFBZSxFQUFFTCxNQUFNLENBQUNHLFFBQVEsQ0FBQztFQUNsRDtFQUVBLE9BQU9FLHVCQUFlO0FBQ3hCIiwiaWdub3JlTGlzdCI6W119
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJfbG9kYXNoIiwiX2ludGVyb3BSZXF1aXJlRGVmYXVsdCIsInJlcXVpcmUiLCJfY29uZmlnIiwiZSIsIl9fZXNNb2R1bGUiLCJkZWZhdWx0IiwiZ2V0U2VjdXJpdHkiLCJjb25maWciLCJfIiwiaXNOaWwiLCJzZWN1cml0eSIsIm1lcmdlIiwiZGVmYXVsdFNlY3VyaXR5Il0sInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xpYi9hdXRoLXV0aWxzLnRzIl0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBfIGZyb20gJ2xvZGFzaCc7XG5cbmltcG9ydCB7IGRlZmF1bHRTZWN1cml0eSB9IGZyb20gJ0B2ZXJkYWNjaW8vY29uZmlnJztcbmltcG9ydCB7IENvbmZpZywgU2VjdXJpdHkgfSBmcm9tICdAdmVyZGFjY2lvL3R5cGVzJztcblxuZXhwb3J0IGZ1bmN0aW9uIGdldFNlY3VyaXR5KGNvbmZpZzogQ29uZmlnKTogU2VjdXJpdHkge1xuICBpZiAoXy5pc05pbChjb25maWcuc2VjdXJpdHkpID09PSBmYWxzZSkge1xuICAgIHJldHVybiBfLm1lcmdlKHt9LCBkZWZhdWx0U2VjdXJpdHksIGNvbmZpZy5zZWN1cml0eSk7XG4gIH1cblxuICByZXR1cm4gXy5tZXJnZSh7fSwgZGVmYXVsdFNlY3VyaXR5KTtcbn1cbiJdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsSUFBQUEsT0FBQSxHQUFBQyxzQkFBQSxDQUFBQyxPQUFBO0FBRUEsSUFBQUMsT0FBQSxHQUFBRCxPQUFBO0FBQW9ELFNBQUFELHVCQUFBRyxDQUFBLFdBQUFBLENBQUEsSUFBQUEsQ0FBQSxDQUFBQyxVQUFBLEdBQUFELENBQUEsS0FBQUUsT0FBQSxFQUFBRixDQUFBO0FBRzdDLFNBQVNHLFdBQVdBLENBQUNDLE1BQWMsRUFBWTtFQUNwRCxJQUFJQyxlQUFDLENBQUNDLEtBQUssQ0FBQ0YsTUFBTSxDQUFDRyxRQUFRLENBQUMsS0FBSyxLQUFLLEVBQUU7SUFDdEMsT0FBT0YsZUFBQyxDQUFDRyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUVDLHVCQUFlLEVBQUVMLE1BQU0sQ0FBQ0csUUFBUSxDQUFDO0VBQ3REO0VBRUEsT0FBT0YsZUFBQyxDQUFDRyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUVDLHVCQUFlLENBQUM7QUFDckMiLCJpZ25vcmVMaXN0IjpbXX0=

package/build/lib/cli/cli.js

@@ -5,7 +5,7 @@ var _info = require("./commands/info");
 var _init = require("./commands/init");
 var _version = require("./commands/version");
 var _utils = require("./utils");
-const pkgVersion = "6.5.0" || 'dev';
+const pkgVersion = "6.5.2" || 'dev';
 if (process.getuid && process.getuid() === 0) {
   process.emitWarning(`Verdaccio doesn't need superuser privileges. don't run it under root`);
 }

package/build/lib/cli/commands/init.js

@@ -11,7 +11,7 @@ var _bootstrap = require("../../bootstrap");
 var _logger = require("../../logger");
 var _utils = require("../../utils");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const pkgVersion = "6.5.0" || 'dev';
+const pkgVersion = "6.5.2" || 'dev';
 const pkgName = 'verdaccio';
 const DEFAULT_PROCESS_NAME = exports.DEFAULT_PROCESS_NAME = 'verdaccio';
 class InitCommand extends _clipanion.Command {

package/build/lib/cli/commands/version.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.VersionCommand = void 0;
 var _clipanion = require("clipanion");
-const pkgVersion = "6.5.0" || 'dev';
+const pkgVersion = "6.5.2" || 'dev';
 class VersionCommand extends _clipanion.Command {
   static paths = [[`--version`], [`-v`]];
   async execute() {

package/cypress/e2e/01-home.cy.ts

@@ -0,0 +1,11 @@
+import { createRegistryConfig, homeTests } from '@verdaccio/e2e-ui';
+
+const registryUrl = Cypress.env('VERDACCIO_URL') || 'http://localhost:4873';
+
+const config = createRegistryConfig({
+  registryUrl,
+  title: 'Verdaccio e2e',
+  credentials: { user: 'test', password: 'test' },
+});
+
+homeTests(config);

package/cypress/e2e/02-signin.cy.ts

@@ -0,0 +1,11 @@
+import { createRegistryConfig, signinTests } from '@verdaccio/e2e-ui';
+
+const registryUrl = Cypress.env('VERDACCIO_URL') || 'http://localhost:4873';
+
+const config = createRegistryConfig({
+  registryUrl,
+  title: 'Verdaccio e2e',
+  credentials: { user: 'test', password: 'test' },
+});
+
+signinTests(config);

package/cypress/e2e/03-layout.cy.ts

@@ -0,0 +1,11 @@
+import { createRegistryConfig, layoutTests } from '@verdaccio/e2e-ui';
+
+const registryUrl = Cypress.env('VERDACCIO_URL') || 'http://localhost:4873';
+
+const config = createRegistryConfig({
+  registryUrl,
+  title: 'Verdaccio e2e',
+  credentials: { user: 'test', password: 'test' },
+});
+
+layoutTests(config);

package/cypress/e2e/04-search.cy.ts

@@ -0,0 +1,11 @@
+import { createRegistryConfig, searchTests } from '@verdaccio/e2e-ui';
+
+const registryUrl = Cypress.env('VERDACCIO_URL') || 'http://localhost:4873';
+
+const config = createRegistryConfig({
+  registryUrl,
+  title: 'Verdaccio e2e',
+  credentials: { user: 'test', password: 'test' },
+});
+
+searchTests(config);

package/cypress/e2e/05-settings.cy.ts

@@ -0,0 +1,11 @@
+import { createRegistryConfig, settingsTests } from '@verdaccio/e2e-ui';
+
+const registryUrl = Cypress.env('VERDACCIO_URL') || 'http://localhost:4873';
+
+const config = createRegistryConfig({
+  registryUrl,
+  title: 'Verdaccio e2e',
+  credentials: { user: 'test', password: 'test' },
+});
+
+settingsTests(config);

package/cypress/e2e/06-publish.cy.ts

@@ -0,0 +1,11 @@
+import { createRegistryConfig, publishTests } from '@verdaccio/e2e-ui';
+
+const registryUrl = Cypress.env('VERDACCIO_URL') || 'http://localhost:4873';
+
+const config = createRegistryConfig({
+  registryUrl,
+  title: 'Verdaccio e2e',
+  credentials: { user: 'test', password: 'test' },
+});
+
+publishTests(config);

package/cypress/e2e/07-change-password.cy.ts

@@ -0,0 +1,32 @@
+import { changePasswordTests, createRegistryConfig } from '@verdaccio/e2e-ui';
+
+const registryUrl = Cypress.env('VERDACCIO_URL') || 'http://localhost:4873';
+
+// Unlike the e2e-tests repo (which targets the published `verdaccio:6`
+// docker image and has to skip the happy path around the unpublished
+// reset_password inversion fix), this spec runs against the locally
+// built 6.x source in this repo — where the fix lives — so every
+// change-password scenario can execute.
+const config = createRegistryConfig({
+  registryUrl,
+  title: 'Verdaccio e2e',
+  credentials: { user: 'test', password: 'test' },
+});
+
+// The published `@verdaccio/e2e-ui@2.4.0` change-password suite ends its
+// happy-path test on `/-/web/success` with a valid JWT still in
+// localStorage. Its `after()` hook then does `cy.visit('/')` + `cy.login`
+// to restore the original password, but the home page renders the
+// logged-in menu (no `header--button-login`) so `cy.login` times out.
+//
+// Mocha runs outer `afterEach` hooks *before* inner `after` hooks, so
+// dropping the session here clears the way for the suite's restore step
+// to find the Login button. Remove this block once the e2e-ui release
+// that ships the equivalent cleanup inside the suite lands in
+// `package.json`.
+afterEach(() => {
+  cy.clearLocalStorage();
+  cy.clearCookies();
+});
+
+changePasswordTests(config);

package/cypress/support/e2e.ts

@@ -0,0 +1 @@
+import '@verdaccio/e2e-ui/commands';

package/cypress.config.ts

@@ -0,0 +1,21 @@
+import { defineConfig } from 'cypress';
+
+import { setupVerdaccioTasks } from '@verdaccio/e2e-ui';
+
+const registryUrl = process.env.VERDACCIO_URL || 'http://localhost:4873';
+
+export default defineConfig({
+  e2e: {
+    baseUrl: registryUrl,
+    specPattern: 'cypress/e2e/**/*.cy.ts',
+    supportFile: 'cypress/support/e2e.ts',
+    setupNodeEvents(on) {
+      setupVerdaccioTasks(on, { registryUrl });
+    },
+  },
+  video: false,
+  screenshotOnRunFailure: false,
+  env: {
+    VERDACCIO_URL: registryUrl,
+  },
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "verdaccio",
-  "version": "6.5.0",
+  "version": "6.5.2",
   "description": "A lightweight private npm proxy registry",
   "author": {
     "name": "Verdaccio Maintainers",
@@ -33,7 +33,7 @@
     "@verdaccio/signature": "8.0.0-next-8.29",
     "@verdaccio/streams": "10.2.1",
     "@verdaccio/tarball": "13.0.0-next-8.37",
-    "@verdaccio/ui-theme": "9.0.0-next-9.10",
+    "@verdaccio/ui-theme": "9.0.0-next-9.14",
     "@verdaccio/url": "13.0.0-next-8.37",
     "@verdaccio/utils": "8.1.0-next-8.37",
     "JSONStream": "1.3.5",
@@ -74,7 +74,8 @@
     "@types/semver": "7.7.1",
     "@types/supertest": "6.0.3",
     "@verdaccio-scope/verdaccio-auth-foo": "0.0.2",
-    "@verdaccio/e2e-cli": "2.4.0",
+    "@verdaccio/e2e-cli": "2.6.0",
+    "@verdaccio/e2e-ui": "2.4.1",
     "@verdaccio/eslint-config": "13.0.0",
     "@verdaccio/test-helper": "4.0.0-next-8.21",
     "@verdaccio/types": "13.0.0-next-8.12",
@@ -82,6 +83,7 @@
     "@vitest/eslint-plugin": "1.6.9",
     "babel-plugin-transform-inline-environment-variables": "0.4.4",
     "cross-env": "10.1.0",
+    "cypress": "15",
     "eslint": "10.0.3",
     "eslint-plugin-cypress": "6.1.0",
     "eslint-plugin-jest": "29.15.0",
@@ -134,7 +136,12 @@
     "code:types": "tsc --emitDeclarationOnly -p tsconfig.json",
     "code:docker-build": "yarn babel src/ --out-dir build/ --copy-files --extensions \".ts,.tsx\"",
     "docker": "docker build -t verdaccio/verdaccio:local . --no-cache",
-    "docker:run": "docker run -it --rm -p 4873:4873 -e \"DEBUG=verdaccio*\" verdaccio/verdaccio:local"
+    "docker:run": "docker run -it --rm -p 4873:4873 -e \"DEBUG=verdaccio*\" verdaccio/verdaccio:local",
+    "e2e:ui:start": "node bin/verdaccio --config ./scripts/e2e-ui-config.yaml",
+    "e2e:ui:run": "cypress run",
+    "e2e:ui:open": "cypress open",
+    "e2e:ui:local": "./scripts/e2e-ui-local.sh",
+    "e2e:ui:local:open": "./scripts/e2e-ui-local.sh --open"
   },
   "engines": {
     "node": ">=18"