@authup/server-core 1.0.0-beta.19 → 1.0.0-beta.20

package/dist/http/middleware/built-in/logger.js

@@ -14,7 +14,8 @@ const morgan_1 = __importDefault(require("morgan"));
 const routup_1 = require("routup");
 const server_kit_1 = require("@authup/server-kit");
 const config_1 = require("../../../config");
-const utils_1 = require("../../utils");
+const env_1 = require("../../../env");
+const request_1 = require("../../request");
 function registerLoggerMiddleware(router) {
     router.use((0, routup_1.coreHandler)((request, response, next) => {
         const config = (0, config_1.useConfig)();
@@ -22,19 +23,9 @@ function registerLoggerMiddleware(router) {
             const parts = [
                 (0, routup_1.getRequestIP)(req, { trustProxy: true }),
             ];
-            const userId = (0, utils_1.useRequestEnv)(req, 'userId');
-            const robotId = (0, utils_1.useRequestEnv)(req, 'robotId');
-            const clientId = (0, utils_1.useRequestEnv)(req, 'clientId');
-            if (userId || robotId || clientId) {
-                if (userId) {
-                    parts.push(`user#${userId}`);
-                }
-                else if (robotId) {
-                    parts.push(`robot#${robotId}`);
-                }
-                else {
-                    parts.push(`client#${clientId}`);
-                }
+            const identity = (0, request_1.useRequestIdentity)(req);
+            if (identity) {
+                parts.push(`${identity.type}#${identity.id}`);
             }
             return [
                 ...parts,
@@ -48,7 +39,7 @@ function registerLoggerMiddleware(router) {
         }, {
             stream: {
                 write(message) {
-                    if (config.env !== config_1.EnvironmentName.TEST) {
+                    if (config.env !== env_1.EnvironmentName.TEST) {
                         (0, server_kit_1.useLogger)()
                             .http(message.replace('\n', ''));
                     }
@@ -59,7 +50,7 @@ function registerLoggerMiddleware(router) {
                 if (path.length === 0 || path === '/') {
                     return true;
                 }
-                if (config.env === config_1.EnvironmentName.PRODUCTION) {
+                if (config.env === env_1.EnvironmentName.PRODUCTION) {
                     return res.statusCode < 400;
                 }
                 return false;

package/dist/http/middleware/built-in/logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../src/http/middleware/built-in/logger.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;AAWH,4DA8DC;AAvED,oDAA4B;AAI5B,mCAAmE;AACnE,mDAA+C;AAC/C,4CAA6D;AAC7D,uCAA4C;AAE5C,SAAgB,wBAAwB,CAAC,MAAc;IACnD,MAAM,CAAC,GAAG,CAAC,IAAA,oBAAW,EAAC,CACnB,OAAgB,EAChB,QAAkB,EAClB,IAAU,EACZ,EAAE;QACA,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;QAE3B,IAAA,gBAAM,EACF,CAAC,MAAM,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;YACpC,MAAM,KAAK,GAAG;gBACV,IAAA,qBAAY,EAAC,GAAG,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;aAC1C,CAAC;YAEF,MAAM,MAAM,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YAC5C,MAAM,OAAO,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;YAC9C,MAAM,QAAQ,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,UAAU,CAAC,CAAC;YAEhD,IAAI,MAAM,IAAI,OAAO,IAAI,QAAQ,EAAE,CAAC;gBAChC,IAAI,MAAM,EAAE,CAAC;oBACT,KAAK,CAAC,IAAI,CAAC,QAAQ,MAAM,EAAE,CAAC,CAAC;gBACjC,CAAC;qBAAM,IAAI,OAAO,EAAE,CAAC;oBACjB,KAAK,CAAC,IAAI,CAAC,SAAS,OAAO,EAAE,CAAC,CAAC;gBACnC,CAAC;qBAAM,CAAC;oBACJ,KAAK,CAAC,IAAI,CAAC,UAAU,QAAQ,EAAE,CAAC,CAAC;gBACrC,CAAC;YACL,CAAC;YAED,OAAO;gBACH,GAAG,KAAK;gBACR,GAAG;gBACH,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC;gBACvB,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC;gBACpB,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC;gBACvB,GAAG;gBACH,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI;aAC3C,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAChB,CAAC,EACD;YACI,MAAM,EAAE;gBACJ,KAAK,CAAC,OAAO;oBACT,IAAI,MAAM,CAAC,GAAG,KAAK,wBAAe,CAAC,IAAI,EAAE,CAAC;wBACtC,IAAA,sBAAS,GAAE;6BACN,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;oBACzC,CAAC;gBACL,CAAC;aACJ;YACD,IAAI,CAAC,GAAY,EAAE,GAAa;gBAC5B,MAAM,IAAI,GAAG,IAAA,uBAAc,EAAC,GAAG,CAAC,CAAC;gBACjC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;oBACpC,OAAO,IAAI,CAAC;gBAChB,CAAC;gBAED,IAAI,MAAM,CAAC,GAAG,KAAK,wBAAe,CAAC,UAAU,EAAE,CAAC;oBAC5C,OAAO,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;gBAChC,CAAC;gBAED,OAAO,KAAK,CAAC;YACjB,CAAC;SACJ,CACJ,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;IAC/B,CAAC,CAAC,CAAC,CAAC;AACR,CAAC"}
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../src/http/middleware/built-in/logger.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;AAYH,4DAqDC;AA/DD,oDAA4B;AAI5B,mCAAmE;AACnE,mDAA+C;AAC/C,4CAA4C;AAC5C,sCAA+C;AAC/C,2CAAmD;AAEnD,SAAgB,wBAAwB,CAAC,MAAc;IACnD,MAAM,CAAC,GAAG,CAAC,IAAA,oBAAW,EAAC,CACnB,OAAgB,EAChB,QAAkB,EAClB,IAAU,EACZ,EAAE;QACA,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;QAE3B,IAAA,gBAAM,EACF,CAAC,MAAM,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;YACpC,MAAM,KAAK,GAAG;gBACV,IAAA,qBAAY,EAAC,GAAG,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;aAC1C,CAAC;YAEF,MAAM,QAAQ,GAAG,IAAA,4BAAkB,EAAC,GAAG,CAAC,CAAC;YACzC,IAAI,QAAQ,EAAE,CAAC;gBACX,KAAK,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC;YAClD,CAAC;YAED,OAAO;gBACH,GAAG,KAAK;gBACR,GAAG;gBACH,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC;gBACvB,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC;gBACpB,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC;gBACvB,GAAG;gBACH,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI;aAC3C,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAChB,CAAC,EACD;YACI,MAAM,EAAE;gBACJ,KAAK,CAAC,OAAO;oBACT,IAAI,MAAM,CAAC,GAAG,KAAK,qBAAe,CAAC,IAAI,EAAE,CAAC;wBACtC,IAAA,sBAAS,GAAE;6BACN,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;oBACzC,CAAC;gBACL,CAAC;aACJ;YACD,IAAI,CAAC,GAAY,EAAE,GAAa;gBAC5B,MAAM,IAAI,GAAG,IAAA,uBAAc,EAAC,GAAG,CAAC,CAAC;gBACjC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;oBACpC,OAAO,IAAI,CAAC;gBAChB,CAAC;gBAED,IAAI,MAAM,CAAC,GAAG,KAAK,qBAAe,CAAC,UAAU,EAAE,CAAC;oBAC5C,OAAO,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;gBAChC,CAAC;gBAED,OAAO,KAAK,CAAC;YACjB,CAAC;SACJ,CACJ,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;IAC/B,CAAC,CAAC,CAAC,CAAC;AACR,CAAC"}

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

@@ -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;AAK9C,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,YAAY,QAoC/E"}
+{"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,QAiC/E"}

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

@@ -11,27 +11,25 @@ const core_kit_1 = require("@authup/core-kit");
 const rate_limit_1 = require("@routup/rate-limit");
 const smob_1 = require("smob");
 const config_1 = require("../../../config");
-const utils_1 = require("../../utils");
+const request_1 = require("../../request");
 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_kit_1.REALM_MASTER_NAME &&
-                    robot.name === config.robotAdminName) {
-                    return true;
-                }
-            }
-            return false;
+            const identity = (0, request_1.useRequestIdentity)(req);
+            return identity &&
+                identity.type === 'robot' &&
+                identity.realmName === core_kit_1.REALM_MASTER_NAME &&
+                !!identity.attributes &&
+                identity.attributes.name === config.robotAdminName;
         },
         max(req) {
-            if ((0, utils_1.useRequestEnv)(req, 'userId')) {
+            const identity = (0, request_1.useRequestIdentity)(req);
+            if (identity && identity.type === 'user') {
                 return 60 * 100; // 100 req p. sec
             }
-            const robot = (0, utils_1.useRequestEnv)(req, 'robot');
-            if (robot) {
+            if (identity &&
+                (identity.type === 'robot' || identity.type === 'client')) {
                 return 60 * 1000; // 1000 req p. sec
             }
             return 60 * 20; // 20 req p. sec

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

@@ -1 +1 @@
-{"version":3,"file":"rate-limit.js","sourceRoot":"","sources":["../../../../src/http/middleware/built-in/rate-limit.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAUH,kEAoCC;AA5CD,+CAAqD;AAErD,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,4BAAiB;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"}
+{"version":3,"file":"rate-limit.js","sourceRoot":"","sources":["../../../../src/http/middleware/built-in/rate-limit.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAUH,kEAiCC;AAzCD,+CAAqD;AAErD,mDAA+C;AAE/C,+BAA6B;AAC7B,4CAA4C;AAC5C,2CAAmD;AAEnD,SAAgB,2BAA2B,CAAC,MAAc,EAAE,KAAoB;IAC5E,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;IAC3B,IAAI,OAAO,GAAkB;QACzB,IAAI,CAAC,GAAY;YACb,MAAM,QAAQ,GAAG,IAAA,4BAAkB,EAAC,GAAG,CAAC,CAAC;YAEzC,OAAO,QAAQ;gBACX,QAAQ,CAAC,IAAI,KAAK,OAAO;gBACzB,QAAQ,CAAC,SAAS,KAAK,4BAAiB;gBACxC,CAAC,CAAC,QAAQ,CAAC,UAAU;gBACrB,QAAQ,CAAC,UAAU,CAAC,IAAI,KAAK,MAAM,CAAC,cAAc,CAAC;QAC3D,CAAC;QACD,GAAG,CAAC,GAAY;YACZ,MAAM,QAAQ,GAAG,IAAA,4BAAkB,EAAC,GAAG,CAAC,CAAC;YACzC,IAAI,QAAQ,IAAI,QAAQ,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;gBACvC,OAAO,EAAE,GAAG,GAAG,CAAC,CAAC,iBAAiB;YACtC,CAAC;YAED,IACI,QAAQ;gBACR,CAAC,QAAQ,CAAC,IAAI,KAAK,OAAO,IAAI,QAAQ,CAAC,IAAI,KAAK,QAAQ,CAAC,EAC3D,CAAC;gBACC,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"}

package/dist/http/middleware/module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../src/http/middleware/module.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAerC,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,QAkCjD"}
+{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../src/http/middleware/module.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAgBrC,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,QAkCjD"}

package/dist/http/middleware/module.js

@@ -40,6 +40,6 @@ function registerMiddlewares(router) {
             },
         });
     }
-    (0, built_in_1.registerAuthMiddleware)(router);
+    (0, built_in_1.registerAuthorizationMiddleware)(router);
 }
 //# sourceMappingURL=module.js.map

package/dist/http/middleware/module.js.map

@@ -1 +1 @@
-{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../src/http/middleware/module.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;AAkBH,kDAkCC;AAlDD,0DAA6B;AAE7B,yCAAyC;AACzC,yCAOoB;AACpB,mCAGiB;AAEjB,SAAgB,mBAAmB,CAAC,MAAc;IAC9C,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;IAE3B,IAAA,mCAAwB,EAAC,MAAM,CAAC,CAAC;IAEjC,MAAM,IAAI,GAAG,MAAM,CAAC,cAAc,CAAC;IACnC,IAAI,IAAA,kCAA0B,EAAC,IAAI,CAAC,EAAE,CAAC;QACnC,IAAA,iCAAsB,EAAC,MAAM,EAAE,IAAA,kCAA0B,EAAC,IAAI,CAAC,CAAC,CAAC;IACrE,CAAC;IAED,IAAA,kCAAuB,EAAC,MAAM,CAAC,CAAC;IAEhC,MAAM,UAAU,GAAG,MAAM,CAAC,oBAAoB,CAAC;IAC/C,IAAI,IAAA,kCAA0B,EAAC,UAAU,CAAC,EAAE,CAAC;QACzC,IAAA,uCAA4B,EAAC,MAAM,EAAE,IAAA,kCAA0B,EAAC,UAAU,CAAC,CAAC,CAAC;IACjF,CAAC;IAED,MAAM,SAAS,GAAG,MAAM,CAAC,mBAAmB,CAAC;IAC7C,IAAI,IAAA,kCAA0B,EAAC,SAAS,CAAC,EAAE,CAAC;QACxC,IAAA,sCAA2B,EAAC,MAAM,EAAE,IAAA,kCAA0B,EAAC,SAAS,CAAC,CAAC,CAAC;IAC/E,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,CAAC,iBAAiB,CAAC;IACzC,IAAI,IAAA,kCAA0B,EAAC,OAAO,CAAC,EAAE,CAAC;QACtC,IAAA,oCAAyB,EAAC,MAAM,EAAE;YAC9B,YAAY,EAAE,mBAAI,CAAC,IAAI,CAAC,MAAM,CAAC,qBAAqB,EAAE,cAAc,CAAC;YACrE,OAAO,EAAE;gBACL,OAAO,EAAE,MAAM,CAAC,SAAS;gBACzB,GAAG,IAAA,kCAA0B,EAAC,OAAO,CAAC;aACzC;SACJ,CAAC,CAAC;IACP,CAAC;IAED,IAAA,iCAAsB,EAAC,MAAM,CAAC,CAAC;AACnC,CAAC"}
+{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../src/http/middleware/module.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;AAmBH,kDAkCC;AAnDD,0DAA6B;AAE7B,yCAAyC;AACzC,yCAQoB;AACpB,mCAGiB;AAEjB,SAAgB,mBAAmB,CAAC,MAAc;IAC9C,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;IAE3B,IAAA,mCAAwB,EAAC,MAAM,CAAC,CAAC;IAEjC,MAAM,IAAI,GAAG,MAAM,CAAC,cAAc,CAAC;IACnC,IAAI,IAAA,kCAA0B,EAAC,IAAI,CAAC,EAAE,CAAC;QACnC,IAAA,iCAAsB,EAAC,MAAM,EAAE,IAAA,kCAA0B,EAAC,IAAI,CAAC,CAAC,CAAC;IACrE,CAAC;IAED,IAAA,kCAAuB,EAAC,MAAM,CAAC,CAAC;IAEhC,MAAM,UAAU,GAAG,MAAM,CAAC,oBAAoB,CAAC;IAC/C,IAAI,IAAA,kCAA0B,EAAC,UAAU,CAAC,EAAE,CAAC;QACzC,IAAA,uCAA4B,EAAC,MAAM,EAAE,IAAA,kCAA0B,EAAC,UAAU,CAAC,CAAC,CAAC;IACjF,CAAC;IAED,MAAM,SAAS,GAAG,MAAM,CAAC,mBAAmB,CAAC;IAC7C,IAAI,IAAA,kCAA0B,EAAC,SAAS,CAAC,EAAE,CAAC;QACxC,IAAA,sCAA2B,EAAC,MAAM,EAAE,IAAA,kCAA0B,EAAC,SAAS,CAAC,CAAC,CAAC;IAC/E,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,CAAC,iBAAiB,CAAC;IACzC,IAAI,IAAA,kCAA0B,EAAC,OAAO,CAAC,EAAE,CAAC;QACtC,IAAA,oCAAyB,EAAC,MAAM,EAAE;YAC9B,YAAY,EAAE,mBAAI,CAAC,IAAI,CAAC,MAAM,CAAC,qBAAqB,EAAE,cAAc,CAAC;YACrE,OAAO,EAAE;gBACL,OAAO,EAAE,MAAM,CAAC,SAAS;gBACzB,GAAG,IAAA,kCAA0B,EAAC,OAAO,CAAC;aACzC;SACJ,CAAC,CAAC;IACP,CAAC;IAED,IAAA,0CAA+B,EAAC,MAAM,CAAC,CAAC;AAC5C,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,CAmFlC"}
+{"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"}

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

@@ -13,7 +13,7 @@ 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 utils_1 = require("../../utils");
+const request_1 = require("../../request");
 const token_1 = require("../token");
 const cache_1 = require("../cache");
 const response_1 = require("../response");
@@ -28,7 +28,7 @@ async function runOAuth2Authorization(req, options) {
         redirectUri: data.redirect_uri,
         ...(data.state ? { state: data.state } : {}),
     };
-    const { id: realmId, name: realmName } = (0, utils_1.useRequestEnv)(req, 'realm');
+    const identity = (0, request_1.useRequestIdentityOrFail)(req);
     const dataSource = await (0, typeorm_extension_1.useDataSource)();
     const repository = dataSource.getRepository(domains_1.OAuth2AuthorizationCodeEntity);
     const entity = repository.create({
@@ -36,18 +36,25 @@ async function runOAuth2Authorization(req, options) {
         expires: new Date(Date.now() + (1000 * authorizationCodeMaxAge)).toISOString(),
         redirect_uri: data.redirect_uri,
         client_id: data.client_id,
-        user_id: (0, utils_1.useRequestEnv)(req, 'userId'),
-        realm_id: realmId,
+        realm_id: identity.realmId,
         scope: data.scope,
     });
-    const key = await (0, domains_1.useKey)({ realm_id: realmId });
+    if (identity.type === 'user') {
+        entity.user_id = identity.id;
+    }
+    if (identity.type === 'robot') {
+        entity.robot_id = identity.id;
+    }
+    const key = await (0, domains_1.useKey)({
+        realm_id: identity.realmId,
+    });
     const tokenBuildContext = {
         issuer: options.issuer,
         remoteAddress: (0, routup_1.getRequestIP)(req, { trustProxy: true }),
-        sub: (0, utils_1.useRequestEnv)(req, 'userId'),
-        subKind: kit_1.OAuth2SubKind.USER,
-        realmId,
-        realmName,
+        sub: identity.id,
+        subKind: identity.type,
+        realmId: identity.realmId,
+        realmName: identity.realmName,
         clientId: data.client_id,
         ...(data.scope ? { scope: data.scope } : {}),
     };

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

package/dist/http/oauth2/authorize/validation.d.ts

@@ -1,10 +1,10 @@
 import type { OAuth2AuthorizationCodeRequest } from '@authup/core-kit';
 import type { Request } from 'routup';
-import { RequestValidator } from '../../../core';
+import { Container } from 'validup';
 type AuthorizeValidationResult = OAuth2AuthorizationCodeRequest & {
     client_id: string;
 };
-export declare class AuthorizeRequestValidator extends RequestValidator<AuthorizeValidationResult> {
+export declare class AuthorizeRequestValidator extends Container<AuthorizeValidationResult> {
     constructor();
 }
 export declare function validateAuthorizeRequest(req: Request): Promise<AuthorizeValidationResult>;

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

@@ -1 +1 @@
-{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../../../src/http/oauth2/authorize/validation.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,kBAAkB,CAAC;AASvE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAGjD,KAAK,yBAAyB,GAAG,8BAA8B,GAAG;IAC9D,SAAS,EAAE,MAAM,CAAA;CACpB,CAAC;AAEF,qBAAa,yBAA0B,SAAQ,gBAAgB,CAAC,yBAAyB,CAAC;;CA8CzF;AAED,wBAAsB,wBAAwB,CAC1C,GAAG,EAAE,OAAO,GACZ,OAAO,CAAC,yBAAyB,CAAC,CAkCrC"}
+{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../../../src/http/oauth2/authorize/validation.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,kBAAkB,CAAC;AAUvE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAIpC,KAAK,yBAAyB,GAAG,8BAA8B,GAAG;IAC9D,SAAS,EAAE,MAAM,CAAA;CACpB,CAAC;AAEF,qBAAa,yBAA0B,SAAQ,SAAS,CAAC,yBAAyB,CAAC;;CA8ClF;AAED,wBAAsB,wBAAwB,CAC1C,GAAG,EAAE,OAAO,GACZ,OAAO,CAAC,yBAAyB,CAAC,CAmCrC"}

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

@@ -11,13 +11,15 @@ exports.validateAuthorizeRequest = validateAuthorizeRequest;
 const kit_1 = require("@authup/kit");
 const core_kit_1 = require("@authup/core-kit");
 const http_1 = require("@ebec/http");
+const adapter_validator_1 = require("@validup/adapter-validator");
 const typeorm_extension_1 = require("typeorm-extension");
-const core_1 = require("../../../core");
+const validup_1 = require("validup");
+const adapter_routup_1 = require("@validup/adapter-routup");
 const domains_1 = require("../../../domains");
-class AuthorizeRequestValidator extends core_1.RequestValidator {
+class AuthorizeRequestValidator extends validup_1.Container {
     constructor() {
         super();
-        this.add('response_type')
+        this.mount('response_type', (0, adapter_validator_1.createValidator)((chain) => chain
             .exists()
             .isString()
             .notEmpty()
@@ -30,34 +32,35 @@ class AuthorizeRequestValidator extends core_1.RequestValidator {
                 }
             }
             return true;
-        });
-        this.add('redirect_uri')
+        })));
+        this.mount('redirect_uri', (0, adapter_validator_1.createValidator)((chain) => chain
             .exists()
             .notEmpty()
             .isURL()
-            .isLength({ min: 3, max: 2000 });
-        this.add('scope')
+            .isLength({ min: 3, max: 2000 })));
+        this.mount('scope', (0, adapter_validator_1.createValidator)((chain) => chain
             .exists()
             .notEmpty()
             .isString()
-            .isLength({ min: 3, max: 512 });
-        this.add('state')
+            .isLength({ min: 3, max: 512 })));
+        this.mount('state', (0, adapter_validator_1.createValidator)((chain) => chain
             .exists()
             .notEmpty()
             .isString()
             .isLength({ min: 5, max: 2048 })
-            .optional({ nullable: true });
-        this.add('client_id')
+            .optional({ nullable: true })));
+        this.mount('client_id', (0, adapter_validator_1.createValidator)((chain) => chain
             .exists()
             .notEmpty()
             .isString()
-            .isUUID();
+            .isUUID()));
     }
 }
 exports.AuthorizeRequestValidator = AuthorizeRequestValidator;
 async function validateAuthorizeRequest(req) {
     const validator = new AuthorizeRequestValidator();
-    const data = await validator.execute(req);
+    const validatorWrapper = new adapter_routup_1.RoutupContainerAdapter(validator);
+    const data = await validatorWrapper.run(req);
     const dataSource = await (0, typeorm_extension_1.useDataSource)();
     const clientRepository = dataSource.getRepository(domains_1.ClientEntity);
     const client = await clientRepository.findOneBy({ id: data.client_id });

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/cache/abstract.d.ts

@@ -1,17 +1,20 @@
-import { RedisCache } from '@authup/server-kit';
+import type { RedisClient } from '@authup/server-kit';
+import { RedisJsonAdapter } from '@authup/server-kit';
 export declare abstract class OAuth2AbstractCache<T extends Record<string, any> & {
     id: string;
     expires?: Date | string | number;
 }> {
     protected prefix: string;
-    protected driver: RedisCache<T['id'], T> | undefined;
+    protected client: RedisClient | undefined;
+    protected clientJsonAdapter: RedisJsonAdapter | undefined;
     protected constructor(prefix: string);
     set(entity: T): Promise<void>;
     drop(id: T['id']): Promise<void>;
     get(id: T['id']): Promise<T>;
     protected isExpired(entity: T): Promise<boolean>;
-    protected useDriver(): Promise<RedisCache<T['id'], T> | undefined>;
+    protected useDriver(): Promise<RedisJsonAdapter | undefined>;
     protected toDate(input: string | number | Date): Date;
+    protected buildKeyPath(key: string): string;
     abstract loadDBEntity(id: T['id']): Promise<T>;
     abstract deleteDBEntity(id: T['id']): Promise<void>;
 }

package/dist/http/oauth2/cache/abstract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"abstract.d.ts","sourceRoot":"","sources":["../../../../src/http/oauth2/cache/abstract.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,UAAU,EAAuC,MAAM,oBAAoB,CAAC;AAErF,8BAAsB,mBAAmB,CACrC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,CAAA;CAAE;IAEhF,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IAEzB,SAAS,CAAC,MAAM,EAAG,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC;IAEtD,SAAS,aAAa,MAAM,EAAE,MAAM;IAI9B,GAAG,CAAC,MAAM,EAAE,CAAC,GAAI,OAAO,CAAC,IAAI,CAAC;IAgB9B,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAI,OAAO,CAAC,IAAI,CAAC;IAWjC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAI,OAAO,CAAC,CAAC,CAAC;cA8BnB,SAAS,CAAC,MAAM,EAAE,CAAC,GAAI,OAAO,CAAC,OAAO,CAAC;cAkBvC,SAAS,IAAK,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC;IAgBzE,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,GAAI,IAAI;IAQtD,QAAQ,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAI,OAAO,CAAC,CAAC,CAAC;IAE/C,QAAQ,CAAC,cAAc,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAI,OAAO,CAAC,IAAI,CAAC;CACvD"}
+{"version":3,"file":"abstract.d.ts","sourceRoot":"","sources":["../../../../src/http/oauth2/cache/abstract.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EACH,gBAAgB,EACnB,MAAM,oBAAoB,CAAC;AAE5B,8BAAsB,mBAAmB,CACrC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,CAAA;CAAE;IAEhF,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IAEzB,SAAS,CAAC,MAAM,EAAG,WAAW,GAAG,SAAS,CAAC;IAE3C,SAAS,CAAC,iBAAiB,EAAG,gBAAgB,GAAG,SAAS,CAAC;IAE3D,SAAS,aAAa,MAAM,EAAE,MAAM;IAI9B,GAAG,CAAC,MAAM,EAAE,CAAC,GAAI,OAAO,CAAC,IAAI,CAAC;IAe9B,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAI,OAAO,CAAC,IAAI,CAAC;IAWjC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAI,OAAO,CAAC,CAAC,CAAC;cA4BnB,SAAS,CAAC,MAAM,EAAE,CAAC,GAAI,OAAO,CAAC,OAAO,CAAC;cAkBvC,SAAS,IAAK,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAenE,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,GAAI,IAAI;IAQtD,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM;IAOlC,QAAQ,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAI,OAAO,CAAC,CAAC,CAAC;IAE/C,QAAQ,CAAC,cAAc,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAI,OAAO,CAAC,IAAI,CAAC;CACvD"}

package/dist/http/oauth2/cache/abstract.js

@@ -19,8 +19,7 @@ class OAuth2AbstractCache {
             return;
         }
         const date = this.toDate(entity.expires);
-        const seconds = Math.ceil((date.getTime() - Date.now()) / 1000);
-        await driver.set({ id: entity.id }, entity, { seconds });
+        await driver.set(this.buildKeyPath(entity.id), entity, { milliseconds: date.getTime() - Date.now() });
     }
     async drop(id) {
         const driver = await this.useDriver();
@@ -28,7 +27,7 @@ class OAuth2AbstractCache {
             await this.deleteDBEntity(id);
             return;
         }
-        await driver.drop({ id });
+        await driver.drop(this.buildKeyPath(id));
         await this.deleteDBEntity(id);
     }
     async get(id) {
@@ -41,9 +40,7 @@ class OAuth2AbstractCache {
             }
             return entity;
         }
-        entity = await driver.get({
-            id,
-        });
+        entity = await driver.get(this.buildKeyPath(id));
         if (!entity) {
             entity = await this.loadDBEntity(id);
             await this.set(entity);
@@ -58,7 +55,7 @@ class OAuth2AbstractCache {
             this.toDate(entity.expires).getTime() < Date.now()) {
             const driver = await this.useDriver();
             if (driver) {
-                await driver.drop(entity.id);
+                await driver.drop(this.buildKeyPath(entity.id));
             }
             await this.deleteDBEntity(entity.id);
             return true;
@@ -66,16 +63,15 @@ class OAuth2AbstractCache {
         return false;
     }
     async useDriver() {
-        if (this.driver) {
-            return this.driver;
+        if (this.clientJsonAdapter) {
+            return this.clientJsonAdapter;
         }
         if (!(0, server_kit_1.isRedisClientUsable)()) {
             return undefined;
         }
-        this.driver = new server_kit_1.RedisCache({
-            redis: (0, server_kit_1.useRedisClient)(),
-        }, { prefix: this.prefix });
-        return this.driver;
+        this.client = (0, server_kit_1.useRedisClient)();
+        this.clientJsonAdapter = new server_kit_1.RedisJsonAdapter(this.client);
+        return this.clientJsonAdapter;
     }
     toDate(input) {
         if (input instanceof Date) {
@@ -83,6 +79,12 @@ class OAuth2AbstractCache {
         }
         return new Date(input);
     }
+    buildKeyPath(key) {
+        return (0, server_kit_1.buildRedisKeyPath)({
+            key,
+            prefix: this.prefix,
+        });
+    }
 }
 exports.OAuth2AbstractCache = OAuth2AbstractCache;
 //# sourceMappingURL=abstract.js.map

package/dist/http/oauth2/cache/abstract.js.map

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

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

@@ -1 +1 @@
-{"version":3,"file":"internal.d.ts","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/internal.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAI5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAGtC,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,KAAK,EACR,KAAK,EACR,MAAM,QAAQ,CAAC;AAGhB,qBAAa,iBAAkB,SAAQ,aAAc,YAAW,KAAK;IAC3D,GAAG,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,wBAAwB,CAAC;CAoBjE"}
+{"version":3,"file":"internal.d.ts","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/internal.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAiB,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAE3E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAGtC,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,KAAK,EACR,KAAK,EACR,MAAM,QAAQ,CAAC;AAGhB,qBAAa,iBAAkB,SAAQ,aAAc,YAAW,KAAK;IAC3D,GAAG,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,wBAAwB,CAAC;CAqBjE"}

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

@@ -7,22 +7,21 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InternalGrantType = void 0;
-const kit_1 = require("@authup/kit");
 const core_kit_1 = require("@authup/core-kit");
 const routup_1 = require("routup");
-const utils_1 = require("../../utils");
+const request_1 = require("../../request");
 const abstract_1 = require("./abstract");
 const response_1 = require("../response");
 class InternalGrantType extends abstract_1.AbstractGrant {
     async run(request) {
-        const realm = (0, utils_1.useRequestEnv)(request, 'realm');
+        const identity = (0, request_1.useRequestIdentityOrFail)(request);
         const accessToken = await this.issueAccessToken({
             remoteAddress: (0, routup_1.getRequestIP)(request, { trustProxy: true }),
             scope: core_kit_1.ScopeName.GLOBAL,
-            realmId: realm.id,
-            realmName: realm.name,
-            sub: (0, utils_1.useRequestEnv)(request, 'userId'),
-            subKind: kit_1.OAuth2SubKind.USER,
+            realmId: identity.realmId,
+            realmName: identity.realmName,
+            sub: identity.id,
+            subKind: identity.type,
         });
         const refreshToken = await this.issueRefreshToken(accessToken);
         return (0, response_1.buildOAuth2BearerTokenResponse)({

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

@@ -1 +1 @@
-{"version":3,"file":"internal.js","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/internal.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAIH,qCAA4C;AAC5C,+CAA6C;AAE7C,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,oBAAS,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,mBAAa,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,iBAAiB;YAChD,YAAY;YACZ,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,kBAAkB;SACrD,CAAC,CAAC;IACP,CAAC;CACJ;AArBD,8CAqBC"}
+{"version":3,"file":"internal.js","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/internal.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,+CAA6C;AAE7C,mCAAsC;AACtC,2CAAyD;AACzD,yCAA2C;AAI3C,0CAA6D;AAE7D,MAAa,iBAAkB,SAAQ,wBAAa;IAChD,KAAK,CAAC,GAAG,CAAC,OAAgB;QACtB,MAAM,QAAQ,GAAG,IAAA,kCAAwB,EAAC,OAAO,CAAC,CAAC;QAEnD,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,oBAAS,CAAC,MAAM;YACvB,OAAO,EAAE,QAAQ,CAAC,OAAO;YACzB,SAAS,EAAE,QAAQ,CAAC,SAAS;YAC7B,GAAG,EAAE,QAAQ,CAAC,EAAE;YAChB,OAAO,EAAE,QAAQ,CAAC,IAA0B;SAC/C,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,iBAAiB;YAChD,YAAY;YACZ,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,kBAAkB;SACrD,CAAC,CAAC;IACP,CAAC;CACJ;AAtBD,8CAsBC"}

package/dist/http/oauth2/grant-types/refresh-token.d.ts

@@ -1,4 +1,5 @@
 import type { OAuth2TokenGrantResponse } from '@authup/kit';
+import { OAuth2SubKind } from '@authup/kit';
 import type { Request } from 'routup';
 import { OAuth2RefreshTokenEntity } from '../../../domains';
 import { AbstractGrant } from './abstract';
@@ -6,5 +7,7 @@ import type { Grant } from './type';
 export declare class RefreshTokenGrantType extends AbstractGrant implements Grant {
     run(request: Request): Promise<OAuth2TokenGrantResponse>;
     validate(request: Request): Promise<OAuth2RefreshTokenEntity>;
+    protected getSubject(entity: OAuth2RefreshTokenEntity): string;
+    protected getSubjectKind(entity: OAuth2RefreshTokenEntity): OAuth2SubKind;
 }
 //# sourceMappingURL=refresh-token.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"refresh-token.d.ts","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/refresh-token.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAK5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAGtC,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAGpC,qBAAa,qBAAsB,SAAQ,aAAc,YAAW,KAAK;IAC/D,GAAG,CAAC,OAAO,EAAE,OAAO,GAAI,OAAO,CAAC,wBAAwB,CAAC;IAyBzD,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAI,OAAO,CAAC,wBAAwB,CAAC;CA2BvE"}
+{"version":3,"file":"refresh-token.d.ts","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/refresh-token.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,aAAa,EAA+B,MAAM,aAAa,CAAC;AAEzE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAGtC,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAG5D,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAEpC,qBAAa,qBAAsB,SAAQ,aAAc,YAAW,KAAK;IAC/D,GAAG,CAAC,OAAO,EAAE,OAAO,GAAI,OAAO,CAAC,wBAAwB,CAAC;IAyBzD,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAI,OAAO,CAAC,wBAAwB,CAAC;IA4BpE,SAAS,CAAC,UAAU,CAAC,MAAM,EAAE,wBAAwB;IAgBrD,SAAS,CAAC,cAAc,CAAC,MAAM,EAAE,wBAAwB,GAAI,aAAa;CAe7E"}

package/dist/http/oauth2/grant-types/refresh-token.js

@@ -12,14 +12,14 @@ const body_1 = require("@routup/basic/body");
 const routup_1 = require("routup");
 const typeorm_extension_1 = require("typeorm-extension");
 const domains_1 = require("../../../domains");
-const abstract_1 = require("./abstract");
 const response_1 = require("../response");
 const token_1 = require("../token");
+const abstract_1 = require("./abstract");
 class RefreshTokenGrantType extends abstract_1.AbstractGrant {
     async run(request) {
         const token = await this.validate(request);
-        const subKind = (0, kit_1.getOAuth2SubKindByEntity)(token);
-        const sub = (0, kit_1.getOAuth2SubByEntity)(token);
+        const subKind = this.getSubjectKind(token);
+        const sub = this.getSubject(token);
         const accessToken = await this.issueAccessToken({
             remoteAddress: (0, routup_1.getRequestIP)(request, { trustProxy: true }),
             scope: token.scope,
@@ -57,6 +57,30 @@ class RefreshTokenGrantType extends abstract_1.AbstractGrant {
         await repository.remove(entity);
         return entity;
     }
+    getSubject(entity) {
+        if (entity.robot_id) {
+            return entity.robot_id;
+        }
+        if (entity.user_id) {
+            return entity.user_id;
+        }
+        if (entity.client_id) {
+            return entity.client_id;
+        }
+        throw new SyntaxError('The subject could not be extracted from token entity.');
+    }
+    getSubjectKind(entity) {
+        if (entity.robot_id) {
+            return kit_1.OAuth2SubKind.ROBOT;
+        }
+        if (entity.user_id) {
+            return kit_1.OAuth2SubKind.USER;
+        }
+        if (entity.client_id) {
+            return kit_1.OAuth2SubKind.CLIENT;
+        }
+        throw new SyntaxError('The subject kind could not be extracted from the token entity.');
+    }
 }
 exports.RefreshTokenGrantType = RefreshTokenGrantType;
 //# sourceMappingURL=refresh-token.js.map

package/dist/http/oauth2/grant-types/refresh-token.js.map

@@ -1 +1 @@
-{"version":3,"file":"refresh-token.js","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/refresh-token.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,qCAEqB;AACrB,6CAAoD;AAEpD,mCAAsC;AACtC,yDAAkD;AAClD,8CAA4D;AAC5D,yCAA2C;AAC3C,0CAA6D;AAE7D,oCAAkD;AAElD,MAAa,qBAAsB,SAAQ,wBAAa;IACpD,KAAK,CAAC,GAAG,CAAC,OAAgB;QACtB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAE3C,MAAM,OAAO,GAAG,IAAA,8BAAwB,EAAC,KAAK,CAAC,CAAC;QAChD,MAAM,GAAG,GAAG,IAAA,0BAAoB,EAAC,KAAK,CAAC,CAAC;QAExC,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,KAAK,CAAC,KAAK;YAClB,GAAG;YACH,OAAO;YACP,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,EAAE;YACvB,SAAS,EAAE,KAAK,CAAC,KAAK,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,iBAAiB;YAChD,YAAY;YACZ,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,kBAAkB;SACrD,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAAgB;QAC3B,MAAM,YAAY,GAAG,IAAA,qBAAc,EAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QAE9D,MAAM,OAAO,GAAG,MAAM,IAAA,8BAAsB,EAAC,YAAY,CAAC,CAAC;QAE3D,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;QACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,kCAAwB,CAAC,CAAC;QACtE,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;YACpC,KAAK,EAAE;gBACH,EAAE,EAAE,OAAO,CAAC,GAAG;aAClB;YACD,SAAS,EAAE,CAAC,OAAO,CAAC;SACvB,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,gBAAU,CAAC,aAAa,CAAC,qBAAe,CAAC,OAAO,CAAC,CAAC;QAC5D,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC3C,IAAI,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;YACvB,MAAM,gBAAU,CAAC,OAAO,CAAC,qBAAe,CAAC,OAAO,CAAC,CAAC;QACtD,CAAC;QAED,MAAM,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAEhC,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AArDD,sDAqDC"}
+{"version":3,"file":"refresh-token.js","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/refresh-token.ts"],"names":[],"mappings":"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"}

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

@@ -1,6 +1,5 @@
 export * from './authorize';
 export * from './cache';
-export * from './cleaner';
 export * from './grant-types';
 export * from './openid';
 export * from './response';

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/http/oauth2/index.ts"],"names":[],"mappings":"AAOA,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,eAAe,CAAC;AAC9B,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/http/oauth2/index.ts"],"names":[],"mappings":"AAOA,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,eAAe,CAAC;AAC9B,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC"}

package/dist/http/oauth2/index.js

@@ -22,7 +22,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./authorize"), exports);
 __exportStar(require("./cache"), exports);
-__exportStar(require("./cleaner"), exports);
 __exportStar(require("./grant-types"), exports);
 __exportStar(require("./openid"), exports);
 __exportStar(require("./response"), exports);

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/http/oauth2/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;AAEH,8CAA4B;AAC5B,0CAAwB;AACxB,4CAA0B;AAC1B,gDAA8B;AAC9B,2CAAyB;AACzB,6CAA2B;AAC3B,0CAAwB;AACxB,0CAAwB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/http/oauth2/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;AAEH,8CAA4B;AAC5B,0CAAwB;AACxB,gDAA8B;AAC9B,2CAAyB;AACzB,6CAA2B;AAC3B,0CAAwB;AACxB,0CAAwB"}

package/dist/http/oauth2/token/payload/read.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"read.d.ts","sourceRoot":"","sources":["../../../../../src/http/oauth2/token/payload/read.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAOtD,wBAAsB,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAI,OAAO,CAAC,kBAAkB,CAAC,CA8CxF"}
+{"version":3,"file":"read.d.ts","sourceRoot":"","sources":["../../../../../src/http/oauth2/token/payload/read.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAMtD,wBAAsB,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAI,OAAO,CAAC,kBAAkB,CAAC,CAoCxF"}