@authup/server-core 1.0.0-beta.21 → 1.0.0-beta.22

package/dist/http/controllers/user-permission/handlers/create.js

@@ -11,7 +11,7 @@ const core_kit_1 = require("@authup/core-kit");
 const routup_1 = require("routup");
 const typeorm_extension_1 = require("typeorm-extension");
 const adapter_routup_1 = require("@validup/adapter-routup");
-const domains_1 = require("../../../../domains");
+const domains_1 = require("../../../../database/domains");
 const utils_1 = require("../utils");
 const request_1 = require("../../../request");
 /**
@@ -21,7 +21,7 @@ const request_1 = require("../../../request");
  * @param res
  */
 async function createUserPermissionRouteHandler(req, res) {
-    const permissionChecker = (0, request_1.useRequestEnv)(req, 'permissionChecker');
+    const permissionChecker = (0, request_1.useRequestPermissionChecker)(req);
     await permissionChecker.preCheck({ name: core_kit_1.PermissionName.USER_PERMISSION_CREATE });
     // ----------------------------------------------
     const validator = new utils_1.UserPermissionRequestValidator();

package/dist/http/controllers/user-permission/handlers/create.js.map

@@ -1 +1 @@
-{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user-permission/handlers/create.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAmBH,4EAmDC;AApED,+CAE0B;AAE1B,mCAAqC;AACrC,yDAA6E;AAC7E,4DAAiE;AACjE,iDAA2D;AAC3D,oCAA0D;AAC1D,8CAA0E;AAE1E;;;;;GAKG;AACI,KAAK,UAAU,gCAAgC,CAAC,GAAY,EAAE,GAAa;IAC9E,MAAM,iBAAiB,GAAG,IAAA,uBAAa,EAAC,GAAG,EAAE,mBAAmB,CAAC,CAAC;IAClE,MAAM,iBAAiB,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,yBAAc,CAAC,sBAAsB,EAAE,CAAC,CAAC;IAElF,iDAAiD;IAEjD,MAAM,SAAS,GAAG,IAAI,sCAA8B,EAAE,CAAC;IACvD,MAAM,gBAAgB,GAAG,IAAI,uCAAsB,CAAC,SAAS,CAAC,CAAC;IAC/D,MAAM,IAAI,GAAG,MAAM,gBAAgB,CAAC,GAAG,CAAC,GAAG,EAAE;QACzC,KAAK,EAAE,iCAAuB,CAAC,MAAM;KACxC,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,IAAA,6CAAyB,EAAC,IAAI,EAAE;QAClC,UAAU;QACV,YAAY,EAAE,8BAAoB;KACrC,CAAC,CAAC;IAEH,iDAAiD;IAEjD,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;QAClB,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;QAEpD,MAAM,iBAAiB,CAAC,QAAQ,CAAC;YAC7B,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI;SAC7B,CAAC,CAAC;IACP,CAAC;IAED,iDAAiD;IAEjD,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;QACZ,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;IAC5C,CAAC;IAED,iDAAiD;IAEjD,MAAM,iBAAiB,CAAC,KAAK,CAAC;QAC1B,IAAI,EAAE,yBAAc,CAAC,sBAAsB;QAC3C,IAAI,EAAE;YACF,UAAU,EAAE,IAAI;SACnB;KACJ,CAAC,CAAC;IAEH,iDAAiD;IAEjD,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,8BAAoB,CAAC,CAAC;IAClE,IAAI,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAErC,MAAM,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAEvC,OAAO,IAAA,oBAAW,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACpC,CAAC"}
+{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user-permission/handlers/create.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAmBH,4EAmDC;AApED,+CAE0B;AAE1B,mCAAqC;AACrC,yDAA6E;AAC7E,4DAAiE;AACjE,0DAAoE;AACpE,oCAA0D;AAC1D,8CAAwF;AAExF;;;;;GAKG;AACI,KAAK,UAAU,gCAAgC,CAAC,GAAY,EAAE,GAAa;IAC9E,MAAM,iBAAiB,GAAG,IAAA,qCAA2B,EAAC,GAAG,CAAC,CAAC;IAC3D,MAAM,iBAAiB,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,yBAAc,CAAC,sBAAsB,EAAE,CAAC,CAAC;IAElF,iDAAiD;IAEjD,MAAM,SAAS,GAAG,IAAI,sCAA8B,EAAE,CAAC;IACvD,MAAM,gBAAgB,GAAG,IAAI,uCAAsB,CAAC,SAAS,CAAC,CAAC;IAC/D,MAAM,IAAI,GAAG,MAAM,gBAAgB,CAAC,GAAG,CAAC,GAAG,EAAE;QACzC,KAAK,EAAE,iCAAuB,CAAC,MAAM;KACxC,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,IAAA,6CAAyB,EAAC,IAAI,EAAE;QAClC,UAAU;QACV,YAAY,EAAE,8BAAoB;KACrC,CAAC,CAAC;IAEH,iDAAiD;IAEjD,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;QAClB,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;QAEpD,MAAM,iBAAiB,CAAC,QAAQ,CAAC;YAC7B,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI;SAC7B,CAAC,CAAC;IACP,CAAC;IAED,iDAAiD;IAEjD,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;QACZ,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;IAC5C,CAAC;IAED,iDAAiD;IAEjD,MAAM,iBAAiB,CAAC,KAAK,CAAC;QAC1B,IAAI,EAAE,yBAAc,CAAC,sBAAsB;QAC3C,IAAI,EAAE;YACF,UAAU,EAAE,IAAI;SACnB;KACJ,CAAC,CAAC;IAEH,iDAAiD;IAEjD,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,8BAAoB,CAAC,CAAC;IAClE,IAAI,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAErC,MAAM,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAEvC,OAAO,IAAA,oBAAW,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACpC,CAAC"}

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

@@ -11,7 +11,7 @@ const http_1 = require("@ebec/http");
 const core_kit_1 = require("@authup/core-kit");
 const routup_1 = require("routup");
 const typeorm_extension_1 = require("typeorm-extension");
-const domains_1 = require("../../../../domains");
+const domains_1 = require("../../../../database/domains");
 const request_1 = require("../../../request");
 /**
  * Drop a permission by id of a specific user.
@@ -21,7 +21,7 @@ const request_1 = require("../../../request");
  */
 async function deleteUserPermissionRouteHandler(req, res) {
     const id = (0, request_1.useRequestParamID)(req);
-    const permissionChecker = (0, request_1.useRequestEnv)(req, 'permissionChecker');
+    const permissionChecker = (0, request_1.useRequestPermissionChecker)(req);
     await permissionChecker.preCheck({ name: core_kit_1.PermissionName.USER_PERMISSION_DELETE });
     const dataSource = await (0, typeorm_extension_1.useDataSource)();
     const repository = dataSource.getRepository(domains_1.UserPermissionEntity);

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

@@ -1 +1 @@
-{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user-permission/handlers/delete.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAgBH,4EA0CC;AAxDD,qCAA2C;AAC3C,+CAAkD;AAElD,mCAAsC;AACtC,yDAAkD;AAClD,iDAA2D;AAC3D,8CAAoE;AAEpE;;;;;GAKG;AACI,KAAK,UAAU,gCAAgC,CAAC,GAAY,EAAE,GAAa;IAC9E,MAAM,EAAE,GAAG,IAAA,2BAAiB,EAAC,GAAG,CAAC,CAAC;IAElC,MAAM,iBAAiB,GAAG,IAAA,uBAAa,EAAC,GAAG,EAAE,mBAAmB,CAAC,CAAC;IAClE,MAAM,iBAAiB,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,yBAAc,CAAC,sBAAsB,EAAE,CAAC,CAAC;IAElF,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,OAAO,CAAC;QACpC,KAAK,EAAE;YACH,EAAE;SACL;QACD,SAAS,EAAE;YACP,IAAI,EAAE,IAAI;YACV,UAAU,EAAE,IAAI;SACnB;KACJ,CAAC,CAAC;IAEH,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,iDAAiD;IAEjD,MAAM,iBAAiB,CAAC,KAAK,CAAC;QAC1B,IAAI,EAAE,yBAAc,CAAC,sBAAsB;QAC3C,IAAI,EAAE;YACF,UAAU,EAAE,MAAM;SACrB;KACJ,CAAC,CAAC;IAEH,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"}
+{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user-permission/handlers/delete.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAgBH,4EA0CC;AAxDD,qCAA2C;AAC3C,+CAAkD;AAElD,mCAAsC;AACtC,yDAAkD;AAClD,0DAAoE;AACpE,8CAAkF;AAElF;;;;;GAKG;AACI,KAAK,UAAU,gCAAgC,CAAC,GAAY,EAAE,GAAa;IAC9E,MAAM,EAAE,GAAG,IAAA,2BAAiB,EAAC,GAAG,CAAC,CAAC;IAElC,MAAM,iBAAiB,GAAG,IAAA,qCAA2B,EAAC,GAAG,CAAC,CAAC;IAC3D,MAAM,iBAAiB,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,yBAAc,CAAC,sBAAsB,EAAE,CAAC,CAAC;IAElF,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,OAAO,CAAC;QACpC,KAAK,EAAE;YACH,EAAE;SACL;QACD,SAAS,EAAE;YACP,IAAI,EAAE,IAAI;YACV,UAAU,EAAE,IAAI;SACnB;KACJ,CAAC,CAAC;IAEH,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,iDAAiD;IAEjD,MAAM,iBAAiB,CAAC,KAAK,CAAC;QAC1B,IAAI,EAAE,yBAAc,CAAC,sBAAsB;QAC3C,IAAI,EAAE;YACF,UAAU,EAAE,MAAM;SACrB;KACJ,CAAC,CAAC;IAEH,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"}

package/dist/http/controllers/user-permission/handlers/read.js

@@ -13,7 +13,7 @@ const query_1 = require("@routup/basic/query");
 const routup_1 = require("routup");
 const typeorm_extension_1 = require("typeorm-extension");
 const http_1 = require("@ebec/http");
-const domains_1 = require("../../../../domains");
+const domains_1 = require("../../../../database/domains");
 const request_1 = require("../../../request");
 /**
  * Receive user permissions of a specific user.
@@ -22,7 +22,7 @@ const request_1 = require("../../../request");
  * @param res
  */
 async function getManyUserPermissionRouteHandler(req, res) {
-    const permissionChecker = (0, request_1.useRequestEnv)(req, 'permissionChecker');
+    const permissionChecker = (0, request_1.useRequestPermissionChecker)(req);
     await permissionChecker.preCheckOneOf({
         name: [
             core_kit_1.PermissionName.USER_PERMISSION_CREATE,
@@ -59,7 +59,7 @@ async function getManyUserPermissionRouteHandler(req, res) {
  * @param res
  */
 async function getOneUserPermissionRouteHandler(req, res) {
-    const permissionChecker = (0, request_1.useRequestEnv)(req, 'permissionChecker');
+    const permissionChecker = (0, request_1.useRequestPermissionChecker)(req);
     await permissionChecker.preCheckOneOf({
         name: [
             core_kit_1.PermissionName.USER_PERMISSION_CREATE,

package/dist/http/controllers/user-permission/handlers/read.js.map

@@ -1 +1 @@
-{"version":3,"file":"read.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user-permission/handlers/read.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAmBH,8EAiCC;AAUD,4EAqBC;AAjFD,+CAAkD;AAClD,+CAAsD;AAEtD,mCAA8B;AAC9B,yDAE2B;AAC3B,qCAA2C;AAC3C,iDAA2D;AAC3D,8CAAoE;AAEpE;;;;;GAKG;AACI,KAAK,UAAU,iCAAiC,CAAC,GAAY,EAAE,GAAa;IAC/E,MAAM,iBAAiB,GAAG,IAAA,uBAAa,EAAC,GAAG,EAAE,mBAAmB,CAAC,CAAC;IAClE,MAAM,iBAAiB,CAAC,aAAa,CAAC;QAClC,IAAI,EAAE;YACF,yBAAc,CAAC,sBAAsB;YACrC,yBAAc,CAAC,sBAAsB;YACrC,yBAAc,CAAC,oBAAoB;SACtC;KACJ,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,yBAAyB,GAAG,UAAU,CAAC,aAAa,CAAC,8BAAoB,CAAC,CAAC;IACjF,MAAM,KAAK,GAAG,yBAAyB,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;IAE7E,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,8BAAU,EAAC,KAAK,EAAE,IAAA,uBAAe,EAAC,GAAG,CAAC,EAAE;QAC3D,YAAY,EAAE,gBAAgB;QAC9B,OAAO,EAAE;YACL,OAAO,EAAE,CAAC,SAAS,EAAE,eAAe,CAAC;SACxC;QACD,UAAU,EAAE;YACR,QAAQ,EAAE,EAAE;SACf;KACJ,CAAC,CAAC;IAEH,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,GAAG,MAAM,KAAK,CAAC,eAAe,EAAE,CAAC;IAExD,OAAO,IAAA,aAAI,EAAC,GAAG,EAAE;QACb,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE;YACF,KAAK;YACL,GAAG,UAAU;SAChB;KACJ,CAAC,CAAC;AACP,CAAC;AAED,oFAAoF;AAEpF;;;;;GAKG;AACI,KAAK,UAAU,gCAAgC,CAAC,GAAY,EAAE,GAAa;IAC9E,MAAM,iBAAiB,GAAG,IAAA,uBAAa,EAAC,GAAG,EAAE,mBAAmB,CAAC,CAAC;IAClE,MAAM,iBAAiB,CAAC,aAAa,CAAC;QAClC,IAAI,EAAE;YACF,yBAAc,CAAC,sBAAsB;YACrC,yBAAc,CAAC,sBAAsB;YACrC,yBAAc,CAAC,oBAAoB;SACtC;KACJ,CAAC,CAAC;IAEH,MAAM,EAAE,GAAG,IAAA,2BAAiB,EAAC,GAAG,CAAC,CAAC;IAElC,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,yBAAyB,GAAG,UAAU,CAAC,aAAa,CAAC,8BAAoB,CAAC,CAAC;IACjF,MAAM,MAAM,GAAG,MAAM,yBAAyB,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAEjE,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,OAAO,IAAA,aAAI,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC"}
+{"version":3,"file":"read.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user-permission/handlers/read.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAmBH,8EAiCC;AAUD,4EAqBC;AAjFD,+CAAkD;AAClD,+CAAsD;AAEtD,mCAA8B;AAC9B,yDAE2B;AAC3B,qCAA2C;AAC3C,0DAAoE;AACpE,8CAAkF;AAElF;;;;;GAKG;AACI,KAAK,UAAU,iCAAiC,CAAC,GAAY,EAAE,GAAa;IAC/E,MAAM,iBAAiB,GAAG,IAAA,qCAA2B,EAAC,GAAG,CAAC,CAAC;IAC3D,MAAM,iBAAiB,CAAC,aAAa,CAAC;QAClC,IAAI,EAAE;YACF,yBAAc,CAAC,sBAAsB;YACrC,yBAAc,CAAC,sBAAsB;YACrC,yBAAc,CAAC,oBAAoB;SACtC;KACJ,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,yBAAyB,GAAG,UAAU,CAAC,aAAa,CAAC,8BAAoB,CAAC,CAAC;IACjF,MAAM,KAAK,GAAG,yBAAyB,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;IAE7E,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,8BAAU,EAAC,KAAK,EAAE,IAAA,uBAAe,EAAC,GAAG,CAAC,EAAE;QAC3D,YAAY,EAAE,gBAAgB;QAC9B,OAAO,EAAE;YACL,OAAO,EAAE,CAAC,SAAS,EAAE,eAAe,CAAC;SACxC;QACD,UAAU,EAAE;YACR,QAAQ,EAAE,EAAE;SACf;KACJ,CAAC,CAAC;IAEH,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,GAAG,MAAM,KAAK,CAAC,eAAe,EAAE,CAAC;IAExD,OAAO,IAAA,aAAI,EAAC,GAAG,EAAE;QACb,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE;YACF,KAAK;YACL,GAAG,UAAU;SAChB;KACJ,CAAC,CAAC;AACP,CAAC;AAED,oFAAoF;AAEpF;;;;;GAKG;AACI,KAAK,UAAU,gCAAgC,CAAC,GAAY,EAAE,GAAa;IAC9E,MAAM,iBAAiB,GAAG,IAAA,qCAA2B,EAAC,GAAG,CAAC,CAAC;IAC3D,MAAM,iBAAiB,CAAC,aAAa,CAAC;QAClC,IAAI,EAAE;YACF,yBAAc,CAAC,sBAAsB;YACrC,yBAAc,CAAC,sBAAsB;YACrC,yBAAc,CAAC,oBAAoB;SACtC;KACJ,CAAC,CAAC;IAEH,MAAM,EAAE,GAAG,IAAA,2BAAiB,EAAC,GAAG,CAAC,CAAC;IAElC,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,yBAAyB,GAAG,UAAU,CAAC,aAAa,CAAC,8BAAoB,CAAC,CAAC;IACjF,MAAM,MAAM,GAAG,MAAM,yBAAyB,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAEjE,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,OAAO,IAAA,aAAI,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC"}

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

@@ -1,6 +1,6 @@
 import type { ContainerOptions } from 'validup';
 import { Container } from 'validup';
-import type { UserPermissionEntity } from '../../../../domains';
+import type { UserPermissionEntity } from '../../../../database/domains';
 export declare class UserPermissionRequestValidator extends Container<UserPermissionEntity> {
     constructor(options?: ContainerOptions<UserPermissionEntity>);
     mountAll(): void;

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

@@ -1 +1 @@
-{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/user-permission/utils/validation.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,KAAK,EACR,oBAAoB,EACvB,MAAM,qBAAqB,CAAC;AAG7B,qBAAa,8BAA+B,SAAQ,SAAS,CAC7D,oBAAoB,CACnB;gBACe,OAAO,GAAE,gBAAgB,CAAC,oBAAoB,CAAM;IAMhE,QAAQ;CA0BX"}
+{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/user-permission/utils/validation.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,KAAK,EACR,oBAAoB,EACvB,MAAM,8BAA8B,CAAC;AAGtC,qBAAa,8BAA+B,SAAQ,SAAS,CAC7D,oBAAoB,CACnB;gBACe,OAAO,GAAE,gBAAgB,CAAC,oBAAoB,CAAM;IAMhE,QAAQ;CA0BX"}

package/dist/http/controllers/user-role/handlers/create.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/user-role/handlers/create.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAShD,wBAAsB,0BAA0B,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAI,OAAO,CAAC,GAAG,CAAC,CAuD3F"}
+{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/user-role/handlers/create.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAWhD,wBAAsB,0BAA0B,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAI,OAAO,CAAC,GAAG,CAAC,CAuD3F"}

package/dist/http/controllers/user-role/handlers/create.js

@@ -12,12 +12,12 @@ const core_kit_1 = require("@authup/core-kit");
 const routup_1 = require("routup");
 const typeorm_extension_1 = require("typeorm-extension");
 const adapter_routup_1 = require("@validup/adapter-routup");
-const domains_1 = require("../../../../domains");
+const domains_1 = require("../../../../database/domains");
 const services_1 = require("../../../../services");
 const utils_1 = require("../utils");
 const request_1 = require("../../../request");
 async function createUserRoleRouteHandler(req, res) {
-    const permissionChecker = (0, request_1.useRequestEnv)(req, 'permissionChecker');
+    const permissionChecker = (0, request_1.useRequestPermissionChecker)(req);
     await permissionChecker.preCheck({ name: core_kit_1.PermissionName.USER_ROLE_CREATE });
     const validator = new utils_1.UserRoleRequestValidator();
     const validatorAdapter = new adapter_routup_1.RoutupContainerAdapter(validator);

package/dist/http/controllers/user-role/handlers/create.js.map

@@ -1 +1 @@
-{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user-role/handlers/create.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAaH,gEAuDC;AAlED,qCAA4C;AAC5C,+CAAkD;AAElD,mCAAqC;AACrC,yDAA6E;AAC7E,4DAAiE;AACjE,iDAAqD;AACrD,mDAAiE;AACjE,oCAAoD;AACpD,8CAAoG;AAE7F,KAAK,UAAU,0BAA0B,CAAC,GAAY,EAAE,GAAa;IACxE,MAAM,iBAAiB,GAAG,IAAA,uBAAa,EAAC,GAAG,EAAE,mBAAmB,CAAC,CAAC;IAClE,MAAM,iBAAiB,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,yBAAc,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAE5E,MAAM,SAAS,GAAG,IAAI,gCAAwB,EAAE,CAAC;IACjD,MAAM,gBAAgB,GAAG,IAAI,uCAAsB,CAAC,SAAS,CAAC,CAAC;IAC/D,MAAM,IAAI,GAAG,MAAM,gBAAgB,CAAC,GAAG,CAAC,GAAG,EAAE;QACzC,KAAK,EAAE,iCAAuB,CAAC,MAAM;KACxC,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,IAAA,6CAAyB,EAAC,IAAI,EAAE;QAClC,UAAU;QACV,YAAY,EAAE,wBAAc;KAC/B,CAAC,CAAC;IAEH,iDAAiD;IAEjD,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;QACZ,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;QAExC,MAAM,QAAQ,GAAG,IAAA,kCAAwB,EAAC,GAAG,CAAC,CAAC;QAC/C,MAAM,yBAAyB,GAAG,IAAI,oCAAyB,CAAC,UAAU,CAAC,CAAC;QAC5E,MAAM,cAAc,GAAG,MAAM,yBAAyB,CAAC,WAAW,CAAC,QAAQ,EAAE;YACzE,IAAI,EAAE,MAAM;YACZ,EAAE,EAAE,IAAI,CAAC,OAAO;SACnB,CAAC,CAAC;QACH,IAAI,CAAC,cAAc,EAAE,CAAC;YAClB,MAAM,IAAI,qBAAc,CAAC,0CAA0C,CAAC,CAAC;QACzE,CAAC;IACL,CAAC;IAED,iDAAiD;IAEjD,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;QACZ,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;IAC5C,CAAC;IAED,iDAAiD;IAEjD,MAAM,iBAAiB,CAAC,KAAK,CAAC;QAC1B,IAAI,EAAE,yBAAc,CAAC,gBAAgB;QACrC,IAAI,EAAE;YACF,UAAU,EAAE,IAAI;SACnB;KACJ,CAAC,CAAC;IAEH,iDAAiD;IAEjD,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,wBAAc,CAAC,CAAC;IAC5D,IAAI,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAErC,MAAM,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAEvC,OAAO,IAAA,oBAAW,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACpC,CAAC"}
+{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user-role/handlers/create.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAeH,gEAuDC;AApED,qCAA4C;AAC5C,+CAAkD;AAElD,mCAAqC;AACrC,yDAA6E;AAC7E,4DAAiE;AACjE,0DAA8D;AAC9D,mDAAiE;AACjE,oCAAoD;AACpD,8CAE0B;AAEnB,KAAK,UAAU,0BAA0B,CAAC,GAAY,EAAE,GAAa;IACxE,MAAM,iBAAiB,GAAG,IAAA,qCAA2B,EAAC,GAAG,CAAC,CAAC;IAC3D,MAAM,iBAAiB,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,yBAAc,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAE5E,MAAM,SAAS,GAAG,IAAI,gCAAwB,EAAE,CAAC;IACjD,MAAM,gBAAgB,GAAG,IAAI,uCAAsB,CAAC,SAAS,CAAC,CAAC;IAC/D,MAAM,IAAI,GAAG,MAAM,gBAAgB,CAAC,GAAG,CAAC,GAAG,EAAE;QACzC,KAAK,EAAE,iCAAuB,CAAC,MAAM;KACxC,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,IAAA,6CAAyB,EAAC,IAAI,EAAE;QAClC,UAAU;QACV,YAAY,EAAE,wBAAc;KAC/B,CAAC,CAAC;IAEH,iDAAiD;IAEjD,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;QACZ,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;QAExC,MAAM,QAAQ,GAAG,IAAA,kCAAwB,EAAC,GAAG,CAAC,CAAC;QAC/C,MAAM,yBAAyB,GAAG,IAAI,oCAAyB,CAAC,UAAU,CAAC,CAAC;QAC5E,MAAM,cAAc,GAAG,MAAM,yBAAyB,CAAC,WAAW,CAAC,QAAQ,EAAE;YACzE,IAAI,EAAE,MAAM;YACZ,EAAE,EAAE,IAAI,CAAC,OAAO;SACnB,CAAC,CAAC;QACH,IAAI,CAAC,cAAc,EAAE,CAAC;YAClB,MAAM,IAAI,qBAAc,CAAC,0CAA0C,CAAC,CAAC;QACzE,CAAC;IACL,CAAC;IAED,iDAAiD;IAEjD,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;QACZ,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;IAC5C,CAAC;IAED,iDAAiD;IAEjD,MAAM,iBAAiB,CAAC,KAAK,CAAC;QAC1B,IAAI,EAAE,yBAAc,CAAC,gBAAgB;QACrC,IAAI,EAAE;YACF,UAAU,EAAE,IAAI;SACnB;KACJ,CAAC,CAAC;IAEH,iDAAiD;IAEjD,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,wBAAc,CAAC,CAAC;IAC5D,IAAI,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAErC,MAAM,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAEvC,OAAO,IAAA,oBAAW,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACpC,CAAC"}

package/dist/http/controllers/user-role/handlers/delete.js

@@ -11,11 +11,11 @@ const http_1 = require("@ebec/http");
 const core_kit_1 = require("@authup/core-kit");
 const routup_1 = require("routup");
 const typeorm_extension_1 = require("typeorm-extension");
-const domains_1 = require("../../../../domains");
+const domains_1 = require("../../../../database/domains");
 const request_1 = require("../../../request");
 async function deleteUserRoleRouteHandler(req, res) {
     const id = (0, request_1.useRequestParamID)(req);
-    const permissionChecker = (0, request_1.useRequestEnv)(req, 'permissionChecker');
+    const permissionChecker = (0, request_1.useRequestPermissionChecker)(req);
     await permissionChecker.preCheck({ name: core_kit_1.PermissionName.USER_ROLE_DELETE });
     const dataSource = await (0, typeorm_extension_1.useDataSource)();
     const repository = dataSource.getRepository(domains_1.UserRoleEntity);

package/dist/http/controllers/user-role/handlers/delete.js.map

@@ -1 +1 @@
-{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user-role/handlers/delete.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAUH,gEAyCC;AAjDD,qCAA2C;AAC3C,+CAAkD;AAElD,mCAAsC;AACtC,yDAAkD;AAClD,iDAAqD;AACrD,8CAAoE;AAE7D,KAAK,UAAU,0BAA0B,CAAC,GAAY,EAAE,GAAa;IACxE,MAAM,EAAE,GAAG,IAAA,2BAAiB,EAAC,GAAG,CAAC,CAAC;IAElC,MAAM,iBAAiB,GAAG,IAAA,uBAAa,EAAC,GAAG,EAAE,mBAAmB,CAAC,CAAC;IAClE,MAAM,iBAAiB,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,yBAAc,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAE5E,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,wBAAc,CAAC,CAAC;IAE5D,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;QACpC,KAAK,EAAE;YACH,EAAE;SACL;QACD,SAAS,EAAE;YACP,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,IAAI;SACb;KACJ,CAAC,CAAC;IAEH,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,iDAAiD;IAEjD,MAAM,iBAAiB,CAAC,KAAK,CAAC;QAC1B,IAAI,EAAE,yBAAc,CAAC,gBAAgB;QACrC,IAAI,EAAE;YACF,UAAU,EAAE,MAAM;SACrB;KACJ,CAAC,CAAC;IAEH,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,OAAO,IAAA,qBAAY,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACrC,CAAC"}
+{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user-role/handlers/delete.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAUH,gEAyCC;AAjDD,qCAA2C;AAC3C,+CAAkD;AAElD,mCAAsC;AACtC,yDAAkD;AAClD,0DAA8D;AAC9D,8CAAkF;AAE3E,KAAK,UAAU,0BAA0B,CAAC,GAAY,EAAE,GAAa;IACxE,MAAM,EAAE,GAAG,IAAA,2BAAiB,EAAC,GAAG,CAAC,CAAC;IAElC,MAAM,iBAAiB,GAAG,IAAA,qCAA2B,EAAC,GAAG,CAAC,CAAC;IAC3D,MAAM,iBAAiB,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,yBAAc,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAE5E,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,wBAAc,CAAC,CAAC;IAE5D,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;QACpC,KAAK,EAAE;YACH,EAAE;SACL;QACD,SAAS,EAAE;YACP,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,IAAI;SACb;KACJ,CAAC,CAAC;IAEH,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,iDAAiD;IAEjD,MAAM,iBAAiB,CAAC,KAAK,CAAC;QAC1B,IAAI,EAAE,yBAAc,CAAC,gBAAgB;QACrC,IAAI,EAAE;YACF,UAAU,EAAE,MAAM;SACrB;KACJ,CAAC,CAAC;IAEH,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,OAAO,IAAA,qBAAY,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACrC,CAAC"}

package/dist/http/controllers/user-role/handlers/read.js

@@ -13,10 +13,10 @@ const query_1 = require("@routup/basic/query");
 const routup_1 = require("routup");
 const typeorm_extension_1 = require("typeorm-extension");
 const http_1 = require("@ebec/http");
-const domains_1 = require("../../../../domains");
+const domains_1 = require("../../../../database/domains");
 const request_1 = require("../../../request");
 async function getManyUserRoleRouteHandler(req, res) {
-    const permissionChecker = (0, request_1.useRequestEnv)(req, 'permissionChecker');
+    const permissionChecker = (0, request_1.useRequestPermissionChecker)(req);
     await permissionChecker.preCheckOneOf({
         name: [
             core_kit_1.PermissionName.USER_ROLE_READ,
@@ -46,7 +46,7 @@ async function getManyUserRoleRouteHandler(req, res) {
     });
 }
 async function getOneUserRoleRouteHandler(req, res) {
-    const permissionChecker = (0, request_1.useRequestEnv)(req, 'permissionChecker');
+    const permissionChecker = (0, request_1.useRequestPermissionChecker)(req);
     await permissionChecker.preCheckOneOf({
         name: [
             core_kit_1.PermissionName.USER_ROLE_READ,

package/dist/http/controllers/user-role/handlers/read.js.map

@@ -1 +1 @@
-{"version":3,"file":"read.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user-role/handlers/read.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAaH,kEAiCC;AAED,gEAqBC;AAnED,+CAAkD;AAClD,+CAAsD;AAEtD,mCAA8B;AAC9B,yDAE2B;AAC3B,qCAA2C;AAC3C,iDAAqD;AACrD,8CAAoE;AAE7D,KAAK,UAAU,2BAA2B,CAAC,GAAY,EAAE,GAAa;IACzE,MAAM,iBAAiB,GAAG,IAAA,uBAAa,EAAC,GAAG,EAAE,mBAAmB,CAAC,CAAC;IAClE,MAAM,iBAAiB,CAAC,aAAa,CAAC;QAClC,IAAI,EAAE;YACF,yBAAc,CAAC,cAAc;YAC7B,yBAAc,CAAC,gBAAgB;YAC/B,yBAAc,CAAC,gBAAgB;SAClC;KACJ,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,wBAAc,CAAC,CAAC;IAC5D,MAAM,KAAK,GAAG,UAAU,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC;IAExD,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,8BAAU,EAAC,KAAK,EAAE,IAAA,uBAAe,EAAC,GAAG,CAAC,EAAE;QAC3D,YAAY,EAAE,UAAU;QACxB,OAAO,EAAE;YACL,OAAO,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC;SAClC;QACD,UAAU,EAAE;YACR,QAAQ,EAAE,EAAE;SACf;KACJ,CAAC,CAAC;IAEH,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,GAAG,MAAM,KAAK,CAAC,eAAe,EAAE,CAAC;IAExD,OAAO,IAAA,aAAI,EAAC,GAAG,EAAE;QACb,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE;YACF,KAAK;YACL,GAAG,UAAU;SAChB;KACJ,CAAC,CAAC;AACP,CAAC;AAEM,KAAK,UAAU,0BAA0B,CAAC,GAAY,EAAE,GAAa;IACxE,MAAM,iBAAiB,GAAG,IAAA,uBAAa,EAAC,GAAG,EAAE,mBAAmB,CAAC,CAAC;IAClE,MAAM,iBAAiB,CAAC,aAAa,CAAC;QAClC,IAAI,EAAE;YACF,yBAAc,CAAC,cAAc;YAC7B,yBAAc,CAAC,gBAAgB;YAC/B,yBAAc,CAAC,gBAAgB;SAClC;KACJ,CAAC,CAAC;IAEH,MAAM,EAAE,GAAG,IAAA,2BAAiB,EAAC,GAAG,CAAC,CAAC;IAElC,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,wBAAc,CAAC,CAAC;IAC5D,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,OAAO,IAAA,aAAI,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC"}
+{"version":3,"file":"read.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user-role/handlers/read.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAaH,kEAiCC;AAED,gEAqBC;AAnED,+CAAkD;AAClD,+CAAsD;AAEtD,mCAA8B;AAC9B,yDAE2B;AAC3B,qCAA2C;AAC3C,0DAA8D;AAC9D,8CAAkF;AAE3E,KAAK,UAAU,2BAA2B,CAAC,GAAY,EAAE,GAAa;IACzE,MAAM,iBAAiB,GAAG,IAAA,qCAA2B,EAAC,GAAG,CAAC,CAAC;IAC3D,MAAM,iBAAiB,CAAC,aAAa,CAAC;QAClC,IAAI,EAAE;YACF,yBAAc,CAAC,cAAc;YAC7B,yBAAc,CAAC,gBAAgB;YAC/B,yBAAc,CAAC,gBAAgB;SAClC;KACJ,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,wBAAc,CAAC,CAAC;IAC5D,MAAM,KAAK,GAAG,UAAU,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC;IAExD,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,8BAAU,EAAC,KAAK,EAAE,IAAA,uBAAe,EAAC,GAAG,CAAC,EAAE;QAC3D,YAAY,EAAE,UAAU;QACxB,OAAO,EAAE;YACL,OAAO,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC;SAClC;QACD,UAAU,EAAE;YACR,QAAQ,EAAE,EAAE;SACf;KACJ,CAAC,CAAC;IAEH,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,GAAG,MAAM,KAAK,CAAC,eAAe,EAAE,CAAC;IAExD,OAAO,IAAA,aAAI,EAAC,GAAG,EAAE;QACb,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE;YACF,KAAK;YACL,GAAG,UAAU;SAChB;KACJ,CAAC,CAAC;AACP,CAAC;AAEM,KAAK,UAAU,0BAA0B,CAAC,GAAY,EAAE,GAAa;IACxE,MAAM,iBAAiB,GAAG,IAAA,qCAA2B,EAAC,GAAG,CAAC,CAAC;IAC3D,MAAM,iBAAiB,CAAC,aAAa,CAAC;QAClC,IAAI,EAAE;YACF,yBAAc,CAAC,cAAc;YAC7B,yBAAc,CAAC,gBAAgB;YAC/B,yBAAc,CAAC,gBAAgB;SAClC;KACJ,CAAC,CAAC;IAEH,MAAM,EAAE,GAAG,IAAA,2BAAiB,EAAC,GAAG,CAAC,CAAC;IAElC,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,wBAAc,CAAC,CAAC;IAC5D,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,OAAO,IAAA,aAAI,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC"}

package/dist/http/controllers/user-role/utils/validation.d.ts

@@ -1,6 +1,6 @@
 import type { ContainerOptions } from 'validup';
 import { Container } from 'validup';
-import type { UserRoleEntity } from '../../../../domains';
+import type { UserRoleEntity } from '../../../../database/domains';
 export declare class UserRoleRequestValidator extends Container<UserRoleEntity> {
     constructor(options?: ContainerOptions<UserRoleEntity>);
     mountAll(): void;

package/dist/http/controllers/user-role/utils/validation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/user-role/utils/validation.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,KAAK,EACR,cAAc,EACjB,MAAM,qBAAqB,CAAC;AAI7B,qBAAa,wBAAyB,SAAQ,SAAS,CACvD,cAAc,CACb;gBACe,OAAO,GAAE,gBAAgB,CAAC,cAAc,CAAM;IAM1D,QAAQ;CAiBX"}
+{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/user-role/utils/validation.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,KAAK,EACR,cAAc,EACjB,MAAM,8BAA8B,CAAC;AAItC,qBAAa,wBAAyB,SAAQ,SAAS,CACvD,cAAc,CACb;gBACe,OAAO,GAAE,gBAAgB,CAAC,cAAc,CAAM;IAM1D,QAAQ;CAiBX"}

package/dist/http/middleware/built-in/authorization/basic.js

@@ -10,7 +10,7 @@ exports.verifyBasicAuthorizationHeader = verifyBasicAuthorizationHeader;
 const core_kit_1 = require("@authup/core-kit");
 const typeorm_extension_1 = require("typeorm-extension");
 const config_1 = require("../../../../config");
-const domains_1 = require("../../../../domains");
+const domains_1 = require("../../../../database/domains");
 const request_1 = require("../../../request");
 async function verifyBasicAuthorizationHeader(request, header) {
     const config = (0, config_1.useConfig)();
@@ -20,7 +20,7 @@ async function verifyBasicAuthorizationHeader(request, header) {
         const user = await userRepository.verifyCredentials(header.username, header.password);
         if (user) {
             await userRepository.findAndAppendExtraAttributesTo(user);
-            (0, request_1.setRequestEnv)(request, 'scopes', [core_kit_1.ScopeName.GLOBAL]);
+            (0, request_1.setRequestScopes)(request, [core_kit_1.ScopeName.GLOBAL]);
             (0, request_1.setRequestIdentity)(request, {
                 type: 'user',
                 id: user.id,
@@ -35,7 +35,7 @@ async function verifyBasicAuthorizationHeader(request, header) {
         const robotRepository = new domains_1.RobotRepository(dataSource);
         const robot = await robotRepository.verifyCredentials(header.username, header.password);
         if (robot) {
-            (0, request_1.setRequestEnv)(request, 'scopes', [core_kit_1.ScopeName.GLOBAL]);
+            (0, request_1.setRequestScopes)(request, [core_kit_1.ScopeName.GLOBAL]);
             (0, request_1.setRequestIdentity)(request, {
                 type: 'robot',
                 id: robot.id,
@@ -49,7 +49,7 @@ async function verifyBasicAuthorizationHeader(request, header) {
         const clientRepository = new domains_1.ClientRepository(dataSource);
         const client = await clientRepository.verifyCredentials(header.username, header.password);
         if (client) {
-            (0, request_1.setRequestEnv)(request, 'scopes', [core_kit_1.ScopeName.GLOBAL]);
+            (0, request_1.setRequestScopes)(request, [core_kit_1.ScopeName.GLOBAL]);
             (0, request_1.setRequestIdentity)(request, {
                 type: 'client',
                 id: client.id,

package/dist/http/middleware/built-in/authorization/basic.js.map

@@ -1 +1 @@
-{"version":3,"file":"basic.js","sourceRoot":"","sources":["../../../../../src/http/middleware/built-in/authorization/basic.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAUH,wEAsDC;AA9DD,+CAA6C;AAG7C,yDAAkD;AAClD,+CAA+C;AAC/C,iDAAwF;AACxF,8CAAqE;AAE9D,KAAK,UAAU,8BAA8B,CAChD,OAAgB,EAChB,MAAgC;IAEhC,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;IAC3B,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IAEzC,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;QACvB,MAAM,cAAc,GAAG,IAAI,wBAAc,CAAC,UAAU,CAAC,CAAC;QACtD,MAAM,IAAI,GAAG,MAAM,cAAc,CAAC,iBAAiB,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;QACtF,IAAI,IAAI,EAAE,CAAC;YACP,MAAM,cAAc,CAAC,8BAA8B,CAAC,IAAI,CAAC,CAAC;YAC1D,IAAA,uBAAa,EAAC,OAAO,EAAE,QAAQ,EAAE,CAAC,oBAAS,CAAC,MAAM,CAAC,CAAC,CAAC;YACrD,IAAA,4BAAkB,EAAC,OAAO,EAAE;gBACxB,IAAI,EAAE,MAAM;gBACZ,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,UAAU,EAAE,IAAI;gBAChB,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE;gBACtB,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI;aAC7B,CAAC,CAAC;YAEH,OAAO;QACX,CAAC;IACL,CAAC;IAED,IAAI,MAAM,CAAC,cAAc,EAAE,CAAC;QACxB,MAAM,eAAe,GAAG,IAAI,yBAAe,CAAC,UAAU,CAAC,CAAC;QACxD,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,iBAAiB,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;QACxF,IAAI,KAAK,EAAE,CAAC;YACR,IAAA,uBAAa,EAAC,OAAO,EAAE,QAAQ,EAAE,CAAC,oBAAS,CAAC,MAAM,CAAC,CAAC,CAAC;YACrD,IAAA,4BAAkB,EAAC,OAAO,EAAE;gBACxB,IAAI,EAAE,OAAO;gBACb,EAAE,EAAE,KAAK,CAAC,EAAE;gBACZ,UAAU,EAAE,KAAK;gBACjB,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,EAAE;gBACvB,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,IAAI;aAC9B,CAAC,CAAC;QACP,CAAC;IACL,CAAC;IAED,IAAI,MAAM,CAAC,eAAe,EAAE,CAAC;QACzB,MAAM,gBAAgB,GAAG,IAAI,0BAAgB,CAAC,UAAU,CAAC,CAAC;QAC1D,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,iBAAiB,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC1F,IAAI,MAAM,EAAE,CAAC;YACT,IAAA,uBAAa,EAAC,OAAO,EAAE,QAAQ,EAAE,CAAC,oBAAS,CAAC,MAAM,CAAC,CAAC,CAAC;YACrD,IAAA,4BAAkB,EAAC,OAAO,EAAE;gBACxB,IAAI,EAAE,QAAQ;gBACd,EAAE,EAAE,MAAM,CAAC,EAAE;gBACb,UAAU,EAAE,MAAM;gBAClB,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE;gBACxB,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI;aAC/B,CAAC,CAAC;QACP,CAAC;IACL,CAAC;AACL,CAAC"}
+{"version":3,"file":"basic.js","sourceRoot":"","sources":["../../../../../src/http/middleware/built-in/authorization/basic.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAUH,wEAsDC;AA9DD,+CAA6C;AAG7C,yDAAkD;AAClD,+CAA+C;AAC/C,0DAAiG;AACjG,8CAAwE;AAEjE,KAAK,UAAU,8BAA8B,CAChD,OAAgB,EAChB,MAAgC;IAEhC,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;IAC3B,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IAEzC,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;QACvB,MAAM,cAAc,GAAG,IAAI,wBAAc,CAAC,UAAU,CAAC,CAAC;QACtD,MAAM,IAAI,GAAG,MAAM,cAAc,CAAC,iBAAiB,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;QACtF,IAAI,IAAI,EAAE,CAAC;YACP,MAAM,cAAc,CAAC,8BAA8B,CAAC,IAAI,CAAC,CAAC;YAC1D,IAAA,0BAAgB,EAAC,OAAO,EAAE,CAAC,oBAAS,CAAC,MAAM,CAAC,CAAC,CAAC;YAC9C,IAAA,4BAAkB,EAAC,OAAO,EAAE;gBACxB,IAAI,EAAE,MAAM;gBACZ,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,UAAU,EAAE,IAAI;gBAChB,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE;gBACtB,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI;aAC7B,CAAC,CAAC;YAEH,OAAO;QACX,CAAC;IACL,CAAC;IAED,IAAI,MAAM,CAAC,cAAc,EAAE,CAAC;QACxB,MAAM,eAAe,GAAG,IAAI,yBAAe,CAAC,UAAU,CAAC,CAAC;QACxD,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,iBAAiB,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;QACxF,IAAI,KAAK,EAAE,CAAC;YACR,IAAA,0BAAgB,EAAC,OAAO,EAAE,CAAC,oBAAS,CAAC,MAAM,CAAC,CAAC,CAAC;YAC9C,IAAA,4BAAkB,EAAC,OAAO,EAAE;gBACxB,IAAI,EAAE,OAAO;gBACb,EAAE,EAAE,KAAK,CAAC,EAAE;gBACZ,UAAU,EAAE,KAAK;gBACjB,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,EAAE;gBACvB,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,IAAI;aAC9B,CAAC,CAAC;QACP,CAAC;IACL,CAAC;IAED,IAAI,MAAM,CAAC,eAAe,EAAE,CAAC;QACzB,MAAM,gBAAgB,GAAG,IAAI,0BAAgB,CAAC,UAAU,CAAC,CAAC;QAC1D,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,iBAAiB,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC1F,IAAI,MAAM,EAAE,CAAC;YACT,IAAA,0BAAgB,EAAC,OAAO,EAAE,CAAC,oBAAS,CAAC,MAAM,CAAC,CAAC,CAAC;YAC9C,IAAA,4BAAkB,EAAC,OAAO,EAAE;gBACxB,IAAI,EAAE,QAAQ;gBACd,EAAE,EAAE,MAAM,CAAC,EAAE;gBACb,UAAU,EAAE,MAAM;gBAClB,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE;gBACxB,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI;aAC/B,CAAC,CAAC;QACP,CAAC;IACL,CAAC;AACL,CAAC"}

package/dist/http/middleware/built-in/authorization/bearer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bearer.d.ts","sourceRoot":"","sources":["../../../../../src/http/middleware/built-in/authorization/bearer.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,OAAO,CAAC;AACvD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAQtC,wBAAsB,+BAA+B,CACjD,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,yBAAyB,iBAkDpC"}
+{"version":3,"file":"bearer.d.ts","sourceRoot":"","sources":["../../../../../src/http/middleware/built-in/authorization/bearer.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,OAAO,CAAC;AACvD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAYtC,wBAAsB,+BAA+B,CACjD,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,yBAAyB,iBAmDpC"}

package/dist/http/middleware/built-in/authorization/bearer.js

@@ -11,16 +11,17 @@ const core_kit_1 = require("@authup/core-kit");
 const kit_1 = require("@authup/kit");
 const server_kit_1 = require("@authup/server-kit");
 const typeorm_extension_1 = require("typeorm-extension");
-const domains_1 = require("../../../../domains");
+const domains_1 = require("../../../../database/domains");
 const oauth2_1 = require("../../../oauth2");
 const request_1 = require("../../../request");
 async function verifyBearerAuthorizationHeader(request, header) {
-    const payload = await (0, oauth2_1.readOAuth2TokenPayload)(header.token);
+    const tokenManager = new oauth2_1.OAuth2TokenManager();
+    const payload = await tokenManager.verify(header.token);
     if (payload.kind !== kit_1.OAuth2TokenKind.ACCESS) {
         throw kit_1.TokenError.accessTokenRequired();
     }
-    (0, request_1.setRequestEnv)(request, 'token', header.token);
-    (0, request_1.setRequestEnv)(request, 'scopes', (0, core_kit_1.transformOAuth2ScopeToArray)(payload.scope));
+    (0, request_1.setRequestToken)(request, header.token);
+    (0, request_1.setRequestScopes)(request, (0, core_kit_1.transformOAuth2ScopeToArray)(payload.scope));
     const sub = await (0, oauth2_1.loadOAuth2SubEntity)(payload.sub_kind, payload.sub, payload.scope);
     let realmId;
     let realmName;

package/dist/http/middleware/built-in/authorization/bearer.js.map

@@ -1 +1 @@
-{"version":3,"file":"bearer.js","sourceRoot":"","sources":["../../../../../src/http/middleware/built-in/authorization/bearer.ts"],"names":[],"mappings":";;AAoBA,0EAoDC;AAxED;;;;;GAKG;AACH,+CAA+D;AAC/D,qCAEqB;AACrB,mDAAuD;AAGvD,yDAAkD;AAClD,iDAE6B;AAC7B,4CAA8E;AAC9E,8CAAqE;AAE9D,KAAK,UAAU,+BAA+B,CACjD,OAAgB,EAChB,MAAiC;IAEjC,MAAM,OAAO,GAAG,MAAM,IAAA,+BAAsB,EAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC3D,IAAI,OAAO,CAAC,IAAI,KAAK,qBAAe,CAAC,MAAM,EAAE,CAAC;QAC1C,MAAM,gBAAU,CAAC,mBAAmB,EAAE,CAAC;IAC3C,CAAC;IAED,IAAA,uBAAa,EAAC,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9C,IAAA,uBAAa,EAAC,OAAO,EAAE,QAAQ,EAAE,IAAA,sCAA2B,EAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;IAE7E,MAAM,GAAG,GAAG,MAAM,IAAA,4BAAmB,EACjC,OAAO,CAAC,QAAQ,EAChB,OAAO,CAAC,GAAG,EACX,OAAO,CAAC,KAAK,CAChB,CAAC;IAEF,IAAI,OAAgB,CAAC;IACrB,IAAI,SAAiB,CAAC;IAEtB,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;QACrB,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC;QAC/B,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;IAC/B,CAAC;SAAM,CAAC;QACJ,uDAAuD;QACvD,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;QACzC,MAAM,eAAe,GAAG,UAAU,CAAC,aAAa,CAAC,qBAAW,CAAC,CAAC;QAC9D,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC;YACxC,KAAK,EAAE;gBACH,EAAE,EAAE,OAAO,CAAC,QAAQ;aACvB;YACD,KAAK,EAAE;gBACH,EAAE,EAAE,IAAA,8BAAiB,EAAC;oBAClB,MAAM,EAAE,qBAAW,CAAC,KAAK;oBACzB,GAAG,EAAE,OAAO,CAAC,QAAQ;iBACxB,CAAC;gBACF,YAAY,EAAE,KAAM;aACvB;SACJ,CAAC,CAAC;QAEH,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC;QACvB,OAAO,GAAG,KAAK,CAAC,EAAE,CAAC;IACvB,CAAC;IAED,IAAA,4BAAkB,EAAC,OAAO,EAAE;QACxB,IAAI,EAAE,OAAO,CAAC,QAAQ;QACtB,EAAE,EAAE,OAAO,CAAC,GAAG;QACf,UAAU,EAAE,GAAG;QACf,OAAO;QACP,SAAS;KACZ,CAAC,CAAC;AACP,CAAC"}
+{"version":3,"file":"bearer.js","sourceRoot":"","sources":["../../../../../src/http/middleware/built-in/authorization/bearer.ts"],"names":[],"mappings":";;AAwBA,0EAqDC;AA7ED;;;;;GAKG;AACH,+CAA+D;AAC/D,qCAEqB;AACrB,mDAAuD;AAGvD,yDAAkD;AAClD,0DAEsC;AACtC,4CAA0E;AAC1E,8CAI0B;AAEnB,KAAK,UAAU,+BAA+B,CACjD,OAAgB,EAChB,MAAiC;IAEjC,MAAM,YAAY,GAAG,IAAI,2BAAkB,EAAE,CAAC;IAC9C,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACxD,IAAI,OAAO,CAAC,IAAI,KAAK,qBAAe,CAAC,MAAM,EAAE,CAAC;QAC1C,MAAM,gBAAU,CAAC,mBAAmB,EAAE,CAAC;IAC3C,CAAC;IAED,IAAA,yBAAe,EAAC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IACvC,IAAA,0BAAgB,EAAC,OAAO,EAAE,IAAA,sCAA2B,EAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;IAEtE,MAAM,GAAG,GAAG,MAAM,IAAA,4BAAmB,EACjC,OAAO,CAAC,QAAQ,EAChB,OAAO,CAAC,GAAG,EACX,OAAO,CAAC,KAAK,CAChB,CAAC;IAEF,IAAI,OAAgB,CAAC;IACrB,IAAI,SAAiB,CAAC;IAEtB,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;QACrB,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC;QAC/B,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;IAC/B,CAAC;SAAM,CAAC;QACJ,uDAAuD;QACvD,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;QACzC,MAAM,eAAe,GAAG,UAAU,CAAC,aAAa,CAAC,qBAAW,CAAC,CAAC;QAC9D,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC;YACxC,KAAK,EAAE;gBACH,EAAE,EAAE,OAAO,CAAC,QAAQ;aACvB;YACD,KAAK,EAAE;gBACH,EAAE,EAAE,IAAA,8BAAiB,EAAC;oBAClB,MAAM,EAAE,qBAAW,CAAC,KAAK;oBACzB,GAAG,EAAE,OAAO,CAAC,QAAQ;iBACxB,CAAC;gBACF,YAAY,EAAE,KAAM;aACvB;SACJ,CAAC,CAAC;QAEH,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC;QACvB,OAAO,GAAG,KAAK,CAAC,EAAE,CAAC;IACvB,CAAC;IAED,IAAA,4BAAkB,EAAC,OAAO,EAAE;QACxB,IAAI,EAAE,OAAO,CAAC,QAAQ;QACtB,EAAE,EAAE,OAAO,CAAC,GAAG;QACf,UAAU,EAAE,GAAG;QACf,OAAO;QACP,SAAS;KACZ,CAAC,CAAC;AACP,CAAC"}

package/dist/http/middleware/built-in/authorization/module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../../../src/http/middleware/built-in/authorization/module.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAUrC,wBAAgB,+BAA+B,CAAC,MAAM,EAAE,MAAM,QAoD7D"}
+{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../../../src/http/middleware/built-in/authorization/module.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAUrC,wBAAgB,+BAA+B,CAAC,MAAM,EAAE,MAAM,QAqD7D"}

package/dist/http/middleware/built-in/authorization/module.js

@@ -12,13 +12,21 @@ const routup_1 = require("routup");
 const cookie_1 = require("@routup/basic/cookie");
 const core_http_kit_1 = require("@authup/core-http-kit");
 const kit_1 = require("@authup/kit");
-const typeorm_extension_1 = require("typeorm-extension");
 const config_1 = require("../../../../config");
+const database_1 = require("../../../../database");
 const security_1 = require("../../../../security");
 const request_1 = require("../../../request");
 const verify_1 = require("./verify");
 function registerAuthorizationMiddleware(router) {
     router.use((0, routup_1.coreHandler)(async (request, response, next) => {
+        const dataSource = (0, database_1.useDataSourceSync)();
+        const permissionProvider = new security_1.PermissionDBProvider(dataSource);
+        const permissionChecker = new kit_1.PermissionChecker({
+            provider: permissionProvider,
+            policyEngine: new security_1.PolicyEngine(),
+        });
+        const requestPermissionChecker = new request_1.RequestPermissionChecker(request, permissionChecker);
+        (0, request_1.setRequestPermissionChecker)(request, requestPermissionChecker);
         let { authorization: headerValue } = request.headers;
         try {
             if (typeof headerValue === 'undefined') {
@@ -36,14 +44,6 @@ function registerAuthorizationMiddleware(router) {
             }
             const header = (0, hapic_1.parseAuthorizationHeader)(headerValue);
             await (0, verify_1.verifyAuthorizationHeader)(request, header);
-            const dataSource = await (0, typeorm_extension_1.useDataSource)();
-            const permissionProvider = new security_1.PermissionDBProvider(dataSource);
-            const permissionChecker = new kit_1.PermissionChecker({
-                provider: permissionProvider,
-                policyEngine: new security_1.PolicyEngine(),
-            });
-            const requestPermissionChecker = new request_1.RequestPermissionChecker(request, permissionChecker);
-            (0, request_1.setRequestEnv)(request, 'permissionChecker', requestPermissionChecker);
             next();
         }
         catch (e) {

package/dist/http/middleware/built-in/authorization/module.js.map

@@ -1 +1 @@
-{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../../src/http/middleware/built-in/authorization/module.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAcH,0EAoDC;AAhED,iCAA+E;AAC/E,mCAAyD;AAEzD,iDAAoG;AACpG,yDAAmD;AACnD,qCAAgD;AAChD,yDAAkD;AAClD,+CAA+C;AAC/C,mDAA0E;AAC1E,8CAA2E;AAC3E,qCAAqD;AAErD,SAAgB,+BAA+B,CAAC,MAAc;IAC1D,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,IAAI,CAAC;YACD,IAAI,OAAO,WAAW,KAAK,WAAW,EAAE,CAAC;gBACrC,MAAM,MAAM,GAAG,IAAA,yBAAgB,EAAC,OAAO,EAAE,0BAAU,CAAC,YAAY,CAAC,CAAC;gBAClE,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;YACrD,MAAM,IAAA,kCAAyB,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAEjD,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;YACzC,MAAM,kBAAkB,GAAG,IAAI,+BAAoB,CAAC,UAAU,CAAC,CAAC;YAChE,MAAM,iBAAiB,GAAG,IAAI,uBAAiB,CAAC;gBAC5C,QAAQ,EAAE,kBAAkB;gBAC5B,YAAY,EAAE,IAAI,uBAAY,EAAE;aACnC,CAAC,CAAC;YACH,MAAM,wBAAwB,GAAG,IAAI,kCAAwB,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;YAC1F,IAAA,uBAAa,EAAC,OAAO,EAAE,mBAAmB,EAAE,wBAAwB,CAAC,CAAC;YAEtE,IAAI,EAAE,CAAC;QACX,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;YAC3B,MAAM,aAAa,GAAsB,EAAE,CAAC;YAE5C,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;gBACtB,aAAa,CAAC,MAAM,GAAG,MAAM,CAAC,YAAY,CAAC;YAC/C,CAAC;iBAAM,CAAC;gBACJ,aAAa,CAAC,MAAM,GAAG,IAAA,2BAAkB,EAAC,QAAQ,CAAC,GAAG,EAAE;oBACpD,UAAU,EAAE,IAAI;iBACnB,CAAC,CAAC;YACP,CAAC;YAED,IAAA,4BAAmB,EAAC,QAAQ,EAAE,0BAAU,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;YACtE,IAAA,4BAAmB,EAAC,QAAQ,EAAE,0BAAU,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;YACvE,IAAA,4BAAmB,EAAC,QAAQ,EAAE,0BAAU,CAAC,wBAAwB,EAAE,aAAa,CAAC,CAAC;YAElF,IAAI,CAAC,CAAC,CAAC,CAAC;QACZ,CAAC;IACL,CAAC,CAAC,CAAC,CAAC;AACR,CAAC"}
+{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../../src/http/middleware/built-in/authorization/module.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAcH,0EAqDC;AAjED,iCAA+E;AAC/E,mCAAyD;AAEzD,iDAAoG;AACpG,yDAAmD;AACnD,qCAAgD;AAChD,+CAA+C;AAC/C,mDAAyD;AACzD,mDAA0E;AAC1E,8CAAyF;AACzF,qCAAqD;AAErD,SAAgB,+BAA+B,CAAC,MAAc;IAC1D,MAAM,CAAC,GAAG,CAAC,IAAA,oBAAW,EAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;QACrD,MAAM,UAAU,GAAG,IAAA,4BAAiB,GAAE,CAAC;QACvC,MAAM,kBAAkB,GAAG,IAAI,+BAAoB,CAAC,UAAU,CAAC,CAAC;QAChE,MAAM,iBAAiB,GAAG,IAAI,uBAAiB,CAAC;YAC5C,QAAQ,EAAE,kBAAkB;YAC5B,YAAY,EAAE,IAAI,uBAAY,EAAE;SACnC,CAAC,CAAC;QAEH,MAAM,wBAAwB,GAAG,IAAI,kCAAwB,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;QAC1F,IAAA,qCAA2B,EAAC,OAAO,EAAE,wBAAwB,CAAC,CAAC;QAE/D,IAAI,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;QAErD,IAAI,CAAC;YACD,IAAI,OAAO,WAAW,KAAK,WAAW,EAAE,CAAC;gBACrC,MAAM,MAAM,GAAG,IAAA,yBAAgB,EAAC,OAAO,EAAE,0BAAU,CAAC,YAAY,CAAC,CAAC;gBAClE,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;YACrD,MAAM,IAAA,kCAAyB,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAEjD,IAAI,EAAE,CAAC;QACX,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;YAC3B,MAAM,aAAa,GAAsB,EAAE,CAAC;YAE5C,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;gBACtB,aAAa,CAAC,MAAM,GAAG,MAAM,CAAC,YAAY,CAAC;YAC/C,CAAC;iBAAM,CAAC;gBACJ,aAAa,CAAC,MAAM,GAAG,IAAA,2BAAkB,EAAC,QAAQ,CAAC,GAAG,EAAE;oBACpD,UAAU,EAAE,IAAI;iBACnB,CAAC,CAAC;YACP,CAAC;YAED,IAAA,4BAAmB,EAAC,QAAQ,EAAE,0BAAU,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;YACtE,IAAA,4BAAmB,EAAC,QAAQ,EAAE,0BAAU,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;YACvE,IAAA,4BAAmB,EAAC,QAAQ,EAAE,0BAAU,CAAC,wBAAwB,EAAE,aAAa,CAAC,CAAC;YAElF,IAAI,CAAC,CAAC,CAAC,CAAC;QACZ,CAAC;IACL,CAAC,CAAC,CAAC,CAAC;AACR,CAAC"}

package/dist/http/oauth2/authorize/module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../../src/http/oauth2/authorize/module.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAgBtC,OAAO,KAAK,EAAE,uBAAuB,EAAE,sBAAsB,EAAE,MAAM,QAAQ,CAAC;AAG9E,wBAAsB,sBAAsB,CACxC,GAAG,EAAE,OAAO,EACZ,OAAO,EAAE,uBAAuB,GAChC,OAAO,CAAC,sBAAsB,CAAC,CA4FlC"}
+{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../../src/http/oauth2/authorize/module.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAgBtC,OAAO,KAAK,EAAE,uBAAuB,EAAE,sBAAsB,EAAE,MAAM,QAAQ,CAAC;AAG9E,wBAAsB,sBAAsB,CACxC,GAAG,EAAE,OAAO,EACZ,OAAO,EAAE,uBAAuB,GAChC,OAAO,CAAC,sBAAsB,CAAC,CAiFlC"}

package/dist/http/oauth2/authorize/module.js

@@ -12,10 +12,9 @@ const kit_1 = require("@authup/kit");
 const core_kit_1 = require("@authup/core-kit");
 const routup_1 = require("routup");
 const typeorm_extension_1 = require("typeorm-extension");
-const domains_1 = require("../../../domains");
+const domains_1 = require("../../../database/domains");
 const request_1 = require("../../request");
 const token_1 = require("../token");
-const cache_1 = require("../cache");
 const response_1 = require("../response");
 const validation_1 = require("./validation");
 async function runOAuth2Authorization(req, options) {
@@ -45,9 +44,7 @@ async function runOAuth2Authorization(req, options) {
     if (identity.type === 'robot') {
         entity.robot_id = identity.id;
     }
-    const key = await (0, domains_1.useKey)({
-        realm_id: identity.realmId,
-    });
+    const tokenManager = new token_1.OAuth2TokenManager();
     const tokenBuildContext = {
         issuer: options.issuer,
         remoteAddress: (0, routup_1.getRequestIP)(req, { trustProxy: true }),
@@ -60,23 +57,19 @@ async function runOAuth2Authorization(req, options) {
     };
     if (responseTypes[kit_1.OAuth2AuthorizationResponseType.ID_TOKEN] ||
         (0, core_kit_1.hasOAuth2OpenIDScope)(entity.scope)) {
-        tokenBuildContext.expiresIn = idTokenMaxAge;
-        entity.id_token = await (0, domains_1.signOAuth2TokenWithKey)(await (0, token_1.extendOpenIdTokenPayload)((0, token_1.buildOpenIdTokenPayload)(tokenBuildContext)), key, {
-            keyId: key.id,
-        });
+        tokenBuildContext.maxAge = idTokenMaxAge;
+        const signingResult = await tokenManager.sign(await (0, token_1.extendOpenIdTokenPayload)((0, token_1.buildOpenIdTokenPayload)(tokenBuildContext)));
+        entity.id_token = signingResult.token;
         if (responseTypes[kit_1.OAuth2AuthorizationResponseType.ID_TOKEN]) {
             output.idToken = entity.id_token;
         }
     }
     if (responseTypes[kit_1.OAuth2AuthorizationResponseType.TOKEN]) {
-        tokenBuildContext.expiresIn = accessTokenMaxAge;
-        output.accessToken = await (0, domains_1.signOAuth2TokenWithKey)((0, token_1.buildOAuth2AccessTokenPayload)(tokenBuildContext), key, {
-            keyId: key.id,
-        });
+        tokenBuildContext.maxAge = accessTokenMaxAge;
+        const signingResult = await tokenManager.sign((0, token_1.buildOAuth2AccessTokenPayload)(tokenBuildContext));
+        output.accessToken = signingResult.token;
     }
     await repository.save(entity);
-    const cache = new cache_1.OAuth2AuthorizationCodeCache();
-    await cache.set(entity);
     if (responseTypes[kit_1.OAuth2AuthorizationResponseType.CODE]) {
         output.authorizationCode = entity.content;
     }

package/dist/http/oauth2/authorize/module.js.map

@@ -1 +1 @@
-{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../src/http/oauth2/authorize/module.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AA6BH,wDA+FC;AA1HD,6CAA0C;AAE1C,qCAEqB;AACrB,+CAE0B;AAE1B,mCAAsC;AACtC,yDAAkD;AAClD,8CAAiG;AACjG,2CAAyD;AAKzD,oCAIkB;AAClB,oCAAwD;AACxD,0CAAuE;AAEvE,6CAAwD;AAEjD,KAAK,UAAU,sBAAsB,CACxC,GAAY,EACZ,OAAgC;IAEhC,MAAM,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,IAAI,IAAI,CAAC;IAC5D,MAAM,uBAAuB,GAAG,OAAO,CAAC,uBAAuB,IAAI,GAAG,CAAC;IACvE,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,IAAI,IAAI,CAAC;IAEpD,MAAM,IAAI,GAAG,MAAM,IAAA,qCAAwB,EAAC,GAAG,CAAC,CAAC;IAEjD,MAAM,aAAa,GAAG,IAAA,mDAAwC,EAAC,GAAG,CAAC,CAAC;IAEpE,MAAM,MAAM,GAA4B;QACpC,WAAW,EAAE,IAAI,CAAC,YAAY;QAC9B,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC/C,CAAC;IAEF,MAAM,QAAQ,GAAG,IAAA,kCAAwB,EAAC,GAAG,CAAC,CAAC;IAE/C,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,uCAA6B,CAAC,CAAC;IAE3E,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;QAC7B,OAAO,EAAE,IAAA,yBAAW,EAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC;QACxC,OAAO,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,GAAG,uBAAuB,CAAC,CAAC,CAAC,WAAW,EAAE;QAC9E,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,QAAQ,EAAE,QAAQ,CAAC,OAAO;QAC1B,KAAK,EAAE,IAAI,CAAC,KAAK;KACpB,CAAC,CAAC;IAEH,IAAI,QAAQ,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAC3B,MAAM,CAAC,OAAO,GAAG,QAAQ,CAAC,EAAE,CAAC;IACjC,CAAC;IAED,IAAI,QAAQ,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QAC5B,MAAM,CAAC,QAAQ,GAAG,QAAQ,CAAC,EAAE,CAAC;IAClC,CAAC;IAED,MAAM,GAAG,GAAG,MAAM,IAAA,gBAAM,EAAC;QACrB,QAAQ,EAAE,QAAQ,CAAC,OAAO;KAC7B,CAAC,CAAC;IAEH,MAAM,iBAAiB,GAAmE;QACtF,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,aAAa,EAAE,IAAA,qBAAY,EAAC,GAAG,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;QACtD,GAAG,EAAE,QAAQ,CAAC,EAAE;QAChB,OAAO,EAAE,QAAQ,CAAC,IAA0B;QAC5C,OAAO,EAAE,QAAQ,CAAC,OAAO;QACzB,SAAS,EAAE,QAAQ,CAAC,SAAS;QAC7B,QAAQ,EAAE,IAAI,CAAC,SAAS;QACxB,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC/C,CAAC;IAEF,IACI,aAAa,CAAC,qCAA+B,CAAC,QAAQ,CAAC;QACvD,IAAA,+BAAoB,EAAC,MAAM,CAAC,KAAK,CAAC,EACpC,CAAC;QACC,iBAAiB,CAAC,SAAS,GAAG,aAAa,CAAC;QAE5C,MAAM,CAAC,QAAQ,GAAG,MAAM,IAAA,gCAAsB,EAC1C,MAAM,IAAA,gCAAwB,EAAC,IAAA,+BAAuB,EAAC,iBAAiB,CAAC,CAAC,EAC1E,GAAG,EACH;YACI,KAAK,EAAE,GAAG,CAAC,EAAE;SAChB,CACJ,CAAC;QAEF,IAAI,aAAa,CAAC,qCAA+B,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC1D,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC;QACrC,CAAC;IACL,CAAC;IAED,IAAI,aAAa,CAAC,qCAA+B,CAAC,KAAK,CAAC,EAAE,CAAC;QACvD,iBAAiB,CAAC,SAAS,GAAG,iBAAiB,CAAC;QAEhD,MAAM,CAAC,WAAW,GAAG,MAAM,IAAA,gCAAsB,EAC7C,IAAA,qCAA6B,EAAC,iBAAiB,CAAC,EAChD,GAAG,EACH;YACI,KAAK,EAAE,GAAG,CAAC,EAAE;SAChB,CACJ,CAAC;IACN,CAAC;IAED,MAAM,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAE9B,MAAM,KAAK,GAAG,IAAI,oCAA4B,EAAE,CAAC;IACjD,MAAM,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAExB,IAAI,aAAa,CAAC,qCAA+B,CAAC,IAAI,CAAC,EAAE,CAAC;QACtD,MAAM,CAAC,iBAAiB,GAAG,MAAM,CAAC,OAAO,CAAC;IAC9C,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC"}
+{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../src/http/oauth2/authorize/module.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AA6BH,wDAoFC;AA/GD,6CAA0C;AAE1C,qCAEqB;AACrB,+CAE0B;AAE1B,mCAAsC;AACtC,yDAAkD;AAClD,uDAA0E;AAC1E,2CAAyD;AAKzD,oCAKkB;AAClB,0CAAuE;AAEvE,6CAAwD;AAEjD,KAAK,UAAU,sBAAsB,CACxC,GAAY,EACZ,OAAgC;IAEhC,MAAM,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,IAAI,IAAI,CAAC;IAC5D,MAAM,uBAAuB,GAAG,OAAO,CAAC,uBAAuB,IAAI,GAAG,CAAC;IACvE,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,IAAI,IAAI,CAAC;IAEpD,MAAM,IAAI,GAAG,MAAM,IAAA,qCAAwB,EAAC,GAAG,CAAC,CAAC;IAEjD,MAAM,aAAa,GAAG,IAAA,mDAAwC,EAAC,GAAG,CAAC,CAAC;IAEpE,MAAM,MAAM,GAA4B;QACpC,WAAW,EAAE,IAAI,CAAC,YAAY;QAC9B,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC/C,CAAC;IAEF,MAAM,QAAQ,GAAG,IAAA,kCAAwB,EAAC,GAAG,CAAC,CAAC;IAE/C,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,uCAA6B,CAAC,CAAC;IAE3E,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;QAC7B,OAAO,EAAE,IAAA,yBAAW,EAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC;QACxC,OAAO,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,GAAG,uBAAuB,CAAC,CAAC,CAAC,WAAW,EAAE;QAC9E,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,QAAQ,EAAE,QAAQ,CAAC,OAAO;QAC1B,KAAK,EAAE,IAAI,CAAC,KAAK;KACpB,CAAC,CAAC;IAEH,IAAI,QAAQ,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAC3B,MAAM,CAAC,OAAO,GAAG,QAAQ,CAAC,EAAE,CAAC;IACjC,CAAC;IAED,IAAI,QAAQ,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QAC5B,MAAM,CAAC,QAAQ,GAAG,QAAQ,CAAC,EAAE,CAAC;IAClC,CAAC;IAED,MAAM,YAAY,GAAG,IAAI,0BAAkB,EAAE,CAAC;IAC9C,MAAM,iBAAiB,GAAmE;QACtF,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,aAAa,EAAE,IAAA,qBAAY,EAAC,GAAG,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;QACtD,GAAG,EAAE,QAAQ,CAAC,EAAE;QAChB,OAAO,EAAE,QAAQ,CAAC,IAA0B;QAC5C,OAAO,EAAE,QAAQ,CAAC,OAAO;QACzB,SAAS,EAAE,QAAQ,CAAC,SAAS;QAC7B,QAAQ,EAAE,IAAI,CAAC,SAAS;QACxB,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC/C,CAAC;IAEF,IACI,aAAa,CAAC,qCAA+B,CAAC,QAAQ,CAAC;QACvD,IAAA,+BAAoB,EAAC,MAAM,CAAC,KAAK,CAAC,EACpC,CAAC;QACC,iBAAiB,CAAC,MAAM,GAAG,aAAa,CAAC;QAEzC,MAAM,aAAa,GAAG,MAAM,YAAY,CAAC,IAAI,CACzC,MAAM,IAAA,gCAAwB,EAAC,IAAA,+BAAuB,EAAC,iBAAiB,CAAC,CAAC,CAC7E,CAAC;QACF,MAAM,CAAC,QAAQ,GAAG,aAAa,CAAC,KAAK,CAAC;QAEtC,IAAI,aAAa,CAAC,qCAA+B,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC1D,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC;QACrC,CAAC;IACL,CAAC;IAED,IAAI,aAAa,CAAC,qCAA+B,CAAC,KAAK,CAAC,EAAE,CAAC;QACvD,iBAAiB,CAAC,MAAM,GAAG,iBAAiB,CAAC;QAE7C,MAAM,aAAa,GAAG,MAAM,YAAY,CAAC,IAAI,CACzC,IAAA,qCAA6B,EAAC,iBAAiB,CAAC,CACnD,CAAC;QAEF,MAAM,CAAC,WAAW,GAAG,aAAa,CAAC,KAAK,CAAC;IAC7C,CAAC;IAED,MAAM,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAE9B,IAAI,aAAa,CAAC,qCAA+B,CAAC,IAAI,CAAC,EAAE,CAAC;QACtD,MAAM,CAAC,iBAAiB,GAAG,MAAM,CAAC,OAAO,CAAC;IAC9C,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC"}

package/dist/http/oauth2/authorize/validation.js

@@ -15,7 +15,7 @@ const adapter_validator_1 = require("@validup/adapter-validator");
 const typeorm_extension_1 = require("typeorm-extension");
 const validup_1 = require("validup");
 const adapter_routup_1 = require("@validup/adapter-routup");
-const domains_1 = require("../../../domains");
+const domains_1 = require("../../../database/domains");
 class AuthorizeRequestValidator extends validup_1.Container {
     constructor() {
         super();

package/dist/http/oauth2/authorize/validation.js.map

@@ -1 +1 @@
-{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../../src/http/oauth2/authorize/validation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../../src/http/oauth2/authorize/validation.ts"],"names":[],"mappings":"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"}

package/dist/http/oauth2/constants.d.ts

@@ -0,0 +1,5 @@
+export declare enum OAuth2CachePrefix {
+    TOKEN_CLAIMS = "oauth2_token_claims",
+    TOKEN_INACTIVE = "oauth2_token_blocked"
+}
+//# sourceMappingURL=constants.d.ts.map

package/dist/http/oauth2/constants.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/http/oauth2/constants.ts"],"names":[],"mappings":"AAOA,oBAAY,iBAAiB;IACzB,YAAY,wBAAwB;IACpC,cAAc,yBAAyB;CAC1C"}

package/dist/http/oauth2/constants.js

@@ -0,0 +1,15 @@
+"use strict";
+/*
+ * Copyright (c) 2024-2024.
+ * Author Peter Placzek (tada5hi)
+ * For the full copyright and license information,
+ * view the LICENSE file that was distributed with this source code.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OAuth2CachePrefix = void 0;
+var OAuth2CachePrefix;
+(function (OAuth2CachePrefix) {
+    OAuth2CachePrefix["TOKEN_CLAIMS"] = "oauth2_token_claims";
+    OAuth2CachePrefix["TOKEN_INACTIVE"] = "oauth2_token_blocked";
+})(OAuth2CachePrefix || (exports.OAuth2CachePrefix = OAuth2CachePrefix = {}));
+//# sourceMappingURL=constants.js.map

package/dist/http/oauth2/constants.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/http/oauth2/constants.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,IAAY,iBAGX;AAHD,WAAY,iBAAiB;IACzB,yDAAoC,CAAA;IACpC,4DAAuC,CAAA;AAC3C,CAAC,EAHW,iBAAiB,iCAAjB,iBAAiB,QAG5B"}

package/dist/http/oauth2/grant-types/abstract.d.ts

@@ -1,12 +1,12 @@
 import type { OAuth2TokenPayload } from '@authup/kit';
 import type { Config } from '../../../config';
-import { OAuth2RefreshTokenCache } from '../cache';
-import type { AccessTokenIssueContext } from './type';
+import { OAuth2TokenManager } from '../token';
+import type { AccessTokenIssueContext, TokenIssueResult } from './type';
 export declare abstract class AbstractGrant {
     protected config: Config;
-    protected refreshTokenCache: OAuth2RefreshTokenCache;
+    protected tokenManager: OAuth2TokenManager;
     constructor();
-    protected issueAccessToken(context: AccessTokenIssueContext): Promise<Partial<OAuth2TokenPayload>>;
-    protected issueRefreshToken(accessToken: Partial<OAuth2TokenPayload>): Promise<Partial<OAuth2TokenPayload>>;
+    protected issueAccessToken(context: AccessTokenIssueContext): Promise<TokenIssueResult>;
+    protected issueRefreshToken(accessToken: OAuth2TokenPayload): Promise<TokenIssueResult>;
 }
 //# sourceMappingURL=abstract.d.ts.map

package/dist/http/oauth2/grant-types/abstract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"abstract.d.ts","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/abstract.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAGtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAO9C,OAAO,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAC;AACnD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,QAAQ,CAAC;AAEtD,8BAAsB,aAAa;IAC/B,SAAS,CAAC,MAAM,EAAG,MAAM,CAAC;IAE1B,SAAS,CAAC,iBAAiB,EAAG,uBAAuB,CAAC;;cAYtC,gBAAgB,CAAC,OAAO,EAAE,uBAAuB,GAAI,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;cAazF,iBAAiB,CAAC,WAAW,EAAE,OAAO,CAAC,kBAAkB,CAAC,GAAI,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;CAmBrH"}
+{"version":3,"file":"abstract.d.ts","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/abstract.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAItD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EACH,kBAAkB,EAGrB,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,EAAE,uBAAuB,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAC;AAExE,8BAAsB,aAAa;IAC/B,SAAS,CAAC,MAAM,EAAG,MAAM,CAAC;IAE1B,SAAS,CAAC,YAAY,EAAG,kBAAkB,CAAC;;cAY5B,gBAAgB,CAC5B,OAAO,EAAE,uBAAuB,GAChC,OAAO,CAAC,gBAAgB,CAAC;cAgBb,iBAAiB,CAC7B,WAAW,EAAE,kBAAkB,GAC/B,OAAO,CAAC,gBAAgB,CAAC;CAgChC"}

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

@@ -7,20 +7,20 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbstractGrant = void 0;
+const kit_1 = require("@authup/kit");
 const typeorm_extension_1 = require("typeorm-extension");
-const domains_1 = require("../../../domains");
+const domains_1 = require("../../../database/domains");
 const config_1 = require("../../../config");
 const token_1 = require("../token");
-const cache_1 = require("../cache");
 class AbstractGrant {
     // -----------------------------------------------------
     constructor() {
         this.config = (0, config_1.useConfig)();
-        this.refreshTokenCache = new cache_1.OAuth2RefreshTokenCache();
+        this.tokenManager = new token_1.OAuth2TokenManager();
     }
     // -----------------------------------------------------
     async issueAccessToken(context) {
-        return (0, token_1.buildOAuth2AccessTokenPayload)({
+        const raw = (0, token_1.buildOAuth2AccessTokenPayload)({
             issuer: this.config.publicUrl,
             realmId: context.realmId,
             realmName: context.realmName,
@@ -29,17 +29,36 @@ class AbstractGrant {
             remoteAddress: context.remoteAddress,
             scope: context.scope,
             clientId: context.clientId,
+            maxAge: this.config.tokenAccessMaxAge,
         });
+        return this.tokenManager.sign(raw);
     }
     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.tokenRefreshMaxAge));
-        await repository.insert(token);
-        await this.refreshTokenCache.set(token);
-        return (0, token_1.transformToRefreshTokenPayload)(accessToken, {
-            id: token.id,
+        const entity = repository.create({
+            client_id: accessToken.client_id,
+            expires: new Date(Date.now() + (1000 * this.config.tokenRefreshMaxAge)).toISOString(),
+            scope: accessToken.scope,
+            access_token: accessToken.jti,
+            realm_id: accessToken.realm_id,
+            ...(accessToken.sub_kind === kit_1.OAuth2SubKind.USER ? { user_id: accessToken.sub } : {}),
+            ...(accessToken.sub_kind === kit_1.OAuth2SubKind.ROBOT ? { robot_id: accessToken.sub } : {}),
         });
+        await repository.insert(entity);
+        const payload = (0, token_1.buildOAuth2RefreshTokenPayload)({
+            issuer: accessToken.iss,
+            remoteAddress: accessToken.remote_address,
+            sub: accessToken.sub,
+            subKind: accessToken.sub_kind,
+            clientId: accessToken.client_id,
+            realmId: accessToken.realm_id,
+            realmName: accessToken.realm_name,
+            scope: accessToken.scope,
+            maxAge: this.config.tokenRefreshMaxAge,
+        });
+        payload.jti = entity.id;
+        return this.tokenManager.sign(payload);
     }
 }
 exports.AbstractGrant = AbstractGrant;