npm - @authup/server-core - Versions diffs - 1.0.0-beta.3 → 1.0.0-beta.5 - Mend

@authup/server-core 1.0.0-beta.3 → 1.0.0-beta.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (206) hide show

package/dist/http/controllers/role/handlers/update.js CHANGED Viewed

@@ -37,7 +37,7 @@ async function updateRoleRouteHandler(req, res) {
         throw new http_1.ForbiddenError();
     }
     // ----------------------------------------------
-    if (!ability.matchTarget(core_1.PermissionName.ROLE_EDIT, entity.target)) {
+    if (!ability.satisfy(core_1.PermissionName.ROLE_EDIT, { target: entity.target })) {
         throw new http_1.ForbiddenError('You are not permitted for the role target.');
     }
     // ----------------------------------------------

package/dist/http/controllers/role/handlers/update.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../../src/http/controllers/role/handlers/update.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA2D;AAC3D,uCAAuE;AAEvE,mCAAuD;AACvD,yDAAkD;AAClD,iDAAiD;AACjD,0CAA+C;AAC/C,oCAA6C;AAC7C,0DAAqE;AAE9D,KAAK,UAAU,sBAAsB,CAAC,GAAY,EAAE,GAAa;IACpE,MAAM,EAAE,GAAG,IAAA,wBAAe,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAEtC,MAAM,OAAO,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC9C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAc,CAAC,SAAS,CAAC,EAAE,CAAC;QACzC,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,IAAA,yBAAiB,EAAC,GAAG,EAAE,mCAAuB,CAAC,MAAM,CAAC,CAAC;IAC5E,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACf,OAAO,IAAA,qBAAY,EAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;IAED,iDAAiD;IAEjD,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,oBAAU,CAAC,CAAC;IACxD,IAAI,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAEhD,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,iDAAiD;IAEjD,IAAI,CAAC,IAAA,8BAAuB,EAAC,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;QACzE,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,iDAAiD;IAEjD,IAAI,CAAC,OAAO,CAAC,~~WAAW~~,CAAC,qBAAc,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;~~QAChE~~,MAAM,IAAI,qBAAc,CAAC,4CAA4C,CAAC,CAAC;IAC3E,CAAC;IAED,iDAAiD;IAEjD,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;IAE/C,MAAM,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAE9B,OAAO,IAAA,qBAAY,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACrC,CAAC;AA1CD,wDA0CC"}
1	+ {"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../../src/http/controllers/role/handlers/update.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA2D;AAC3D,uCAAuE;AAEvE,mCAAuD;AACvD,yDAAkD;AAClD,iDAAiD;AACjD,0CAA+C;AAC/C,oCAA6C;AAC7C,0DAAqE;AAE9D,KAAK,UAAU,sBAAsB,CAAC,GAAY,EAAE,GAAa;IACpE,MAAM,EAAE,GAAG,IAAA,wBAAe,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAEtC,MAAM,OAAO,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC9C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAc,CAAC,SAAS,CAAC,EAAE,CAAC;QACzC,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,IAAA,yBAAiB,EAAC,GAAG,EAAE,mCAAuB,CAAC,MAAM,CAAC,CAAC;IAC5E,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACf,OAAO,IAAA,qBAAY,EAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;IAED,iDAAiD;IAEjD,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,oBAAU,CAAC,CAAC;IACxD,IAAI,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAEhD,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,iDAAiD;IAEjD,IAAI,CAAC,IAAA,8BAAuB,EAAC,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;QACzE,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,iDAAiD;IAEjD,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,qBAAc,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC;QACxE,MAAM,IAAI,qBAAc,CAAC,4CAA4C,CAAC,CAAC;IAC3E,CAAC;IAED,iDAAiD;IAEjD,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;IAE/C,MAAM,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAE9B,OAAO,IAAA,qBAAY,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACrC,CAAC;AA1CD,wDA0CC"}

package/dist/http/controllers/role/utils/validaiton.js CHANGED Viewed

@@ -70,15 +70,15 @@ async function runRoleValidation(req, operation) {
     // ----------------------------------------------
     const ability = (0, utils_1.useRequestEnv)(req, 'ability');
     if (operation === constants_1.RequestHandlerOperation.CREATE) {
-        const permissionTarget = ability.getTarget(core_1.PermissionName.ROLE_ADD);
+        const permissionTarget = ability.findOne(core_1.PermissionName.ROLE_ADD);
         if (permissionTarget) {
-            result.data.target = permissionTarget;
+            result.data.target = permissionTarget.target;
         }
     }
     else {
-        const permissionTarget = ability.getTarget(core_1.PermissionName.ROLE_EDIT);
+        const permissionTarget = ability.findOne(core_1.PermissionName.ROLE_EDIT);
         if (permissionTarget) {
-            result.data.target = permissionTarget;
+            result.data.target = permissionTarget.target;
         }
     }
     // ----------------------------------------------

package/dist/http/controllers/role/utils/validaiton.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"validaiton.js","sourceRoot":"","sources":["../../../../../src/http/controllers/role/utils/validaiton.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,uCAEsB;AACtB,yDAA4D;AAC5D,qCAA6C;AAG7C,iDAAkD;AAClD,0CAA+C;AAE/C,oDAM6B;AAC7B,0DAAqE;AAE9D,KAAK,UAAU,iBAAiB,CACnC,GAAY,EACZ,SAAoF;IAEpF,MAAM,MAAM,GAAyC,IAAA,wCAA2B,GAAE,CAAC;IAEnF,MAAM,SAAS,GAAG,MAAM,IAAA,yBAAK,EAAC,MAAM,CAAC;SAChC,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;QACd,MAAM,OAAO,GAAG,IAAA,sBAAe,EAAC,KAAK,CAAC,CAAC;QACvC,IAAI,CAAC,OAAO,EAAE,CAAC;YACX,MAAM,IAAI,sBAAe,CAAC,iDAAiD,CAAC,CAAC;QACjF,CAAC;QAED,OAAO,OAAO,CAAC;IACnB,CAAC,CAAC,CAAC;IAEP,IAAI,SAAS,KAAK,mCAAuB,CAAC,MAAM;QAAE,SAAS,CAAC,QAAQ,EAAE,CAAC;IAEvE,MAAM,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAEzB,MAAM,IAAA,yBAAK,EAAC,aAAa,CAAC;SACrB,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,EAAE;SACV,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;SAC/B,QAAQ,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;SAC5B,GAAG,CAAC,GAAG,CAAC,CAAC;IAEd,MAAM,IAAA,yBAAK,EAAC,QAAQ,CAAC;SAChB,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC;SAC7B,QAAQ,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;SAC5B,GAAG,CAAC,GAAG,CAAC,CAAC;IAEd,MAAM,IAAA,yBAAK,EAAC,UAAU,CAAC;SAClB,MAAM,EAAE;SACR,MAAM,EAAE;SACR,QAAQ,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;SAC5B,GAAG,CAAC,GAAG,CAAC,CAAC;IAEd,iDAAiD;IAEjD,MAAM,UAAU,GAAG,IAAA,oCAAgB,EAAC,GAAG,CAAC,CAAC;IACzC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC;QACxB,MAAM,IAAI,mCAAsB,CAAC,UAAU,CAAC,CAAC;IACjD,CAAC;IAED,MAAM,CAAC,IAAI,GAAG,IAAA,kCAAqB,EAAC,GAAG,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC;IAErE,iDAAiD;IAEjD,MAAM,IAAA,sDAAyC,EAAC,MAAM,EAAE,qBAAW,EAAE;QACjE,EAAE,EAAE,UAAU;QACd,MAAM,EAAE,OAAO;KAClB,CAAC,CAAC;IAEH,IAAI,IAAA,oBAAa,EAAC,MAAM,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE,CAAC;QACzC,IAAI,CAAC,IAAA,8BAAuB,EAAC,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC9E,MAAM,IAAI,sBAAe,CAAC,IAAA,+CAAkC,EAAC,UAAU,CAAC,CAAC,CAAC;QAC9E,CAAC;IACL,CAAC;SAAM,IACH,SAAS,KAAK,mCAAuB,CAAC,MAAM;QAC5C,CAAC,IAAA,8BAAuB,EAAC,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC,EACvD,CAAC;QACC,MAAM,IAAI,sBAAe,CAAC,IAAA,+CAAkC,EAAC,UAAU,CAAC,CAAC,CAAC;IAC9E,CAAC;IAED,iDAAiD;IAEjD,MAAM,OAAO,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAE9C,IAAI,SAAS,KAAK,mCAAuB,CAAC,MAAM,EAAE,CAAC;QAC/C,MAAM,gBAAgB,GAAG,OAAO,CAAC,~~SAAS~~,CAAC,qBAAc,CAAC,QAAQ,CAAC,CAAC;~~QACpE~~,IAAI,gBAAgB,EAAE,CAAC;YACnB,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,gBAAgB,CAAC;~~QAC1C~~,CAAC;IACL,CAAC;SAAM,CAAC;QACJ,MAAM,gBAAgB,GAAG,OAAO,CAAC,~~SAAS~~,CAAC,qBAAc,CAAC,SAAS,CAAC,CAAC;~~QACrE~~,IAAI,gBAAgB,EAAE,CAAC;YACnB,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,gBAAgB,CAAC;~~QAC1C~~,CAAC;IACL,CAAC;IAED,iDAAiD;IAEjD,OAAO,MAAM,CAAC;AAClB,CAAC;AAzFD,8CAyFC"}
1	+ {"version":3,"file":"validaiton.js","sourceRoot":"","sources":["../../../../../src/http/controllers/role/utils/validaiton.ts"],"names":[],"mappings":"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"}

package/dist/http/controllers/role-attribute/handlers/update.js CHANGED Viewed

@@ -12,12 +12,12 @@ const core_1 = require("@authup/core");
 const routup_1 = require("routup");
 const typeorm_extension_1 = require("typeorm-extension");
 const domains_1 = require("../../../../domains");
-const env_1 = require("../../../utils/env");
-const utils_1 = require("../utils");
-const constants_1 = require("../../../request/constants");
+const utils_1 = require("../../../utils");
+const utils_2 = require("../utils");
+const request_1 = require("../../../request");
 async function updateRoleAttributeRouteHandler(req, res) {
     const id = (0, routup_1.useRequestParam)(req, 'id');
-    const result = await (0, utils_1.runRoleAttributeValidation)(req, constants_1.RequestHandlerOperation.UPDATE);
+    const result = await (0, utils_2.runRoleAttributeValidation)(req, request_1.RequestHandlerOperation.UPDATE);
     if (!result) {
         return (0, routup_1.sendAccepted)(res);
     }
@@ -28,9 +28,9 @@ async function updateRoleAttributeRouteHandler(req, res) {
         throw new http_1.NotFoundError();
     }
     entity = repository.merge(entity, result.data);
-    const ability = (0, env_1.useRequestEnv)(req, 'ability');
+    const ability = (0, utils_1.useRequestEnv)(req, 'ability');
     if (!ability.has(core_1.PermissionName.ROLE_EDIT) ||
-        !(0, core_1.isRealmResourceWritable)((0, env_1.useRequestEnv)(req, 'realm'), entity.realm_id)) {
+        !(0, core_1.isRealmResourceWritable)((0, utils_1.useRequestEnv)(req, 'realm'), entity.realm_id)) {
         throw new http_1.ForbiddenError('You are not permitted to update an attribute for this role...');
     }
     await repository.save(entity);

package/dist/http/controllers/role-attribute/handlers/update.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../../src/http/controllers/role-attribute/handlers/update.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA2D;AAE3D,uCAAuE;AAEvE,mCAAuD;AACvD,yDAAkD;AAClD,iDAA0D;AAC1D,~~4CAAmD~~;~~AACnD~~,oCAAsD;AACtD,~~0DAAqE~~;~~AAE9D~~,KAAK,UAAU,+BAA+B,CAAC,GAAY,EAAE,GAAa;IAC7E,MAAM,EAAE,GAAG,IAAA,wBAAe,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAEtC,MAAM,MAAM,GAAG,MAAM,IAAA,kCAA0B,EAAC,GAAG,EAAE,~~mCAAuB~~,CAAC,MAAM,CAAC,CAAC;IACrF,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,OAAO,IAAA,qBAAY,EAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,6BAAmB,CAAC,CAAC;IAEjE,IAAI,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAChD,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;IAE/C,MAAM,OAAO,GAAG,IAAA,~~mBAAa~~,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC9C,IACI,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAc,CAAC,SAAS,CAAC;QACtC,CAAC,IAAA,8BAAuB,EAAC,IAAA,~~mBAAa~~,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,EACxE,CAAC;QACC,MAAM,IAAI,qBAAc,CAAC,+DAA+D,CAAC,CAAC;IAC9F,CAAC;IAED,MAAM,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAE9B,OAAO,IAAA,qBAAY,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACrC,CAAC;AA7BD,0EA6BC"}
1	+ {"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../../src/http/controllers/role-attribute/handlers/update.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA2D;AAE3D,uCAAuE;AAEvE,mCAAuD;AACvD,yDAAkD;AAClD,iDAA0D;AAC1D,0CAA+C;AAC/C,oCAAsD;AACtD,8CAA2D;AAEpD,KAAK,UAAU,+BAA+B,CAAC,GAAY,EAAE,GAAa;IAC7E,MAAM,EAAE,GAAG,IAAA,wBAAe,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAEtC,MAAM,MAAM,GAAG,MAAM,IAAA,kCAA0B,EAAC,GAAG,EAAE,iCAAuB,CAAC,MAAM,CAAC,CAAC;IACrF,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,OAAO,IAAA,qBAAY,EAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,6BAAmB,CAAC,CAAC;IAEjE,IAAI,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAChD,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;IAE/C,MAAM,OAAO,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC9C,IACI,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAc,CAAC,SAAS,CAAC;QACtC,CAAC,IAAA,8BAAuB,EAAC,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,EACxE,CAAC;QACC,MAAM,IAAI,qBAAc,CAAC,+DAA+D,CAAC,CAAC;IAC9F,CAAC;IAED,MAAM,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAE9B,OAAO,IAAA,qBAAY,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACrC,CAAC;AA7BD,0EA6BC"}

package/dist/http/controllers/role-permission/handlers/delete.js CHANGED Viewed

@@ -36,7 +36,7 @@ async function deleteRolePermissionRouteHandler(req, res) {
         throw new http_1.ForbiddenError();
     }
     // ----------------------------------------------
-    if (!ability.matchTarget(core_1.PermissionName.ROLE_PERMISSION_DROP, entity.target)) {
+    if (!ability.satisfy(core_1.PermissionName.ROLE_PERMISSION_DROP, { target: entity.target })) {
         throw new http_1.ForbiddenError('You are not permitted for the role-permission target.');
     }
     // ----------------------------------------------

package/dist/http/controllers/role-permission/handlers/delete.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../../src/http/controllers/role-permission/handlers/delete.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA2D;AAC3D,uCAAuE;AAEvE,mCAAuD;AACvD,yDAAkD;AAClD,iDAA2D;AAC3D,4CAAmD;AAEnD;;;;;GAKG;AACI,KAAK,UAAU,gCAAgC,CAAC,GAAY,EAAE,GAAa;IAC9E,MAAM,EAAE,GAAG,IAAA,wBAAe,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAEtC,MAAM,OAAO,GAAG,IAAA,mBAAa,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC9C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAc,CAAC,oBAAoB,CAAC,EAAE,CAAC;QACpD,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,8BAAoB,CAAC,CAAC;IAClE,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAElD,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,iDAAiD;IAEjD,IAAI,CAAC,IAAA,8BAAuB,EAAC,IAAA,mBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;QAC9E,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,iDAAiD;IAEjD,IAAI,CAAC,OAAO,CAAC,~~WAAW~~,CAAC,qBAAc,CAAC,oBAAoB,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;~~QAC3E~~,MAAM,IAAI,qBAAc,CAAC,uDAAuD,CAAC,CAAC;IACtF,CAAC;IAED,iDAAiD;IAEjD,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IAEhC,MAAM,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAEhC,MAAM,CAAC,EAAE,GAAG,QAAQ,CAAC;IAErB,iDAAiD;IAEjD,OAAO,IAAA,qBAAY,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACrC,CAAC;AAvCD,4EAuCC"}
1	+ {"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../../src/http/controllers/role-permission/handlers/delete.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA2D;AAC3D,uCAAuE;AAEvE,mCAAuD;AACvD,yDAAkD;AAClD,iDAA2D;AAC3D,4CAAmD;AAEnD;;;;;GAKG;AACI,KAAK,UAAU,gCAAgC,CAAC,GAAY,EAAE,GAAa;IAC9E,MAAM,EAAE,GAAG,IAAA,wBAAe,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAEtC,MAAM,OAAO,GAAG,IAAA,mBAAa,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC9C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAc,CAAC,oBAAoB,CAAC,EAAE,CAAC;QACpD,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,8BAAoB,CAAC,CAAC;IAClE,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAElD,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,iDAAiD;IAEjD,IAAI,CAAC,IAAA,8BAAuB,EAAC,IAAA,mBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;QAC9E,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,iDAAiD;IAEjD,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,qBAAc,CAAC,oBAAoB,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC;QACnF,MAAM,IAAI,qBAAc,CAAC,uDAAuD,CAAC,CAAC;IACtF,CAAC;IAED,iDAAiD;IAEjD,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IAEhC,MAAM,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAEhC,MAAM,CAAC,EAAE,GAAG,QAAQ,CAAC;IAErB,iDAAiD;IAEjD,OAAO,IAAA,qBAAY,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACrC,CAAC;AAvCD,4EAuCC"}

package/dist/http/controllers/role-permission/utils/validation.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/role-permission/utils/validation.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAGhE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAQnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAErE,wBAAsB,2BAA2B,CAC7C,GAAG,EAAE,OAAO,EACZ,SAAS,EAAE,GAAG,uBAAuB,CAAC,MAAM,EAAE,GAAG,GAAG,uBAAuB,CAAC,MAAM,EAAE,GACpF,OAAO,CAAC,uBAAuB,CAAC,oBAAoB,CAAC,CAAC,~~CA4EzD~~"}
1	+ {"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/role-permission/utils/validation.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAGhE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAQnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAErE,wBAAsB,2BAA2B,CAC7C,GAAG,EAAE,OAAO,EACZ,SAAS,EAAE,GAAG,uBAAuB,CAAC,MAAM,EAAE,GAAG,GAAG,uBAAuB,CAAC,MAAM,EAAE,GACpF,OAAO,CAAC,uBAAuB,CAAC,oBAAoB,CAAC,CAAC,CAkFzD"}

package/dist/http/controllers/role-permission/utils/validation.js CHANGED Viewed

@@ -32,6 +32,11 @@ async function runRolePermissionValidation(req, operation) {
             .optional({ nullable: true })
             .run(req);
     }
+    await (0, express_validator_1.check)('condition')
+        .exists()
+        .isObject()
+        .optional({ nullable: true })
+        .run(req);
     // ----------------------------------------------
     const validation = (0, express_validator_1.validationResult)(req);
     if (!validation.isEmpty()) {
@@ -53,9 +58,9 @@ async function runRolePermissionValidation(req, operation) {
             throw new http_1.ForbiddenError('It is only allowed to assign role permissions, which are also owned.');
         }
     }
-    const permissionTarget = ability.getTarget(core_1.PermissionName.ROLE_PERMISSION_ADD);
-    if (permissionTarget) {
-        result.data.target = permissionTarget;
+    const permission = ability.findOne(core_1.PermissionName.ROLE_PERMISSION_ADD);
+    if (permission) {
+        result.data.target = permission.target;
     }
     // ----------------------------------------------
     await (0, validation_1.extendExpressValidationResultWithRelation)(result, domains_1.RoleEntity, {

package/dist/http/controllers/role-permission/utils/validation.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../../../src/http/controllers/role-permission/utils/validation.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,yDAA4D;AAC5D,qCAA6D;AAC7D,uCAAuE;AAGvE,iDAAmE;AACnE,0CAAkE;AAElE,oDAM6B;AAC7B,0DAAqE;AAE9D,KAAK,UAAU,2BAA2B,CAC7C,GAAY,EACZ,SAAoF;IAEpF,MAAM,MAAM,GAAmD,IAAA,wCAA2B,GAAE,CAAC;IAE7F,IAAI,SAAS,KAAK,mCAAuB,CAAC,MAAM,EAAE,CAAC;QAC/C,MAAM,IAAA,yBAAK,EAAC,SAAS,CAAC;aACjB,MAAM,EAAE;aACR,MAAM,EAAE;aACR,GAAG,CAAC,GAAG,CAAC,CAAC;QAEd,MAAM,IAAA,yBAAK,EAAC,eAAe,CAAC;aACvB,MAAM,EAAE;aACR,MAAM,EAAE;aACR,GAAG,CAAC,GAAG,CAAC,CAAC;QAEd,MAAM,IAAA,yBAAK,EAAC,QAAQ,CAAC;aAChB,MAAM,EAAE;aACR,QAAQ,EAAE;aACV,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC;aAC7B,QAAQ,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;aAC5B,GAAG,CAAC,GAAG,CAAC,CAAC;IAClB,CAAC;IAED,iDAAiD;IAEjD,MAAM,UAAU,GAAG,IAAA,oCAAgB,EAAC,GAAG,CAAC,CAAC;IACzC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC;QACxB,MAAM,IAAI,mCAAsB,CAAC,UAAU,CAAC,CAAC;IACjD,CAAC;IAED,MAAM,CAAC,IAAI,GAAG,IAAA,kCAAqB,EAAC,GAAG,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC;IAErE,iDAAiD;IAEjD,MAAM,OAAO,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAE9C,MAAM,IAAA,sDAAyC,EAAC,MAAM,EAAE,0BAAgB,EAAE;QACtE,EAAE,EAAE,eAAe;QACnB,MAAM,EAAE,YAAY;KACvB,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;QAC7B,IAAI,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;YACpC,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC;QAC3D,CAAC;QAED,IACI,CAAC,IAAA,yBAAiB,EAAC,GAAG,CAAC;YACvB,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,EAC/C,CAAC;YACC,MAAM,IAAI,qBAAc,CAAC,sEAAsE,CAAC,CAAC;QACrG,CAAC;IACL,CAAC;IAED,MAAM,~~gBAAgB~~,GAAG,OAAO,CAAC,~~SAAS~~,CAAC,qBAAc,CAAC,mBAAmB,CAAC,CAAC;~~IAC/E~~,IAAI,~~gBAAgB~~,EAAE,CAAC;~~QACnB~~,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,~~gBAAgB~~,CAAC;~~IAC1C~~,CAAC;IAED,iDAAiD;IAEjD,MAAM,IAAA,sDAAyC,EAAC,MAAM,EAAE,oBAAU,EAAE;QAChE,EAAE,EAAE,SAAS;QACb,MAAM,EAAE,MAAM;KACjB,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QACvB,IAAI,CAAC,IAAA,8BAAuB,EAAC,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YACvF,MAAM,IAAI,sBAAe,CAAC,IAAA,+CAAkC,EAAC,SAAS,CAAC,CAAC,CAAC;QAC7E,CAAC;QAED,MAAM,CAAC,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC;IAC9D,CAAC;IAED,iDAAiD;IAEjD,OAAO,MAAM,CAAC;AAClB,CAAC;~~AA/ED~~,~~kEA+EC~~"}
1	+ {"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../../../src/http/controllers/role-permission/utils/validation.ts"],"names":[],"mappings":"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"}

package/dist/http/controllers/root/authorize/handlers/run.js CHANGED Viewed

@@ -15,7 +15,7 @@ async function runAuthorizationRouteHandler(req, res) {
     const config = (0, config_1.useConfig)();
     const result = await (0, oauth2_1.runOAuth2Authorization)(req, {
         issuer: config.publicUrl,
-        accessTokenMaxAge: config.tokenMaxAgeAccessToken,
+        accessTokenMaxAge: config.tokenRefreshMaxAge,
     });
     // ---------------------------------------------------------
     const url = new node_url_1.URL(result.redirectUri);

package/dist/http/controllers/root/authorize/handlers/run.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"run.js","sourceRoot":"","sources":["../../../../../../src/http/controllers/root/authorize/handlers/run.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,uCAA+B;AAE/B,mCAA8B;AAC9B,kDAAkD;AAClD,+CAA4D;AAErD,KAAK,UAAU,4BAA4B,CAC9C,GAAY,EACZ,GAAa;IAEb,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;IAC3B,MAAM,MAAM,GAAG,MAAM,IAAA,+BAAsB,EAAC,GAAG,EAAE;QAC7C,MAAM,EAAE,MAAM,CAAC,SAAS;QACxB,iBAAiB,EAAE,MAAM,CAAC,~~sBAAsB~~;~~KACnD~~,CAAC,CAAC;IAEH,4DAA4D;IAE5D,MAAM,GAAG,GAAG,IAAI,cAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACxC,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QACf,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAChD,CAAC;IAED,IAAI,MAAM,CAAC,iBAAiB,EAAE,CAAC;QAC3B,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,iBAAiB,CAAC,CAAC;IAC3D,CAAC;IAED,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;QACrB,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,cAAc,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;IAC7D,CAAC;IAED,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACjB,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IACrD,CAAC;IAED,IAAA,aAAI,EAAC,GAAG,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;AACjC,CAAC;AA9BD,oEA8BC"}
1	+ {"version":3,"file":"run.js","sourceRoot":"","sources":["../../../../../../src/http/controllers/root/authorize/handlers/run.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,uCAA+B;AAE/B,mCAA8B;AAC9B,kDAAkD;AAClD,+CAA4D;AAErD,KAAK,UAAU,4BAA4B,CAC9C,GAAY,EACZ,GAAa;IAEb,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;IAC3B,MAAM,MAAM,GAAG,MAAM,IAAA,+BAAsB,EAAC,GAAG,EAAE;QAC7C,MAAM,EAAE,MAAM,CAAC,SAAS;QACxB,iBAAiB,EAAE,MAAM,CAAC,kBAAkB;KAC/C,CAAC,CAAC;IAEH,4DAA4D;IAE5D,MAAM,GAAG,GAAG,IAAI,cAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACxC,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QACf,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAChD,CAAC;IAED,IAAI,MAAM,CAAC,iBAAiB,EAAE,CAAC;QAC3B,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,iBAAiB,CAAC,CAAC;IAC3D,CAAC;IAED,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;QACrB,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,cAAc,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;IAC7D,CAAC;IAED,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACjB,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IACrD,CAAC;IAED,IAAA,aAAI,EAAC,GAAG,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;AACjC,CAAC;AA9BD,oEA8BC"}

package/dist/http/controllers/root/status/module.js CHANGED Viewed

@@ -25,8 +25,8 @@ async function useInfo() {
     info = {
         version: pkgJson.version,
         timestamp: Date.now(),
-        tokenMaxAgeAccessToken: config.tokenMaxAgeAccessToken,
-        tokenMaxAgeRefreshToken: config.tokenMaxAgeRefreshToken,
+        tokenMaxAgeAccessToken: config.tokenRefreshMaxAge,
+        tokenMaxAgeRefreshToken: config.tokenAccessMaxAge,
         redis: !!config.redis,
         vault: !!config.vault,
     };

package/dist/http/controllers/root/status/module.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../../src/http/controllers/root/status/module.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;AAEH,0DAA6B;AAC7B,mCAA8B;AAC9B,mCAA8B;AAE9B,+CAA+C;AAC/C,wCAAmD;AAWnD,IAAI,IAA+B,CAAC;AAE7B,KAAK,UAAU,OAAO;IACzB,IAAI,OAAO,IAAI,KAAK,WAAW,EAAE,CAAC;QAC9B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,IAAA,aAAI,EAAC,mBAAI,CAAC,IAAI,CAAC,IAAA,yBAAkB,GAAE,EAAE,cAAc,CAAC,CAAC,CAAC;IAC5E,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;IAE3B,IAAI,GAAG;QACH,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;QACrB,sBAAsB,EAAE,MAAM,CAAC,~~sBAAsB~~;~~QACrD~~,uBAAuB,EAAE,MAAM,CAAC,~~uBAAuB~~;~~QACvD~~,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK;QACrB,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK;KACxB,CAAC;IAEF,OAAO,IAAI,CAAC;AAChB,CAAC;AAlBD,0BAkBC;AACM,KAAK,UAAU,qBAAqB,CAAC,GAAY,EAAE,GAAa;IACnE,MAAM,MAAM,GAAG,MAAM,OAAO,EAAE,CAAC;IAC/B,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAE9B,OAAO,IAAA,aAAI,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC;AALD,sDAKC"}
1	+ {"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../../src/http/controllers/root/status/module.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;AAEH,0DAA6B;AAC7B,mCAA8B;AAC9B,mCAA8B;AAE9B,+CAA+C;AAC/C,wCAAmD;AAWnD,IAAI,IAA+B,CAAC;AAE7B,KAAK,UAAU,OAAO;IACzB,IAAI,OAAO,IAAI,KAAK,WAAW,EAAE,CAAC;QAC9B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,IAAA,aAAI,EAAC,mBAAI,CAAC,IAAI,CAAC,IAAA,yBAAkB,GAAE,EAAE,cAAc,CAAC,CAAC,CAAC;IAC5E,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;IAE3B,IAAI,GAAG;QACH,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;QACrB,sBAAsB,EAAE,MAAM,CAAC,kBAAkB;QACjD,uBAAuB,EAAE,MAAM,CAAC,iBAAiB;QACjD,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK;QACrB,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK;KACxB,CAAC;IAEF,OAAO,IAAI,CAAC;AAChB,CAAC;AAlBD,0BAkBC;AACM,KAAK,UAAU,qBAAqB,CAAC,GAAY,EAAE,GAAa;IACnE,MAAM,MAAM,GAAG,MAAM,OAAO,EAAE,CAAC;IAC/B,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAE9B,OAAO,IAAA,aAAI,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC;AALD,sDAKC"}

package/dist/http/controllers/root/token/handlers/create.js CHANGED Viewed

@@ -57,11 +57,11 @@ async function createTokenRouteHandler(req, res) {
     }
     (0, cookie_1.setResponseCookie)(res, core_1.CookieName.ACCESS_TOKEN, tokenResponse.access_token, {
         ...cookieOptions,
-        maxAge: config.tokenMaxAgeAccessToken * 1000,
+        maxAge: config.tokenRefreshMaxAge * 1000,
     });
     (0, cookie_1.setResponseCookie)(res, core_1.CookieName.REFRESH_TOKEN, tokenResponse.refresh_token, {
         ...cookieOptions,
-        maxAge: config.tokenMaxAgeRefreshToken * 1000,
+        maxAge: config.tokenAccessMaxAge * 1000,
     });
     return (0, routup_1.send)(res, tokenResponse);
 }

package/dist/http/controllers/root/token/handlers/create.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../../../src/http/controllers/root/token/handlers/create.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAIH,uCAGsB;AAEtB,iDAAyD;AACzD,uCAA+B;AAE/B,mCAA8B;AAC9B,yDAAoD;AACpD,kDAAkD;AAElD,+CAO4B;AAE5B;;;;;;GAMG;AACI,KAAK,UAAU,uBAAuB,CACzC,GAAY,EACZ,GAAa;IAEb,MAAM,SAAS,GAAG,IAAA,sCAA6B,EAAC,GAAG,CAAC,CAAC;IACrD,IAAI,CAAC,SAAS,EAAE,CAAC;QACb,MAAM,iBAAU,CAAC,YAAY,EAAE,CAAC;IACpC,CAAC;IAED,IAAI,KAAyB,CAAC;IAE9B,QAAQ,SAAS,EAAE,CAAC;QAChB,KAAK,uBAAgB,CAAC,kBAAkB,CAAC,CAAC,CAAC;YACvC,KAAK,GAAG,IAAI,2BAAkB,EAAE,CAAC;YACjC,MAAM;QACV,CAAC;QACD,KAAK,uBAAgB,CAAC,kBAAkB,CAAC,CAAC,CAAC;YACvC,KAAK,GAAG,IAAI,+BAAsB,EAAE,CAAC;YACrC,MAAM;QACV,CAAC;QACD,KAAK,uBAAgB,CAAC,iBAAiB,CAAC,CAAC,CAAC;YACtC,KAAK,GAAG,IAAI,kCAAyB,EAAE,CAAC;YACxC,MAAM;QACV,CAAC;QACD,KAAK,uBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC7B,KAAK,GAAG,IAAI,0BAAiB,EAAE,CAAC;YAChC,MAAM;QACV,CAAC;QACD,KAAK,uBAAgB,CAAC,aAAa,CAAC,CAAC,CAAC;YAClC,KAAK,GAAG,IAAI,8BAAqB,EAAE,CAAC;YACpC,MAAM;QACV,CAAC;IACL,CAAC;IAED,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;IAE3B,MAAM,aAAa,GAA8B,MAAM,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAEtE,MAAM,aAAa,GAAsB,EAAE,CAAC;IAC5C,IAAI,MAAM,CAAC,GAAG,KAAK,mCAAe,CAAC,UAAU,EAAE,CAAC;QAC5C,aAAa,CAAC,MAAM,GAAG,IAAI,cAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC;IAC9D,CAAC;IAED,IAAA,0BAAiB,EAAC,GAAG,EAAE,iBAAU,CAAC,YAAY,EAAE,aAAa,CAAC,YAAY,EAAE;QACxE,GAAG,aAAa;QAChB,MAAM,EAAE,MAAM,CAAC,~~sBAAsB~~,GAAG,IAAI;~~KAC/C~~,CAAC,CAAC;IAEH,IAAA,0BAAiB,EAAC,GAAG,EAAE,iBAAU,CAAC,aAAa,EAAE,aAAa,CAAC,aAAa,EAAE;QAC1E,GAAG,aAAa;QAChB,MAAM,EAAE,MAAM,CAAC,~~uBAAuB~~,GAAG,IAAI;~~KAChD~~,CAAC,CAAC;IAEH,OAAO,IAAA,aAAI,EAAC,GAAG,EAAE,aAAa,CAAC,CAAC;AACpC,CAAC;AAtDD,0DAsDC"}
1	+ {"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../../../src/http/controllers/root/token/handlers/create.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAIH,uCAGsB;AAEtB,iDAAyD;AACzD,uCAA+B;AAE/B,mCAA8B;AAC9B,yDAAoD;AACpD,kDAAkD;AAElD,+CAO4B;AAE5B;;;;;;GAMG;AACI,KAAK,UAAU,uBAAuB,CACzC,GAAY,EACZ,GAAa;IAEb,MAAM,SAAS,GAAG,IAAA,sCAA6B,EAAC,GAAG,CAAC,CAAC;IACrD,IAAI,CAAC,SAAS,EAAE,CAAC;QACb,MAAM,iBAAU,CAAC,YAAY,EAAE,CAAC;IACpC,CAAC;IAED,IAAI,KAAyB,CAAC;IAE9B,QAAQ,SAAS,EAAE,CAAC;QAChB,KAAK,uBAAgB,CAAC,kBAAkB,CAAC,CAAC,CAAC;YACvC,KAAK,GAAG,IAAI,2BAAkB,EAAE,CAAC;YACjC,MAAM;QACV,CAAC;QACD,KAAK,uBAAgB,CAAC,kBAAkB,CAAC,CAAC,CAAC;YACvC,KAAK,GAAG,IAAI,+BAAsB,EAAE,CAAC;YACrC,MAAM;QACV,CAAC;QACD,KAAK,uBAAgB,CAAC,iBAAiB,CAAC,CAAC,CAAC;YACtC,KAAK,GAAG,IAAI,kCAAyB,EAAE,CAAC;YACxC,MAAM;QACV,CAAC;QACD,KAAK,uBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC7B,KAAK,GAAG,IAAI,0BAAiB,EAAE,CAAC;YAChC,MAAM;QACV,CAAC;QACD,KAAK,uBAAgB,CAAC,aAAa,CAAC,CAAC,CAAC;YAClC,KAAK,GAAG,IAAI,8BAAqB,EAAE,CAAC;YACpC,MAAM;QACV,CAAC;IACL,CAAC;IAED,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;IAE3B,MAAM,aAAa,GAA8B,MAAM,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAEtE,MAAM,aAAa,GAAsB,EAAE,CAAC;IAC5C,IAAI,MAAM,CAAC,GAAG,KAAK,mCAAe,CAAC,UAAU,EAAE,CAAC;QAC5C,aAAa,CAAC,MAAM,GAAG,IAAI,cAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC;IAC9D,CAAC;IAED,IAAA,0BAAiB,EAAC,GAAG,EAAE,iBAAU,CAAC,YAAY,EAAE,aAAa,CAAC,YAAY,EAAE;QACxE,GAAG,aAAa;QAChB,MAAM,EAAE,MAAM,CAAC,kBAAkB,GAAG,IAAI;KAC3C,CAAC,CAAC;IAEH,IAAA,0BAAiB,EAAC,GAAG,EAAE,iBAAU,CAAC,aAAa,EAAE,aAAa,CAAC,aAAa,EAAE;QAC1E,GAAG,aAAa;QAChB,MAAM,EAAE,MAAM,CAAC,iBAAiB,GAAG,IAAI;KAC1C,CAAC,CAAC;IAEH,OAAO,IAAA,aAAI,EAAC,GAAG,EAAE,aAAa,CAAC,CAAC;AACpC,CAAC;AAtDD,0DAsDC"}

package/dist/http/controllers/user/handlers/update.js CHANGED Viewed

@@ -51,7 +51,7 @@ async function updateUserRouteHandler(req, res) {
             delete result.data.name;
         }
         const config = (0, config_1.useConfig)();
-        if (entity.name === config.adminUsername) {
+        if (entity.name === config.userAdminName) {
             throw new http_1.BadRequestError('The default user name can not be changed.');
         }
     }

package/dist/http/controllers/user-permission/handlers/delete.js CHANGED Viewed

@@ -36,7 +36,7 @@ async function deleteUserPermissionRouteHandler(req, res) {
         throw new http_1.ForbiddenError();
     }
     // ----------------------------------------------
-    if (!ability.matchTarget(core_1.PermissionName.USER_PERMISSION_DROP, entity.target)) {
+    if (!ability.satisfy(core_1.PermissionName.USER_PERMISSION_DROP, { target: entity.target })) {
         throw new http_1.ForbiddenError('You are not permitted for the role-permission target.');
     }
     // ----------------------------------------------

package/dist/http/controllers/user-permission/handlers/delete.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user-permission/handlers/delete.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA2D;AAC3D,uCAAuE;AAEvE,mCAAuD;AACvD,yDAAkD;AAClD,iDAA2D;AAC3D,4CAAmD;AAEnD;;;;;GAKG;AACI,KAAK,UAAU,gCAAgC,CAAC,GAAY,EAAE,GAAa;IAC9E,MAAM,EAAE,GAAG,IAAA,wBAAe,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAEtC,MAAM,OAAO,GAAG,IAAA,mBAAa,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC9C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAc,CAAC,oBAAoB,CAAC,EAAE,CAAC;QACpD,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,8BAAoB,CAAC,CAAC;IAClE,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAElD,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,iDAAiD;IAEjD,IACI,CAAC,IAAA,8BAAuB,EAAC,IAAA,mBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,aAAa,CAAC,EAC7E,CAAC;QACC,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,iDAAiD;IAEjD,IAAI,CAAC,OAAO,CAAC,~~WAAW~~,CAAC,qBAAc,CAAC,oBAAoB,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;~~QAC3E~~,MAAM,IAAI,qBAAc,CAAC,uDAAuD,CAAC,CAAC;IACtF,CAAC;IAED,iDAAiD;IAEjD,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IAEhC,MAAM,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAEhC,MAAM,CAAC,EAAE,GAAG,QAAQ,CAAC;IAErB,iDAAiD;IAEjD,OAAO,IAAA,qBAAY,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACrC,CAAC;AAzCD,4EAyCC"}
1	+ {"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user-permission/handlers/delete.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA2D;AAC3D,uCAAuE;AAEvE,mCAAuD;AACvD,yDAAkD;AAClD,iDAA2D;AAC3D,4CAAmD;AAEnD;;;;;GAKG;AACI,KAAK,UAAU,gCAAgC,CAAC,GAAY,EAAE,GAAa;IAC9E,MAAM,EAAE,GAAG,IAAA,wBAAe,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAEtC,MAAM,OAAO,GAAG,IAAA,mBAAa,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC9C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAc,CAAC,oBAAoB,CAAC,EAAE,CAAC;QACpD,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,8BAAoB,CAAC,CAAC;IAClE,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAElD,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,iDAAiD;IAEjD,IACI,CAAC,IAAA,8BAAuB,EAAC,IAAA,mBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,aAAa,CAAC,EAC7E,CAAC;QACC,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,iDAAiD;IAEjD,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,qBAAc,CAAC,oBAAoB,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC;QACnF,MAAM,IAAI,qBAAc,CAAC,uDAAuD,CAAC,CAAC;IACtF,CAAC;IAED,iDAAiD;IAEjD,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IAEhC,MAAM,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAEhC,MAAM,CAAC,EAAE,GAAG,QAAQ,CAAC;IAErB,iDAAiD;IAEjD,OAAO,IAAA,qBAAY,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACrC,CAAC;AAzCD,4EAyCC"}

package/dist/http/controllers/user-permission/utils/validation.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/user-permission/utils/validation.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAKhE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAQnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAErE,wBAAsB,2BAA2B,CAC7C,GAAG,EAAE,OAAO,EACZ,SAAS,EAAE,GAAG,uBAAuB,CAAC,MAAM,EAAE,GAAG,GAAG,uBAAuB,CAAC,MAAM,EAAE,GACpF,OAAO,CAAC,uBAAuB,CAAC,oBAAoB,CAAC,CAAC,~~CA8EzD~~"}
1	+ {"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/user-permission/utils/validation.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAKhE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAQnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAErE,wBAAsB,2BAA2B,CAC7C,GAAG,EAAE,OAAO,EACZ,SAAS,EAAE,GAAG,uBAAuB,CAAC,MAAM,EAAE,GAAG,GAAG,uBAAuB,CAAC,MAAM,EAAE,GACpF,OAAO,CAAC,uBAAuB,CAAC,oBAAoB,CAAC,CAAC,CAoFzD"}

package/dist/http/controllers/user-permission/utils/validation.js CHANGED Viewed

@@ -32,6 +32,11 @@ async function runUserPermissionValidation(req, operation) {
             .optional({ nullable: true })
             .run(req);
     }
+    await (0, express_validator_1.check)('condition')
+        .exists()
+        .isObject()
+        .optional({ nullable: true })
+        .run(req);
     // ----------------------------------------------
     const validation = (0, express_validator_1.validationResult)(req);
     if (!validation.isEmpty()) {
@@ -53,9 +58,9 @@ async function runUserPermissionValidation(req, operation) {
             throw new http_1.ForbiddenError('It is only allowed to assign user permissions, which are also owned.');
         }
     }
-    const permissionTarget = ability.getTarget(core_1.PermissionName.USER_PERMISSION_ADD);
+    const permissionTarget = ability.findOne(core_1.PermissionName.USER_PERMISSION_ADD);
     if (permissionTarget) {
-        result.data.target = permissionTarget;
+        result.data.target = permissionTarget.target;
     }
     // ----------------------------------------------
     await (0, validation_1.extendExpressValidationResultWithRelation)(result, domains_1.UserEntity, {

package/dist/http/controllers/user-permission/utils/validation.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user-permission/utils/validation.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,yDAA4D;AAC5D,qCAA6D;AAC7D,uCAAuE;AAGvE,iDAE6B;AAC7B,0CAAkE;AAElE,oDAM6B;AAC7B,0DAAqE;AAE9D,KAAK,UAAU,2BAA2B,CAC7C,GAAY,EACZ,SAAoF;IAEpF,MAAM,MAAM,GAAmD,IAAA,wCAA2B,GAAE,CAAC;IAE7F,IAAI,SAAS,KAAK,mCAAuB,CAAC,MAAM,EAAE,CAAC;QAC/C,MAAM,IAAA,yBAAK,EAAC,SAAS,CAAC;aACjB,MAAM,EAAE;aACR,MAAM,EAAE;aACR,GAAG,CAAC,GAAG,CAAC,CAAC;QAEd,MAAM,IAAA,yBAAK,EAAC,eAAe,CAAC;aACvB,MAAM,EAAE;aACR,QAAQ,EAAE;aACV,GAAG,CAAC,GAAG,CAAC,CAAC;QAEd,MAAM,IAAA,yBAAK,EAAC,QAAQ,CAAC;aAChB,MAAM,EAAE;aACR,QAAQ,EAAE;aACV,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC;aAC7B,QAAQ,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;aAC5B,GAAG,CAAC,GAAG,CAAC,CAAC;IAClB,CAAC;IAED,iDAAiD;IAEjD,MAAM,UAAU,GAAG,IAAA,oCAAgB,EAAC,GAAG,CAAC,CAAC;IACzC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC;QACxB,MAAM,IAAI,mCAAsB,CAAC,UAAU,CAAC,CAAC;IACjD,CAAC;IAED,MAAM,CAAC,IAAI,GAAG,IAAA,kCAAqB,EAAC,GAAG,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC;IAErE,iDAAiD;IAEjD,MAAM,OAAO,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAE9C,MAAM,IAAA,sDAAyC,EAAC,MAAM,EAAE,0BAAgB,EAAE;QACtE,EAAE,EAAE,eAAe;QACnB,MAAM,EAAE,YAAY;KACvB,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;QAC7B,IAAI,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;YACpC,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC;QAC3D,CAAC;QAED,IACI,CAAC,IAAA,yBAAiB,EAAC,GAAG,CAAC;YACvB,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,EAC/C,CAAC;YACC,MAAM,IAAI,qBAAc,CAAC,sEAAsE,CAAC,CAAC;QACrG,CAAC;IACL,CAAC;IAED,MAAM,gBAAgB,GAAG,OAAO,CAAC,~~SAAS~~,CAAC,qBAAc,CAAC,mBAAmB,CAAC,CAAC;~~IAC/E~~,IAAI,gBAAgB,EAAE,CAAC;QACnB,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,gBAAgB,CAAC;~~IAC1C~~,CAAC;IAED,iDAAiD;IAEjD,MAAM,IAAA,sDAAyC,EAAC,MAAM,EAAE,oBAAU,EAAE;QAChE,EAAE,EAAE,SAAS;QACb,MAAM,EAAE,MAAM;KACjB,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QACvB,IACI,CAAC,IAAA,8BAAuB,EAAC,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,EACtF,CAAC;YACC,MAAM,IAAI,sBAAe,CAAC,IAAA,+CAAkC,EAAC,SAAS,CAAC,CAAC,CAAC;QAC7E,CAAC;QAED,MAAM,CAAC,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC;IAC9D,CAAC;IAED,iDAAiD;IAEjD,OAAO,MAAM,CAAC;AAClB,CAAC;~~AAjFD~~,~~kEAiFC~~"}
1	+ {"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user-permission/utils/validation.ts"],"names":[],"mappings":"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"}

package/dist/http/middleware/built-in/auth/module.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../../../src/http/middleware/built-in/auth/module.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EACW,MAAM,EAC5B,MAAM,QAAQ,CAAC;AA0BhB,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,~~QA4BpD~~"}
1	+ {"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../../../src/http/middleware/built-in/auth/module.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EACW,MAAM,EAC5B,MAAM,QAAQ,CAAC;AA0BhB,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,QAgCpD"}

package/dist/http/middleware/built-in/auth/module.js CHANGED Viewed

@@ -34,9 +34,14 @@ function registerAuthMiddleware(router) {
         let { authorization: headerValue } = request.headers;
         (0, utils_1.setRequestEnv)(request, 'ability', new core_1.AbilityManager());
         try {
-            const cookie = parseRequestAccessTokenCookie(request);
-            if (cookie) {
-                headerValue = (0, hapic_1.stringifyAuthorizationHeader)({ type: 'Bearer', token: cookie });
+            if (typeof headerValue === 'undefined') {
+                const cookie = parseRequestAccessTokenCookie(request);
+                if (cookie) {
+                    headerValue = (0, hapic_1.stringifyAuthorizationHeader)({
+                        type: 'Bearer',
+                        token: cookie,
+                    });
+                }
             }
             if (typeof headerValue !== 'string') {
                 next();

package/dist/http/middleware/built-in/auth/module.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../../src/http/middleware/built-in/auth/module.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,iCAA+E;AAC/E,uCAA+B;AAC/B,mCAAqC;AAKrC,iDAA6E;AAC7E,uCAA0D;AAC1D,yDAAoD;AACpD,+CAA+C;AAC/C,0CAA+C;AAC/C,qCAAqD;AAErD,SAAS,6BAA6B,CAAC,OAAgB;IACnD,OAAO,IAAA,yBAAgB,EAAC,OAAO,EAAE,iBAAU,CAAC,YAAY,CAAC,CAAC;AAC9D,CAAC;AAED,SAAS,YAAY,CAAC,GAAa;IAC/B,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;IAC3B,MAAM,aAAa,GAAsB,EAAE,CAAC;IAE5C,IAAI,MAAM,CAAC,GAAG,KAAK,mCAAe,CAAC,UAAU,EAAE,CAAC;QAC5C,aAAa,CAAC,MAAM,GAAG,IAAI,cAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC;IAC9D,CAAC;IAED,IAAA,4BAAmB,EAAC,GAAG,EAAE,iBAAU,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;IACjE,IAAA,4BAAmB,EAAC,GAAG,EAAE,iBAAU,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;IAClE,IAAA,4BAAmB,EAAC,GAAG,EAAE,iBAAU,CAAC,wBAAwB,EAAE,aAAa,CAAC,CAAC;AACjF,CAAC;AAED,SAAgB,sBAAsB,CAAC,MAAc;IACjD,MAAM,CAAC,GAAG,CAAC,IAAA,oBAAW,EAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;QACrD,IAAI,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;QAErD,IAAA,qBAAa,EAAC,OAAO,EAAE,SAAS,EAAE,IAAI,qBAAc,EAAE,CAAC,CAAC;QAExD,IAAI,CAAC;YACD,MAAM,MAAM,GAAG,6BAA6B,CAAC,OAAO,CAAC,CAAC;~~YAEtD~~,IAAI,MAAM,EAAE,CAAC;~~gBACT~~,WAAW,GAAG,IAAA,oCAA4B,EAAC,~~EAAE,~~IAAI,EAAE,QAAQ,~~EAAE,~~KAAK,EAAE,MAAM,~~EAAE~~,CAAC,CAAC;~~YAClF~~,CAAC;YAED,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;gBAClC,IAAI,EAAE,CAAC;gBACP,OAAO;YACX,CAAC;YAED,MAAM,MAAM,GAAG,IAAA,gCAAwB,EAAC,WAAW,CAAC,CAAC;YAErD,MAAM,IAAA,kCAAyB,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAEjD,IAAI,EAAE,CAAC;QACX,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,YAAY,CAAC,QAAQ,CAAC,CAAC;YACvB,IAAI,CAAC,CAAC,CAAC,CAAC;QACZ,CAAC;IACL,CAAC,CAAC,CAAC,CAAC;AACR,CAAC;~~AA5BD~~,~~wDA4BC~~"}
1	+ {"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../../src/http/middleware/built-in/auth/module.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,iCAA+E;AAC/E,uCAA+B;AAC/B,mCAAqC;AAKrC,iDAA6E;AAC7E,uCAA0D;AAC1D,yDAAoD;AACpD,+CAA+C;AAC/C,0CAA+C;AAC/C,qCAAqD;AAErD,SAAS,6BAA6B,CAAC,OAAgB;IACnD,OAAO,IAAA,yBAAgB,EAAC,OAAO,EAAE,iBAAU,CAAC,YAAY,CAAC,CAAC;AAC9D,CAAC;AAED,SAAS,YAAY,CAAC,GAAa;IAC/B,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;IAC3B,MAAM,aAAa,GAAsB,EAAE,CAAC;IAE5C,IAAI,MAAM,CAAC,GAAG,KAAK,mCAAe,CAAC,UAAU,EAAE,CAAC;QAC5C,aAAa,CAAC,MAAM,GAAG,IAAI,cAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC;IAC9D,CAAC;IAED,IAAA,4BAAmB,EAAC,GAAG,EAAE,iBAAU,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;IACjE,IAAA,4BAAmB,EAAC,GAAG,EAAE,iBAAU,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;IAClE,IAAA,4BAAmB,EAAC,GAAG,EAAE,iBAAU,CAAC,wBAAwB,EAAE,aAAa,CAAC,CAAC;AACjF,CAAC;AAED,SAAgB,sBAAsB,CAAC,MAAc;IACjD,MAAM,CAAC,GAAG,CAAC,IAAA,oBAAW,EAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;QACrD,IAAI,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;QAErD,IAAA,qBAAa,EAAC,OAAO,EAAE,SAAS,EAAE,IAAI,qBAAc,EAAE,CAAC,CAAC;QAExD,IAAI,CAAC;YACD,IAAI,OAAO,WAAW,KAAK,WAAW,EAAE,CAAC;gBACrC,MAAM,MAAM,GAAG,6BAA6B,CAAC,OAAO,CAAC,CAAC;gBACtD,IAAI,MAAM,EAAE,CAAC;oBACT,WAAW,GAAG,IAAA,oCAA4B,EAAC;wBACvC,IAAI,EAAE,QAAQ;wBACd,KAAK,EAAE,MAAM;qBAChB,CAAC,CAAC;gBACP,CAAC;YACL,CAAC;YAED,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;gBAClC,IAAI,EAAE,CAAC;gBACP,OAAO;YACX,CAAC;YAED,MAAM,MAAM,GAAG,IAAA,gCAAwB,EAAC,WAAW,CAAC,CAAC;YAErD,MAAM,IAAA,kCAAyB,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAEjD,IAAI,EAAE,CAAC;QACX,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,YAAY,CAAC,QAAQ,CAAC,CAAC;YACvB,IAAI,CAAC,CAAC,CAAC,CAAC;QACZ,CAAC;IACL,CAAC,CAAC,CAAC,CAAC;AACR,CAAC;AAhCD,wDAgCC"}

package/dist/http/middleware/built-in/auth/verify.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"verify.d.ts","sourceRoot":"","sources":["../../../../../src/http/middleware/built-in/auth/verify.ts"],"names":[],"mappings":"~~AAeA~~,OAAO,KAAK,EACR,mBAAmB,EAGtB,MAAM,OAAO,CAAC;AAKf,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;~~AAqItC~~,wBAAsB,yBAAyB,CAC3C,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,mBAAmB,GAC3B,OAAO,CAAC,IAAI,CAAC,CAShB"}
1	+ {"version":3,"file":"verify.d.ts","sourceRoot":"","sources":["../../../../../src/http/middleware/built-in/auth/verify.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EACR,mBAAmB,EAGtB,MAAM,OAAO,CAAC;AAKf,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAoItC,wBAAsB,yBAAyB,CAC3C,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,mBAAmB,GAC3B,OAAO,CAAC,IAAI,CAAC,CAShB"}

package/dist/http/middleware/built-in/auth/verify.js CHANGED Viewed

@@ -63,42 +63,42 @@ async function verifyBasicAuthorizationHeader(request, header) {
     let permissions = [];
     const config = (0, config_1.useConfig)();
     const dataSource = await (0, typeorm_extension_1.useDataSource)();
-    const userRepository = new domains_1.UserRepository(dataSource);
-    const user = await userRepository.verifyCredentials(header.username, header.password);
-    if (user) {
-        await userRepository.appendAttributes(user);
-        // allow authentication but not authorization with basic auth in production!
-        if (config.env !== typeorm_extension_1.EnvironmentName.PRODUCTION) {
+    if (config.userAuthBasic) {
+        const userRepository = new domains_1.UserRepository(dataSource);
+        const user = await userRepository.verifyCredentials(header.username, header.password);
+        if (user) {
+            await userRepository.appendAttributes(user);
             permissions = await userRepository.getOwnedPermissions(user.id);
+            (0, utils_1.setRequestEnv)(request, 'ability', new core_1.AbilityManager(permissions));
+            (0, utils_1.setRequestEnv)(request, 'scopes', [core_1.ScopeName.GLOBAL]);
+            (0, utils_1.setRequestEnv)(request, 'user', user);
+            (0, utils_1.setRequestEnv)(request, 'userId', user.id);
+            (0, utils_1.setRequestEnv)(request, 'realm', user.realm);
+            return;
         }
-        (0, utils_1.setRequestEnv)(request, 'ability', new core_1.AbilityManager(permissions));
-        (0, utils_1.setRequestEnv)(request, 'scopes', [core_1.ScopeName.GLOBAL]);
-        (0, utils_1.setRequestEnv)(request, 'user', user);
-        (0, utils_1.setRequestEnv)(request, 'userId', user.id);
-        (0, utils_1.setRequestEnv)(request, 'realm', user.realm);
-        return;
     }
-    const robotRepository = new domains_1.RobotRepository(dataSource);
-    const robot = await robotRepository.verifyCredentials(header.username, header.password);
-    if (robot) {
-        // allow authentication but not authorization with basic auth in production!
-        if (config.env !== typeorm_extension_1.EnvironmentName.PRODUCTION) {
+    if (config.robotAuthBasic) {
+        const robotRepository = new domains_1.RobotRepository(dataSource);
+        const robot = await robotRepository.verifyCredentials(header.username, header.password);
+        if (robot) {
             permissions = await robotRepository.getOwnedPermissions(robot.id);
+            (0, utils_1.setRequestEnv)(request, 'ability', new core_1.AbilityManager(permissions));
+            (0, utils_1.setRequestEnv)(request, 'scopes', [core_1.ScopeName.GLOBAL]);
+            (0, utils_1.setRequestEnv)(request, 'robot', robot);
+            (0, utils_1.setRequestEnv)(request, 'robotId', robot.id);
+            (0, utils_1.setRequestEnv)(request, 'realm', robot.realm);
         }
-        (0, utils_1.setRequestEnv)(request, 'ability', new core_1.AbilityManager(permissions));
-        (0, utils_1.setRequestEnv)(request, 'scopes', [core_1.ScopeName.GLOBAL]);
-        (0, utils_1.setRequestEnv)(request, 'robot', robot);
-        (0, utils_1.setRequestEnv)(request, 'robotId', robot.id);
-        (0, utils_1.setRequestEnv)(request, 'realm', robot.realm);
     }
-    const oauth2ClientRepository = new domains_1.OAuth2ClientRepository(dataSource);
-    const oauth2Client = await oauth2ClientRepository.verifyCredentials(header.username, header.password);
-    if (oauth2Client) {
-        (0, utils_1.setRequestEnv)(request, 'ability', new core_1.AbilityManager());
-        (0, utils_1.setRequestEnv)(request, 'scopes', [core_1.ScopeName.GLOBAL]);
-        (0, utils_1.setRequestEnv)(request, 'client', oauth2Client);
-        (0, utils_1.setRequestEnv)(request, 'clientId', oauth2Client.id);
-        (0, utils_1.setRequestEnv)(request, 'realm', oauth2Client.realm);
+    if (config.clientAuthBasic) {
+        const clientRepository = new domains_1.ClientRepository(dataSource);
+        const oauth2Client = await clientRepository.verifyCredentials(header.username, header.password);
+        if (oauth2Client) {
+            (0, utils_1.setRequestEnv)(request, 'ability', new core_1.AbilityManager());
+            (0, utils_1.setRequestEnv)(request, 'scopes', [core_1.ScopeName.GLOBAL]);
+            (0, utils_1.setRequestEnv)(request, 'client', oauth2Client);
+            (0, utils_1.setRequestEnv)(request, 'clientId', oauth2Client.id);
+            (0, utils_1.setRequestEnv)(request, 'realm', oauth2Client.realm);
+        }
     }
 }
 async function verifyAuthorizationHeader(request, header) {

package/dist/http/middleware/built-in/auth/verify.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"verify.js","sourceRoot":"","sources":["../../../../../src/http/middleware/built-in/auth/verify.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,~~uCAMsB~~;AAMtB,iCAEe;AACf,qDAA+C;AAE/C,~~yDAAmE~~;~~AACnE~~,+CAA+C;AAC/C,mDAAmD;AAOnD,iDAK6B;AAC7B,4CAIyB;AACzB,0CAA+C;AAE/C,KAAK,UAAU,+BAA+B,CAC1C,OAAgB,EAChB,MAAiC;IAEjC,MAAM,OAAO,GAAG,MAAM,IAAA,+BAAsB,EAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC3D,IAAI,OAAO,CAAC,IAAI,KAAK,sBAAe,CAAC,MAAM,EAAE,CAAC;QAC1C,MAAM,iBAAU,CAAC,mBAAmB,EAAE,CAAC;IAC3C,CAAC;IAED,IAAA,qBAAa,EAAC,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9C,IAAA,qBAAa,EAAC,OAAO,EAAE,QAAQ,EAAE,IAAA,kCAA2B,EAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;IAE7E,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,eAAe,GAAG,UAAU,CAAC,aAAa,CAAC,qBAAW,CAAC,CAAC;IAC9D,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC;QACxC,KAAK,EAAE;YACH,EAAE,EAAE,OAAO,CAAC,QAAQ;SACvB;QACD,KAAK,EAAE;YACH,EAAE,EAAE,IAAA,8BAAY,EAAC;gBACb,MAAM,EAAE,sBAAW,CAAC,KAAK;gBACzB,EAAE,EAAE,OAAO,CAAC,QAAQ;aACvB,CAAC;YACF,YAAY,EAAE,MAAM;SACvB;KACJ,CAAC,CAAC;IACH,IAAA,qBAAa,EAAC,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IAEvC,MAAM,GAAG,GAAG,MAAM,IAAA,4BAAmB,EAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IACpF,MAAM,WAAW,GAAG,MAAM,IAAA,iCAAwB,EAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IAEjG,IAAA,qBAAa,EAAC,OAAO,EAAE,SAAS,EAAE,IAAI,qBAAc,CAAC,WAAW,CAAC,CAAC,CAAC;IAEnE,QAAQ,OAAO,CAAC,QAAQ,EAAE,CAAC;QACvB,KAAK,oBAAa,CAAC,MAAM,CAAC,CAAC,CAAC;YACxB,IAAA,qBAAa,EAAC,OAAO,EAAE,QAAQ,EAAE,GAAmB,CAAC,CAAC;YACtD,IAAA,qBAAa,EAAC,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;YAChD,MAAM;QACV,CAAC;QACD,KAAK,oBAAa,CAAC,IAAI,CAAC,CAAC,CAAC;YACtB,IAAA,qBAAa,EAAC,OAAO,EAAE,MAAM,EAAE,GAAiB,CAAC,CAAC;YAClD,IAAA,qBAAa,EAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;YAC9C,MAAM;QACV,CAAC;QACD,KAAK,oBAAa,CAAC,KAAK,CAAC,CAAC,CAAC;YACvB,IAAA,qBAAa,EAAC,OAAO,EAAE,OAAO,EAAE,GAAkB,CAAC,CAAC;YACpD,IAAA,qBAAa,EAAC,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;YAC/C,MAAM;QACV,CAAC;IACL,CAAC;AACL,CAAC;AAED,KAAK,UAAU,8BAA8B,CACzC,OAAgB,EAChB,MAAgC;IAEhC,IAAI,WAAW,~~GAAyB~~,EAAE,CAAC;~~IAE3C~~,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;IAC3B,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IAEzC,MAAM,cAAc,GAAG,IAAI,wBAAc,CAAC,UAAU,CAAC,CAAC;~~IACtD~~,MAAM,IAAI,GAAG,MAAM,cAAc,CAAC,iBAAiB,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;~~IAEtF~~,IAAI,IAAI,EAAE,CAAC;~~QACP~~,MAAM,cAAc,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;~~QAE5C~~,~~4EAA4E;QAC5E,IAAI,MAAM,CAAC,GAAG,KAAK,mCAAe,CAAC,UAAU,EAAE,CAAC;YAC5C,~~WAAW,GAAG,MAAM,cAAc,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;~~QACpE~~,~~CAAC;QAED,~~IAAA,qBAAa,EAAC,OAAO,EAAE,SAAS,EAAE,IAAI,qBAAc,CAAC,WAAW,CAAC,CAAC,CAAC;~~QACnE~~,IAAA,qBAAa,EAAC,OAAO,EAAE,QAAQ,EAAE,CAAC,gBAAS,CAAC,MAAM,CAAC,CAAC,CAAC;~~QAErD~~,IAAA,qBAAa,EAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;~~QACrC~~,IAAA,qBAAa,EAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;~~QAC1C~~,IAAA,qBAAa,EAAC,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;~~QAE5C~~,OAAO;~~IACX~~,CAAC;IAED,MAAM,eAAe,GAAG,IAAI,yBAAe,CAAC,UAAU,CAAC,CAAC;~~IACxD~~,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,iBAAiB,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;~~IACxF~~,IAAI,KAAK,EAAE,CAAC;~~QACR~~,~~4EAA4E;QAC5E,IAAI,MAAM,CAAC,GAAG,KAAK,mCAAe,CAAC,UAAU,EAAE,CAAC;YAC5C,~~WAAW,GAAG,MAAM,eAAe,CAAC,mBAAmB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;~~QACtE~~,~~CAAC;QAED,~~IAAA,qBAAa,EAAC,OAAO,EAAE,SAAS,EAAE,IAAI,qBAAc,CAAC,WAAW,CAAC,CAAC,CAAC;~~QACnE~~,IAAA,qBAAa,EAAC,OAAO,EAAE,QAAQ,EAAE,CAAC,gBAAS,CAAC,MAAM,CAAC,CAAC,CAAC;~~QAErD~~,IAAA,qBAAa,EAAC,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;~~QACvC~~,IAAA,qBAAa,EAAC,OAAO,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;~~QAC5C~~,IAAA,qBAAa,EAAC,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;~~IACjD~~,CAAC;IAED,MAAM,~~sBAAsB~~,GAAG,IAAI,~~gCAAsB~~,CAAC,UAAU,CAAC,CAAC;~~IACtE~~,MAAM,YAAY,GAAG,MAAM,~~sBAAsB~~,CAAC,iBAAiB,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;~~IACtG~~,IAAI,YAAY,EAAE,CAAC;~~QACf~~,IAAA,qBAAa,EAAC,OAAO,EAAE,SAAS,EAAE,IAAI,qBAAc,EAAE,CAAC,CAAC;~~QACxD~~,IAAA,qBAAa,EAAC,OAAO,EAAE,QAAQ,EAAE,CAAC,gBAAS,CAAC,MAAM,CAAC,CAAC,CAAC;~~QAErD~~,IAAA,qBAAa,EAAC,OAAO,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC;~~QAC~~/C,IAAA,qBAAa,EAAC,OAAO,EAAE,UAAU,EAAE,YAAY,CAAC,EAAE,CAAC,CAAC;~~QACpD~~,IAAA,qBAAa,EAAC,OAAO,EAAE,OAAO,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC;~~IACxD~~,CAAC;AACL,CAAC;AAEM,KAAK,UAAU,yBAAyB,CAC3C,OAAgB,EAChB,MAA2B;IAE3B,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,+BAAuB,CAAC,MAAM;YAC/B,OAAO,+BAA+B,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC5D,KAAK,+BAAuB,CAAC,KAAK;YAC9B,OAAO,8BAA8B,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC/D,CAAC;IAED,MAAM,kBAAW,CAAC,qBAAqB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AACzD,CAAC;AAZD,8DAYC"}
1	+ {"version":3,"file":"verify.js","sourceRoot":"","sources":["../../../../../src/http/middleware/built-in/auth/verify.ts"],"names":[],"mappings":"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"}

package/dist/http/middleware/built-in/rate-limit.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"rate-limit.d.ts","sourceRoot":"","sources":["../../../../src/http/middleware/built-in/rate-limit.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvD,OAAO,KAAK,EAAW,MAAM,EAAE,MAAM,QAAQ,CAAC;~~AAI9C~~,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,YAAY,~~QAmC~~/E"}
1	+ {"version":3,"file":"rate-limit.d.ts","sourceRoot":"","sources":["../../../../src/http/middleware/built-in/rate-limit.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvD,OAAO,KAAK,EAAW,MAAM,EAAE,MAAM,QAAQ,CAAC;AAK9C,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,YAAY,QAoC/E"}

package/dist/http/middleware/built-in/rate-limit.js CHANGED Viewed

@@ -10,15 +10,17 @@ exports.registerRateLimitMiddleware = void 0;
 const core_1 = require("@authup/core");
 const rate_limit_1 = require("@routup/rate-limit");
 const smob_1 = require("smob");
+const config_1 = require("../../../config");
 const utils_1 = require("../../utils");
 function registerRateLimitMiddleware(router, input) {
+    const config = (0, config_1.useConfig)();
     let options = {
         skip(req) {
             const robot = (0, utils_1.useRequestEnv)(req, 'robot');
             if (robot) {
                 const { name } = (0, utils_1.useRequestEnv)(req, 'realm');
                 if (name === core_1.REALM_MASTER_NAME &&
-                    robot.name === core_1.ROBOT_SYSTEM_NAME) {
+                    robot.name === config.robotAdminName) {
                     return true;
                 }
             }

package/dist/http/middleware/built-in/rate-limit.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"rate-limit.js","sourceRoot":"","sources":["../../../../src/http/middleware/built-in/rate-limit.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,~~uCAAoE~~;~~AAEpE~~,mDAA+C;AAE/C,+BAA6B;AAC7B,uCAA4C;AAE5C,SAAgB,2BAA2B,CAAC,MAAc,EAAE,KAAoB;IAC5E,IAAI,OAAO,GAAkB;QACzB,IAAI,CAAC,GAAY;YACb,MAAM,KAAK,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YAC1C,IAAI,KAAK,EAAE,CAAC;gBACR,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;gBAE7C,IACI,IAAI,KAAK,wBAAiB;oBAC1B,KAAK,CAAC,IAAI,KAAK,~~wBAAiB~~,~~EAClC~~,CAAC;oBACC,OAAO,IAAI,CAAC;gBAChB,CAAC;YACL,CAAC;YAED,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,GAAG,CAAC,GAAY;YACZ,IAAI,IAAA,qBAAa,EAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC;gBAC/B,OAAO,EAAE,GAAG,GAAG,CAAC,CAAC,iBAAiB;YACtC,CAAC;YAED,MAAM,KAAK,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YAC1C,IAAI,KAAK,EAAE,CAAC;gBACR,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC,kBAAkB;YACxC,CAAC;YAED,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,gBAAgB;QACpC,CAAC;QACD,QAAQ,EAAE,EAAE,GAAG,IAAI,EAAE,SAAS;KACjC,CAAC;IAEF,OAAO,GAAG,IAAA,YAAK,EAAC,KAAK,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;IAEtC,MAAM,CAAC,GAAG,CAAC,IAAA,sBAAS,EAAC,OAAO,CAAC,CAAC,CAAC;AACnC,CAAC;~~AAnCD~~,~~kEAmCC~~"}
1	+ {"version":3,"file":"rate-limit.js","sourceRoot":"","sources":["../../../../src/http/middleware/built-in/rate-limit.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,uCAAiD;AAEjD,mDAA+C;AAE/C,+BAA6B;AAC7B,4CAA4C;AAC5C,uCAA4C;AAE5C,SAAgB,2BAA2B,CAAC,MAAc,EAAE,KAAoB;IAC5E,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;IAC3B,IAAI,OAAO,GAAkB;QACzB,IAAI,CAAC,GAAY;YACb,MAAM,KAAK,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YAC1C,IAAI,KAAK,EAAE,CAAC;gBACR,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;gBAE7C,IACI,IAAI,KAAK,wBAAiB;oBAC1B,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC,cAAc,EACtC,CAAC;oBACC,OAAO,IAAI,CAAC;gBAChB,CAAC;YACL,CAAC;YAED,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,GAAG,CAAC,GAAY;YACZ,IAAI,IAAA,qBAAa,EAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC;gBAC/B,OAAO,EAAE,GAAG,GAAG,CAAC,CAAC,iBAAiB;YACtC,CAAC;YAED,MAAM,KAAK,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YAC1C,IAAI,KAAK,EAAE,CAAC;gBACR,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC,kBAAkB;YACxC,CAAC;YAED,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,gBAAgB;QACpC,CAAC;QACD,QAAQ,EAAE,EAAE,GAAG,IAAI,EAAE,SAAS;KACjC,CAAC;IAEF,OAAO,GAAG,IAAA,YAAK,EAAC,KAAK,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;IAEtC,MAAM,CAAC,GAAG,CAAC,IAAA,sBAAS,EAAC,OAAO,CAAC,CAAC,CAAC;AACnC,CAAC;AApCD,kEAoCC"}

package/dist/http/oauth2/grant-types/abstract.js CHANGED Viewed

@@ -34,7 +34,7 @@ class AbstractGrant {
     async issueRefreshToken(accessToken) {
         const dataSource = await (0, typeorm_extension_1.useDataSource)();
         const repository = dataSource.getRepository(domains_1.OAuth2RefreshTokenEntity);
-        const token = repository.create((0, token_1.transformToRefreshTokenEntity)(accessToken, this.config.tokenMaxAgeRefreshToken));
+        const token = repository.create((0, token_1.transformToRefreshTokenEntity)(accessToken, this.config.tokenAccessMaxAge));
         await repository.insert(token);
         await this.refreshTokenCache.set(token);
         return (0, token_1.transformToRefreshTokenPayload)(accessToken, {

package/dist/http/oauth2/grant-types/abstract.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"abstract.js","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/abstract.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,yDAAkD;AAClD,8CAA4D;AAE5D,4CAA4C;AAC5C,oCAIkB;AAClB,oCAAmD;AAGnD,MAAsB,aAAa;IAK/B,wDAAwD;IAExD;QACI,IAAI,CAAC,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;QAE1B,IAAI,CAAC,iBAAiB,GAAG,IAAI,+BAAuB,EAAE,CAAC;IAC3D,CAAC;IAED,wDAAwD;IAE9C,KAAK,CAAC,gBAAgB,CAAC,OAAgC;QAC7D,OAAO,IAAA,qCAA6B,EAAC;YACjC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS;YAC7B,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,QAAQ,EAAE,OAAO,CAAC,QAAQ;SAC7B,CAAC,CAAC;IACP,CAAC;IAES,KAAK,CAAC,iBAAiB,CAAC,WAAwC;QACtE,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;QACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,kCAAwB,CAAC,CAAC;QAEtE,MAAM,KAAK,GAAG,UAAU,CAAC,MAAM,CAC3B,IAAA,qCAA6B,EACzB,WAAW,EACX,IAAI,CAAC,MAAM,CAAC,~~uBAAuB~~,~~CACtC~~,CACJ,CAAC;QAEF,MAAM,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAE/B,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAExC,OAAO,IAAA,sCAA8B,EAAC,WAAW,EAAE;YAC/C,EAAE,EAAE,KAAK,CAAC,EAAE;SACf,CAAC,CAAC;IACP,CAAC;CACJ;AA/CD,sCA+CC"}
1	+ {"version":3,"file":"abstract.js","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/abstract.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,yDAAkD;AAClD,8CAA4D;AAE5D,4CAA4C;AAC5C,oCAIkB;AAClB,oCAAmD;AAGnD,MAAsB,aAAa;IAK/B,wDAAwD;IAExD;QACI,IAAI,CAAC,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;QAE1B,IAAI,CAAC,iBAAiB,GAAG,IAAI,+BAAuB,EAAE,CAAC;IAC3D,CAAC;IAED,wDAAwD;IAE9C,KAAK,CAAC,gBAAgB,CAAC,OAAgC;QAC7D,OAAO,IAAA,qCAA6B,EAAC;YACjC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS;YAC7B,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,QAAQ,EAAE,OAAO,CAAC,QAAQ;SAC7B,CAAC,CAAC;IACP,CAAC;IAES,KAAK,CAAC,iBAAiB,CAAC,WAAwC;QACtE,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;QACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,kCAAwB,CAAC,CAAC;QAEtE,MAAM,KAAK,GAAG,UAAU,CAAC,MAAM,CAC3B,IAAA,qCAA6B,EACzB,WAAW,EACX,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAChC,CACJ,CAAC;QAEF,MAAM,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAE/B,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAExC,OAAO,IAAA,sCAA8B,EAAC,WAAW,EAAE;YAC/C,EAAE,EAAE,KAAK,CAAC,EAAE;SACf,CAAC,CAAC;IACP,CAAC;CACJ;AA/CD,sCA+CC"}

package/dist/http/oauth2/grant-types/authorize.js CHANGED Viewed

@@ -30,9 +30,9 @@ class AuthorizeGrantType extends abstract_1.AbstractGrant {
         const refreshToken = await this.issueRefreshToken(accessToken);
         const buildContext = {
             accessToken,
-            accessTokenMaxAge: this.config.tokenMaxAgeAccessToken,
+            accessTokenMaxAge: this.config.tokenRefreshMaxAge,
             refreshToken,
-            refreshTokenMaxAge: this.config.tokenMaxAgeRefreshToken,
+            refreshTokenMaxAge: this.config.tokenAccessMaxAge,
         };
         if ((0, core_1.hasOAuth2OpenIDScope)(authorizationCode.scope)) {
             buildContext.idToken = authorizationCode.id_token;

package/dist/http/oauth2/grant-types/authorize.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"authorize.js","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/authorize.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,uCAEsB;AACtB,6CAAoD;AACpD,+CAAsD;AACtD,yDAAkD;AAElD,mCAAsC;AACtC,8CAAiE;AACjE,yCAA2C;AAG3C,0CAA6D;AAE7D,MAAa,kBAAmB,SAAQ,wBAAa;IACjD,KAAK,CAAC,GAAG,CAAC,OAAgB;QACtB,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAEvD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC;YAC5C,aAAa,EAAE,IAAA,qBAAY,EAAC,OAAO,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;YAC1D,GAAG,EAAE,iBAAiB,CAAC,OAAO;YAC9B,OAAO,EAAE,oBAAa,CAAC,IAAI;YAC3B,OAAO,EAAE,iBAAiB,CAAC,KAAK,CAAC,EAAE;YACnC,SAAS,EAAE,iBAAiB,CAAC,KAAK,CAAC,IAAI;YACvC,KAAK,EAAE,iBAAiB,CAAC,KAAK;YAC9B,QAAQ,EAAE,iBAAiB,CAAC,SAAS;SACxC,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;QAC/D,MAAM,YAAY,GAAsC;YACpD,WAAW;YACX,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,~~sBAAsB~~;~~YACrD~~,YAAY;YACZ,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,~~uBAAuB~~;~~SAC1D~~,CAAC;QAEF,IAAI,IAAA,2BAAoB,EAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC;YAChD,YAAY,CAAC,OAAO,GAAG,iBAAiB,CAAC,QAAQ,CAAC;QACtD,CAAC;QAED,OAAO,IAAA,yCAA8B,EAAC,YAAY,CAAC,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAAgB;QAC3B,MAAM,IAAI,GAAG,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;QAEhD,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;QACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,uCAA6B,CAAC,CAAC;QAE3E,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;YACpC,KAAK,EAAE;gBACH,OAAO,EAAE,IAAI;aAChB;YACD,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;SAC/B,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,iBAAU,CAAC,YAAY,EAAE,CAAC;QACpC,CAAC;QAED,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;YACtB,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;YAEjD,IAAI,CAAC,WAAW,IAAI,MAAM,CAAC,YAAY,KAAK,WAAW,EAAE,CAAC;gBACtD,MAAM,iBAAU,CAAC,mBAAmB,EAAE,CAAC;YAC3C,CAAC;QACL,CAAC;QAED,MAAM,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAEhC,OAAO,MAAM,CAAC;IAClB,CAAC;IAES,oBAAoB,CAAC,OAAgB;QAC3C,IAAI,IAAI,GAAG,IAAA,qBAAc,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAE3C,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,IAAI,GAAG,IAAA,uBAAe,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC5C,CAAC;QAED,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YACpC,MAAM,iBAAU,CAAC,cAAc,EAAE,CAAC;QACtC,CAAC;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IAES,cAAc,CAAC,OAAgB;QACrC,IAAI,WAAW,GAAG,IAAA,qBAAc,EAAC,OAAO,EAAE,cAAc,CAAC,CAAC;QAE1D,IAAI,CAAC,WAAW,EAAE,CAAC;YACf,WAAW,GAAG,IAAA,uBAAe,EAAC,OAAO,EAAE,cAAc,CAAC,CAAC;QAC3D,CAAC;QAED,IAAI,CAAC,WAAW,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;YAClD,MAAM,iBAAU,CAAC,mBAAmB,EAAE,CAAC;QAC3C,CAAC;QAED,OAAO,WAAW,CAAC;IACvB,CAAC;CACJ;AAtFD,gDAsFC"}
1	+ {"version":3,"file":"authorize.js","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/authorize.ts"],"names":[],"mappings":"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"}

package/dist/http/oauth2/grant-types/client-credentials.js CHANGED Viewed

@@ -31,9 +31,9 @@ class ClientCredentialsGrant extends abstract_1.AbstractGrant {
         const refreshToken = await this.issueRefreshToken(accessToken);
         return (0, response_1.buildOAuth2BearerTokenResponse)({
             accessToken,
-            accessTokenMaxAge: this.config.tokenMaxAgeAccessToken,
+            accessTokenMaxAge: this.config.tokenRefreshMaxAge,
             refreshToken,
-            refreshTokenMaxAge: this.config.tokenMaxAgeRefreshToken,
+            refreshTokenMaxAge: this.config.tokenAccessMaxAge,
         });
     }
     async validate(request) {

package/dist/http/oauth2/grant-types/client-credentials.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"client-credentials.js","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/client-credentials.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,uCAEsB;AACtB,6CAAoD;AACpD,+CAAsD;AACtD,iCAA0E;AAE1E,mCAAsC;AACtC,yDAAkD;AAClD,8CAAgD;AAChD,yCAA2C;AAE3C,0CAA6D;AAE7D,MAAa,sBAAuB,SAAQ,wBAAa;IACrD,KAAK,CAAC,GAAG,CAAC,OAAgB;QACtB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAE5C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC;YAC5C,aAAa,EAAE,IAAA,qBAAY,EAAC,OAAO,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;YAC1D,KAAK,EAAE,gBAAS,CAAC,MAAM;YACvB,GAAG,EAAE,MAAM,CAAC,EAAE;YACd,OAAO,EAAE,oBAAa,CAAC,MAAM;YAC7B,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE;YACxB,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI;YAC5B,QAAQ,EAAE,MAAM,CAAC,EAAE;SACtB,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;QAE/D,OAAO,IAAA,yCAA8B,EAAC;YAClC,WAAW;YACX,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,~~sBAAsB~~;~~YACrD~~,YAAY;YACZ,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,~~uBAAuB~~;~~SAC1D~~,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAAgB;QAC3B,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;QAExD,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;QACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,sBAAY,CAAC,CAAC;QAE1D,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;YACpC,KAAK,EAAE;gBACH,EAAE;gBACF,MAAM;aACT;YACD,SAAS,EAAE,CAAC,OAAO,CAAC;SACvB,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,gBAAS,CAAC,kBAAkB,EAAE,CAAC;QACzC,CAAC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;IAES,oBAAoB,CAAC,OAAgB;QAC3C,IAAI,QAAQ,GAAG,IAAA,qBAAc,EAAC,OAAO,EAAE,WAAW,CAAC,IAAI,IAAA,uBAAe,EAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QAC7F,IAAI,YAAY,GAAG,IAAA,qBAAc,EAAC,OAAO,EAAE,eAAe,CAAC,IAAI,IAAA,uBAAe,EAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QAEzG,IAAI,CAAC,QAAQ,IAAI,CAAC,YAAY,EAAE,CAAC;YAC7B,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;YAEvD,MAAM,MAAM,GAAG,IAAA,gCAAwB,EAAC,WAAW,CAAC,CAAC;YAErD,IAAI,MAAM,CAAC,IAAI,KAAK,+BAAuB,CAAC,KAAK,EAAE,CAAC;gBAChD,MAAM,iBAAU,CAAC,cAAc,EAAE,CAAC;YACtC,CAAC;YAED,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;YAC3B,YAAY,GAAG,MAAM,CAAC,QAAQ,CAAC;QACnC,CAAC;QAED,OAAO,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;IACpC,CAAC;CACJ;AAhED,wDAgEC"}
1	+ {"version":3,"file":"client-credentials.js","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/client-credentials.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,uCAEsB;AACtB,6CAAoD;AACpD,+CAAsD;AACtD,iCAA0E;AAE1E,mCAAsC;AACtC,yDAAkD;AAClD,8CAAgD;AAChD,yCAA2C;AAE3C,0CAA6D;AAE7D,MAAa,sBAAuB,SAAQ,wBAAa;IACrD,KAAK,CAAC,GAAG,CAAC,OAAgB;QACtB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAE5C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC;YAC5C,aAAa,EAAE,IAAA,qBAAY,EAAC,OAAO,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;YAC1D,KAAK,EAAE,gBAAS,CAAC,MAAM;YACvB,GAAG,EAAE,MAAM,CAAC,EAAE;YACd,OAAO,EAAE,oBAAa,CAAC,MAAM;YAC7B,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE;YACxB,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI;YAC5B,QAAQ,EAAE,MAAM,CAAC,EAAE;SACtB,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;QAE/D,OAAO,IAAA,yCAA8B,EAAC;YAClC,WAAW;YACX,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,kBAAkB;YACjD,YAAY;YACZ,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,iBAAiB;SACpD,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAAgB;QAC3B,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;QAExD,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;QACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,sBAAY,CAAC,CAAC;QAE1D,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;YACpC,KAAK,EAAE;gBACH,EAAE;gBACF,MAAM;aACT;YACD,SAAS,EAAE,CAAC,OAAO,CAAC;SACvB,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,gBAAS,CAAC,kBAAkB,EAAE,CAAC;QACzC,CAAC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;IAES,oBAAoB,CAAC,OAAgB;QAC3C,IAAI,QAAQ,GAAG,IAAA,qBAAc,EAAC,OAAO,EAAE,WAAW,CAAC,IAAI,IAAA,uBAAe,EAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QAC7F,IAAI,YAAY,GAAG,IAAA,qBAAc,EAAC,OAAO,EAAE,eAAe,CAAC,IAAI,IAAA,uBAAe,EAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QAEzG,IAAI,CAAC,QAAQ,IAAI,CAAC,YAAY,EAAE,CAAC;YAC7B,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;YAEvD,MAAM,MAAM,GAAG,IAAA,gCAAwB,EAAC,WAAW,CAAC,CAAC;YAErD,IAAI,MAAM,CAAC,IAAI,KAAK,+BAAuB,CAAC,KAAK,EAAE,CAAC;gBAChD,MAAM,iBAAU,CAAC,cAAc,EAAE,CAAC;YACtC,CAAC;YAED,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;YAC3B,YAAY,GAAG,MAAM,CAAC,QAAQ,CAAC;QACnC,CAAC;QAED,OAAO,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;IACpC,CAAC;CACJ;AAhED,wDAgEC"}

package/dist/http/oauth2/grant-types/internal.js CHANGED Viewed

@@ -26,9 +26,9 @@ class InternalGrantType extends abstract_1.AbstractGrant {
         const refreshToken = await this.issueRefreshToken(accessToken);
         return (0, response_1.buildOAuth2BearerTokenResponse)({
             accessToken,
-            accessTokenMaxAge: this.config.tokenMaxAgeAccessToken,
+            accessTokenMaxAge: this.config.tokenRefreshMaxAge,
             refreshToken,
-            refreshTokenMaxAge: this.config.tokenMaxAgeRefreshToken,
+            refreshTokenMaxAge: this.config.tokenAccessMaxAge,
         });
     }
 }

package/dist/http/oauth2/grant-types/internal.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"internal.js","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/internal.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,uCAEsB;AAEtB,mCAAsC;AACtC,uCAA4C;AAC5C,yCAA2C;AAI3C,0CAA6D;AAE7D,MAAa,iBAAkB,SAAQ,wBAAa;IAChD,KAAK,CAAC,GAAG,CAAC,OAAgB;QACtB,MAAM,KAAK,GAAG,IAAA,qBAAa,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC9C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC;YAC5C,aAAa,EAAE,IAAA,qBAAY,EAAC,OAAO,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;YAC1D,KAAK,EAAE,gBAAS,CAAC,MAAM;YACvB,OAAO,EAAE,KAAK,CAAC,EAAE;YACjB,SAAS,EAAE,KAAK,CAAC,IAAI;YACrB,GAAG,EAAE,IAAA,qBAAa,EAAC,OAAO,EAAE,QAAQ,CAAe;YACnD,OAAO,EAAE,oBAAa,CAAC,IAAI;SAC9B,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;QAE/D,OAAO,IAAA,yCAA8B,EAAC;YAClC,WAAW;YACX,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,~~sBAAsB~~;~~YACrD~~,YAAY;YACZ,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,~~uBAAuB~~;~~SAC1D~~,CAAC,CAAC;IACP,CAAC;CACJ;AArBD,8CAqBC"}
1	+ {"version":3,"file":"internal.js","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/internal.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,uCAEsB;AAEtB,mCAAsC;AACtC,uCAA4C;AAC5C,yCAA2C;AAI3C,0CAA6D;AAE7D,MAAa,iBAAkB,SAAQ,wBAAa;IAChD,KAAK,CAAC,GAAG,CAAC,OAAgB;QACtB,MAAM,KAAK,GAAG,IAAA,qBAAa,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC9C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC;YAC5C,aAAa,EAAE,IAAA,qBAAY,EAAC,OAAO,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;YAC1D,KAAK,EAAE,gBAAS,CAAC,MAAM;YACvB,OAAO,EAAE,KAAK,CAAC,EAAE;YACjB,SAAS,EAAE,KAAK,CAAC,IAAI;YACrB,GAAG,EAAE,IAAA,qBAAa,EAAC,OAAO,EAAE,QAAQ,CAAe;YACnD,OAAO,EAAE,oBAAa,CAAC,IAAI;SAC9B,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;QAE/D,OAAO,IAAA,yCAA8B,EAAC;YAClC,WAAW;YACX,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,kBAAkB;YACjD,YAAY;YACZ,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,iBAAiB;SACpD,CAAC,CAAC;IACP,CAAC;CACJ;AArBD,8CAqBC"}