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

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

@@ -6,13 +6,14 @@
  * view the LICENSE file that was distributed with this source code.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runOAuth2Authorization = void 0;
+exports.runOAuth2Authorization = runOAuth2Authorization;
 const node_crypto_1 = require("node:crypto");
-const core_1 = require("@authup/core");
+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 utils_1 = require("../../utils");
+const request_1 = require("../../request");
 const token_1 = require("../token");
 const cache_1 = require("../cache");
 const response_1 = require("../response");
@@ -21,58 +22,64 @@ async function runOAuth2Authorization(req, options) {
     const accessTokenMaxAge = options.accessTokenMaxAge || 7200;
     const authorizationCodeMaxAge = options.authorizationCodeMaxAge || 300;
     const idTokenMaxAge = options.idTokenMaxAge || 7200;
-    const result = await (0, validation_1.validateAuthorizeRequest)(req);
+    const data = await (0, validation_1.validateAuthorizeRequest)(req);
     const responseTypes = (0, response_1.getOauth2AuthorizeResponseTypesByRequest)(req);
     const output = {
-        redirectUri: result.data.redirect_uri,
-        ...(result.data.state ? { state: result.data.state } : {}),
+        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({
         content: (0, node_crypto_1.randomBytes)(10).toString('hex'),
         expires: new Date(Date.now() + (1000 * authorizationCodeMaxAge)).toISOString(),
-        redirect_uri: result.data.redirect_uri,
-        client_id: result.data.client_id,
-        user_id: (0, utils_1.useRequestEnv)(req, 'userId'),
-        realm_id: realmId,
-        scope: result.data.scope,
+        redirect_uri: data.redirect_uri,
+        client_id: data.client_id,
+        realm_id: identity.realmId,
+        scope: data.scope,
+    });
+    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 key = await (0, domains_1.useKey)({ realm_id: realmId });
     const tokenBuildContext = {
         issuer: options.issuer,
         remoteAddress: (0, routup_1.getRequestIP)(req, { trustProxy: true }),
-        sub: (0, utils_1.useRequestEnv)(req, 'userId'),
-        subKind: core_1.OAuth2SubKind.USER,
-        realmId,
-        realmName,
-        clientId: result.data.client_id,
-        ...(result.data.scope ? { scope: result.data.scope } : {}),
+        sub: identity.id,
+        subKind: identity.type,
+        realmId: identity.realmId,
+        realmName: identity.realmName,
+        clientId: data.client_id,
+        ...(data.scope ? { scope: data.scope } : {}),
     };
-    if (responseTypes[core_1.OAuth2AuthorizationResponseType.ID_TOKEN] ||
-        (0, core_1.hasOAuth2OpenIDScope)(entity.scope)) {
+    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,
-            expiresIn: idTokenMaxAge,
+            keyId: key.id,
         });
-        if (responseTypes[core_1.OAuth2AuthorizationResponseType.ID_TOKEN]) {
+        if (responseTypes[kit_1.OAuth2AuthorizationResponseType.ID_TOKEN]) {
             output.idToken = entity.id_token;
         }
     }
-    if (responseTypes[core_1.OAuth2AuthorizationResponseType.TOKEN]) {
-        output.accessToken = await (0, domains_1.signOAuth2TokenWithKey)(await (0, token_1.buildOAuth2AccessTokenPayload)(tokenBuildContext), key, {
-            keyid: key.id,
-            expiresIn: accessTokenMaxAge,
+    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,
         });
     }
     await repository.save(entity);
     const cache = new cache_1.OAuth2AuthorizationCodeCache();
     await cache.set(entity);
-    if (responseTypes[core_1.OAuth2AuthorizationResponseType.CODE]) {
+    if (responseTypes[kit_1.OAuth2AuthorizationResponseType.CODE]) {
         output.authorizationCode = entity.content;
     }
     return output;
 }
-exports.runOAuth2Authorization = runOAuth2Authorization;
 //# sourceMappingURL=module.js.map

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;;;AAEH,6CAA0C;AAC1C,uCAIsB;AAEtB,mCAAsC;AACtC,yDAAkD;AAClD,8CAAiG;AACjG,uCAA4C;AAK5C,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,MAAM,GAAG,MAAM,IAAA,qCAAwB,EAAC,GAAG,CAAC,CAAC;IAEnD,MAAM,aAAa,GAAG,IAAA,mDAAwC,EAAC,GAAG,CAAC,CAAC;IAEpE,MAAM,MAAM,GAA4B;QACpC,WAAW,EAAE,MAAM,CAAC,IAAI,CAAC,YAAY;QACrC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC7D,CAAC;IAEF,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAErE,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,MAAM,CAAC,IAAI,CAAC,YAAY;QACtC,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,SAAS;QAChC,OAAO,EAAE,IAAA,qBAAa,EAAC,GAAG,EAAE,QAAQ,CAAC;QACrC,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK;KAC3B,CAAC,CAAC;IAEH,MAAM,GAAG,GAAG,MAAM,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;IAEhD,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,IAAA,qBAAa,EAAC,GAAG,EAAE,QAAQ,CAAC;QACjC,OAAO,EAAE,oBAAa,CAAC,IAAI;QAC3B,OAAO;QACP,SAAS;QACT,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,SAAS;QAC/B,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC7D,CAAC;IAEF,IACI,aAAa,CAAC,sCAA+B,CAAC,QAAQ,CAAC;QACvD,IAAA,2BAAoB,EAAC,MAAM,CAAC,KAAK,CAAC,EACpC,CAAC;QACC,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;YACb,SAAS,EAAE,aAAa;SAC3B,CACJ,CAAC;QAEF,IAAI,aAAa,CAAC,sCAA+B,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC1D,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC;QACrC,CAAC;IACL,CAAC;IAED,IAAI,aAAa,CAAC,sCAA+B,CAAC,KAAK,CAAC,EAAE,CAAC;QACvD,MAAM,CAAC,WAAW,GAAG,MAAM,IAAA,gCAAsB,EAC7C,MAAM,IAAA,qCAA6B,EAAC,iBAAiB,CAAC,EACtD,GAAG,EACH;YACI,KAAK,EAAE,GAAG,CAAC,EAAE;YACb,SAAS,EAAE,iBAAiB;SAC/B,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,sCAA+B,CAAC,IAAI,CAAC,EAAE,CAAC;QACtD,MAAM,CAAC,iBAAiB,GAAG,MAAM,CAAC,OAAO,CAAC;IAC9C,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC;AApFD,wDAoFC"}
+{"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,9 +1,12 @@
-import type { OAuth2AuthorizationCodeRequest } from '@authup/core';
+import type { OAuth2AuthorizationCodeRequest } from '@authup/core-kit';
 import type { Request } from 'routup';
-import { ClientEntity } from '../../../domains';
-import type { ExpressValidationResult } from '../../validation';
-export declare function validateAuthorizeRequest(req: Request): Promise<ExpressValidationResult<OAuth2AuthorizationCodeRequest & {
-    client: ClientEntity;
+import { Container } from 'validup';
+type AuthorizeValidationResult = OAuth2AuthorizationCodeRequest & {
     client_id: string;
-}>>;
+};
+export declare class AuthorizeRequestValidator extends Container<AuthorizeValidationResult> {
+    constructor();
+}
+export declare function validateAuthorizeRequest(req: Request): Promise<AuthorizeValidationResult>;
+export {};
 //# sourceMappingURL=validation.d.ts.map

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":"AAQA,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,cAAc,CAAC;AAOnE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAE,YAAY,EAAqB,MAAM,kBAAkB,CAAC;AACnE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAQhE,wBAAsB,wBAAwB,CAC1C,GAAG,EAAE,OAAO,GACZ,OAAO,CAAC,uBAAuB,CAAC,8BAA8B,GAAG;IAAE,MAAM,EAAE,YAAY,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC,CA8FjH"}
+{"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

@@ -6,88 +6,85 @@
  * view the LICENSE file that was distributed with this source code.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateAuthorizeRequest = void 0;
-const express_validator_1 = require("express-validator");
-const core_1 = require("@authup/core");
+exports.AuthorizeRequestValidator = void 0;
+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 validup_1 = require("validup");
+const adapter_routup_1 = require("@validup/adapter-routup");
 const domains_1 = require("../../../domains");
-const validation_1 = require("../../validation");
-async function validateAuthorizeRequest(req) {
-    const result = (0, validation_1.initExpressValidationResult)();
-    await (0, express_validator_1.check)('response_type')
-        .exists()
-        .isString()
-        .notEmpty()
-        .custom((value) => {
-        const availableResponseTypes = Object.values(core_1.OAuth2AuthorizationResponseType);
-        const responseTypes = value.split(' ');
-        for (let i = 0; i < responseTypes.length; i++) {
-            if (availableResponseTypes.indexOf(responseTypes[i]) === -1) {
-                throw core_1.TokenError.responseTypeUnsupported();
+class AuthorizeRequestValidator extends validup_1.Container {
+    constructor() {
+        super();
+        this.mount('response_type', (0, adapter_validator_1.createValidator)((chain) => chain
+            .exists()
+            .isString()
+            .notEmpty()
+            .custom((value) => {
+            const availableResponseTypes = Object.values(kit_1.OAuth2AuthorizationResponseType);
+            const responseTypes = value.split(' ');
+            for (let i = 0; i < responseTypes.length; i++) {
+                if (availableResponseTypes.indexOf(responseTypes[i]) === -1) {
+                    throw kit_1.TokenError.responseTypeUnsupported();
+                }
             }
-        }
-        return true;
-    })
-        .run(req);
-    await (0, express_validator_1.check)('redirect_uri')
-        .exists()
-        .notEmpty()
-        .isURL()
-        .isLength({ min: 3, max: 2000 })
-        .run(req);
-    await (0, express_validator_1.check)('scope')
-        .exists()
-        .notEmpty()
-        .isString()
-        .isLength({ min: 3, max: 512 })
-        .run(req);
-    await (0, express_validator_1.check)('state')
-        .exists()
-        .notEmpty()
-        .isString()
-        .isLength({ min: 5, max: 2048 })
-        .optional({ nullable: true })
-        .run(req);
-    await (0, express_validator_1.check)('client_id')
-        .exists()
-        .notEmpty()
-        .isString()
-        .isUUID()
-        .run(req);
-    // ----------------------------------------------
-    const validation = (0, express_validator_1.validationResult)(req);
-    if (!validation.isEmpty()) {
-        throw new validation_1.RequestValidationError(validation);
+            return true;
+        })));
+        this.mount('redirect_uri', (0, adapter_validator_1.createValidator)((chain) => chain
+            .exists()
+            .notEmpty()
+            .isURL()
+            .isLength({ min: 3, max: 2000 })));
+        this.mount('scope', (0, adapter_validator_1.createValidator)((chain) => chain
+            .exists()
+            .notEmpty()
+            .isString()
+            .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.mount('client_id', (0, adapter_validator_1.createValidator)((chain) => chain
+            .exists()
+            .notEmpty()
+            .isString()
+            .isUUID()));
+    }
+}
+exports.AuthorizeRequestValidator = AuthorizeRequestValidator;
+async function validateAuthorizeRequest(req) {
+    const validator = new AuthorizeRequestValidator();
+    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 });
+    if (!client) {
+        throw new http_1.BadRequestError('The referenced client does not exist.');
     }
-    result.data = (0, validation_1.matchedValidationData)(req, { includeOptionals: true });
-    // ----------------------------------------------
-    await (0, validation_1.extendExpressValidationResultWithRelation)(result, domains_1.ClientEntity, {
-        id: 'client_id',
-        entity: 'client',
+    const clientScopeRepository = dataSource.getRepository(domains_1.ClientScopeEntity);
+    const clientScopes = await clientScopeRepository.find({
+        where: {
+            client_id: data.client_id,
+        },
+        relations: {
+            scope: true,
+        },
     });
-    if (result.relation.client) {
-        const dataSource = await (0, typeorm_extension_1.useDataSource)();
-        const clientScopeRepository = dataSource.getRepository(domains_1.ClientScopeEntity);
-        const clientScopes = await clientScopeRepository.find({
-            where: {
-                client_id: result.data.client_id,
-            },
-            relations: {
-                scope: true,
-            },
-        });
-        const scopeNames = clientScopes.map((clientScope) => clientScope.scope.name);
-        if (result.data.scope) {
-            if (!(0, core_1.isOAuth2ScopeAllowed)(scopeNames, result.data.scope)) {
-                throw new http_1.BadRequestError('The requested scope is not covered by the client scope.');
-            }
-        }
-        if (!result.data.scope) {
-            result.data.scope = scopeNames.join(' ');
+    const scopeNames = clientScopes.map((clientScope) => clientScope.scope.name);
+    if (data.scope) {
+        if (!(0, core_kit_1.isOAuth2ScopeAllowed)(scopeNames, data.scope)) {
+            throw new http_1.BadRequestError('The requested scope is not covered by the client scope.');
         }
     }
-    return result;
+    if (!data.scope) {
+        data.scope = scopeNames.join(' ');
+    }
+    return data;
 }
-exports.validateAuthorizeRequest = validateAuthorizeRequest;
 //# sourceMappingURL=validation.js.map

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":";AAAA;;;;;GAKG;;;AAsEH,4DAqCC;AAxGD,qCAGqB;AACrB,+CAE0B;AAC1B,qCAA6C;AAC7C,kEAA6D;AAE7D,yDAAkD;AAClD,qCAAoC;AACpC,4DAAiE;AACjE,8CAAmE;AAMnE,MAAa,yBAA0B,SAAQ,mBAAoC;IAC/E;QACI,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,IAAA,mCAAe,EAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK;aACvD,MAAM,EAAE;aACR,QAAQ,EAAE;aACV,QAAQ,EAAE;aACV,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;YACd,MAAM,sBAAsB,GAAG,MAAM,CAAC,MAAM,CAAC,qCAA+B,CAAC,CAAC;YAC9E,MAAM,aAAa,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAEvC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC5C,IAAI,sBAAsB,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;oBAC1D,MAAM,gBAAU,CAAC,uBAAuB,EAAE,CAAC;gBAC/C,CAAC;YACL,CAAC;YAED,OAAO,IAAI,CAAC;QAChB,CAAC,CAAC,CAAC,CAAC,CAAC;QAET,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,IAAA,mCAAe,EAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK;aACtD,MAAM,EAAE;aACR,QAAQ,EAAE;aACV,KAAK,EAAE;aACP,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAEvC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,IAAA,mCAAe,EAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK;aAC/C,MAAM,EAAE;aACR,QAAQ,EAAE;aACV,QAAQ,EAAE;aACV,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;QAEtC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,IAAA,mCAAe,EAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK;aAC/C,MAAM,EAAE;aACR,QAAQ,EAAE;aACV,QAAQ,EAAE;aACV,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;aAC/B,QAAQ,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAEpC,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,IAAA,mCAAe,EAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK;aACnD,MAAM,EAAE;aACR,QAAQ,EAAE;aACV,QAAQ,EAAE;aACV,MAAM,EAAE,CAAC,CAAC,CAAC;IACpB,CAAC;CACJ;AA9CD,8DA8CC;AAEM,KAAK,UAAU,wBAAwB,CAC1C,GAAY;IAEZ,MAAM,SAAS,GAAG,IAAI,yBAAyB,EAAE,CAAC;IAClD,MAAM,gBAAgB,GAAG,IAAI,uCAAsB,CAAC,SAAS,CAAC,CAAC;IAC/D,MAAM,IAAI,GAAG,MAAM,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAE7C,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,gBAAgB,GAAG,UAAU,CAAC,aAAa,CAAC,sBAAY,CAAC,CAAC;IAChE,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;IACxE,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,sBAAe,CAAC,uCAAuC,CAAC,CAAC;IACvE,CAAC;IAED,MAAM,qBAAqB,GAAG,UAAU,CAAC,aAAa,CAAC,2BAAiB,CAAC,CAAC;IAC1E,MAAM,YAAY,GAAG,MAAM,qBAAqB,CAAC,IAAI,CAAC;QAClD,KAAK,EAAE;YACH,SAAS,EAAE,IAAI,CAAC,SAAS;SAC5B;QACD,SAAS,EAAE;YACP,KAAK,EAAE,IAAI;SACd;KACJ,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAE7E,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;QACb,IAAI,CAAC,IAAA,+BAAoB,EAAC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAChD,MAAM,IAAI,sBAAe,CAAC,yDAAyD,CAAC,CAAC;QACzF,CAAC;IACL,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QACd,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACtC,CAAC;IAED,OAAO,IAAI,CAAC;AAChB,CAAC"}

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

@@ -1,17 +1,20 @@
-import { Cache } from 'redis-extension';
+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: Cache<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<Cache<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":"AAQA,OAAO,EACH,KAAK,EACR,MAAM,iBAAiB,CAAC;AAGzB,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,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC;IAEjD,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,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC;IAgBpE,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

@@ -7,8 +7,8 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OAuth2AbstractCache = void 0;
-const redis_extension_1 = require("redis-extension");
-const core_1 = require("@authup/core");
+const kit_1 = require("@authup/kit");
+const server_kit_1 = require("@authup/server-kit");
 class OAuth2AbstractCache {
     constructor(prefix) {
         this.prefix = prefix;
@@ -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) {
@@ -37,28 +36,26 @@ class OAuth2AbstractCache {
         if (!driver) {
             entity = await this.loadDBEntity(id);
             if (await this.isExpired(entity)) {
-                throw core_1.TokenError.expired();
+                throw kit_1.TokenError.expired();
             }
             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);
         }
         if (await this.isExpired(entity)) {
-            throw core_1.TokenError.expired();
+            throw kit_1.TokenError.expired();
         }
         return entity;
     }
     async isExpired(entity) {
-        if ((0, core_1.hasOwnProperty)(entity, 'expires') &&
+        if ((0, kit_1.hasOwnProperty)(entity, 'expires') &&
             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, redis_extension_1.hasClient)() && !(0, redis_extension_1.hasConfig)()) {
+        if (!(0, server_kit_1.isRedisClientUsable)()) {
             return undefined;
         }
-        this.driver = new redis_extension_1.Cache({
-            redis: (0, redis_extension_1.useClient)(),
-        }, { 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/cache/authorization-code.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"authorization-code.d.ts","sourceRoot":"","sources":["../../../../src/http/oauth2/cache/authorization-code.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,6BAA6B,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEjD,qBAAa,4BAA6B,SAAQ,mBAAmB,CAAC,6BAA6B,CAAC;;IAK1F,cAAc,CAAC,EAAE,EAAE,6BAA6B,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAMtE,YAAY,CAAC,EAAE,EAAE,6BAA6B,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,6BAA6B,CAAC;CAWtG"}
+{"version":3,"file":"authorization-code.d.ts","sourceRoot":"","sources":["../../../../src/http/oauth2/cache/authorization-code.ts"],"names":[],"mappings":"AASA,OAAO,EAAe,6BAA6B,EAAE,MAAM,kBAAkB,CAAC;AAC9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEjD,qBAAa,4BAA6B,SAAQ,mBAAmB,CAAC,6BAA6B,CAAC;;IAK1F,cAAc,CAAC,EAAE,EAAE,6BAA6B,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAMtE,YAAY,CAAC,EAAE,EAAE,6BAA6B,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,6BAA6B,CAAC;CAWtG"}

package/dist/http/oauth2/cache/authorization-code.js

@@ -9,12 +9,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OAuth2AuthorizationCodeCache = void 0;
 const http_1 = require("@ebec/http");
 const typeorm_extension_1 = require("typeorm-extension");
-const database_1 = require("../../../database");
 const domains_1 = require("../../../domains");
 const abstract_1 = require("./abstract");
 class OAuth2AuthorizationCodeCache extends abstract_1.OAuth2AbstractCache {
     constructor() {
-        super(database_1.CachePrefix.OAUTH2_AUTHORIZATION_CODE);
+        super(domains_1.CachePrefix.OAUTH2_AUTHORIZATION_CODE);
     }
     async deleteDBEntity(id) {
         const dataSource = await (0, typeorm_extension_1.useDataSource)();

package/dist/http/oauth2/cache/authorization-code.js.map

@@ -1 +1 @@
-{"version":3,"file":"authorization-code.js","sourceRoot":"","sources":["../../../../src/http/oauth2/cache/authorization-code.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA2C;AAC3C,yDAAkD;AAClD,gDAAgD;AAChD,8CAAiE;AACjE,yCAAiD;AAEjD,MAAa,4BAA6B,SAAQ,8BAAkD;IAChG;QACI,KAAK,CAAC,sBAAW,CAAC,yBAAyB,CAAC,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,EAAuC;QACxD,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;QACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,uCAA6B,CAAC,CAAC;QAC3E,MAAM,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,EAAuC;QACtD,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;QACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,uCAA6B,CAAC,CAAC;QAC3E,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAElD,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,IAAI,oBAAa,EAAE,CAAC;QAC9B,CAAC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AAtBD,oEAsBC"}
+{"version":3,"file":"authorization-code.js","sourceRoot":"","sources":["../../../../src/http/oauth2/cache/authorization-code.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA2C;AAC3C,yDAAkD;AAClD,8CAA8E;AAC9E,yCAAiD;AAEjD,MAAa,4BAA6B,SAAQ,8BAAkD;IAChG;QACI,KAAK,CAAC,qBAAW,CAAC,yBAAyB,CAAC,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,EAAuC;QACxD,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;QACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,uCAA6B,CAAC,CAAC;QAC3E,MAAM,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,EAAuC;QACtD,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;QACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,uCAA6B,CAAC,CAAC;QAC3E,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAElD,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,IAAI,oBAAa,EAAE,CAAC;QAC9B,CAAC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AAtBD,oEAsBC"}

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

@@ -1 +1 @@
-{"version":3,"file":"refresh-token.d.ts","sourceRoot":"","sources":["../../../../src/http/oauth2/cache/refresh-token.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEjD,qBAAa,uBAAwB,SAAQ,mBAAmB,CAAC,wBAAwB,CAAC;;IAKhF,cAAc,CAAC,EAAE,EAAE,wBAAwB,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAMjE,YAAY,CAAC,EAAE,EAAE,wBAAwB,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,wBAAwB,CAAC;CAW5F"}
+{"version":3,"file":"refresh-token.d.ts","sourceRoot":"","sources":["../../../../src/http/oauth2/cache/refresh-token.ts"],"names":[],"mappings":"AASA,OAAO,EAAe,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEjD,qBAAa,uBAAwB,SAAQ,mBAAmB,CAAC,wBAAwB,CAAC;;IAKhF,cAAc,CAAC,EAAE,EAAE,wBAAwB,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAMjE,YAAY,CAAC,EAAE,EAAE,wBAAwB,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,wBAAwB,CAAC;CAW5F"}

package/dist/http/oauth2/cache/refresh-token.js

@@ -9,12 +9,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OAuth2RefreshTokenCache = void 0;
 const http_1 = require("@ebec/http");
 const typeorm_extension_1 = require("typeorm-extension");
-const database_1 = require("../../../database");
 const domains_1 = require("../../../domains");
 const abstract_1 = require("./abstract");
 class OAuth2RefreshTokenCache extends abstract_1.OAuth2AbstractCache {
     constructor() {
-        super(database_1.CachePrefix.OAUTH2_REFRESH_TOKEN);
+        super(domains_1.CachePrefix.OAUTH2_REFRESH_TOKEN);
     }
     async deleteDBEntity(id) {
         const dataSource = await (0, typeorm_extension_1.useDataSource)();

package/dist/http/oauth2/cache/refresh-token.js.map

@@ -1 +1 @@
-{"version":3,"file":"refresh-token.js","sourceRoot":"","sources":["../../../../src/http/oauth2/cache/refresh-token.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA2C;AAC3C,yDAAkD;AAClD,gDAAgD;AAChD,8CAA4D;AAC5D,yCAAiD;AAEjD,MAAa,uBAAwB,SAAQ,8BAA6C;IACtF;QACI,KAAK,CAAC,sBAAW,CAAC,oBAAoB,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,EAAkC;QACnD,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;QACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,kCAAwB,CAAC,CAAC;QACtE,MAAM,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,EAAkC;QACjD,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,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAElD,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,IAAI,oBAAa,EAAE,CAAC;QAC9B,CAAC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AAtBD,0DAsBC"}
+{"version":3,"file":"refresh-token.js","sourceRoot":"","sources":["../../../../src/http/oauth2/cache/refresh-token.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA2C;AAC3C,yDAAkD;AAClD,8CAAyE;AACzE,yCAAiD;AAEjD,MAAa,uBAAwB,SAAQ,8BAA6C;IACtF;QACI,KAAK,CAAC,qBAAW,CAAC,oBAAoB,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,EAAkC;QACnD,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;QACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,kCAAwB,CAAC,CAAC;QACtE,MAAM,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,EAAkC;QACjD,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,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAElD,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,IAAI,oBAAa,EAAE,CAAC;QAC9B,CAAC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AAtBD,0DAsBC"}

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

@@ -1,4 +1,4 @@
-import type { OAuth2TokenPayload } from '@authup/core';
+import type { OAuth2TokenPayload } from '@authup/kit';
 import type { Config } from '../../../config';
 import { OAuth2RefreshTokenCache } from '../cache';
 import type { AccessTokenIssueContext } from './type';

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,cAAc,CAAC;AAGvD,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;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"}

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

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

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

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

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

@@ -1,4 +1,4 @@
-import type { OAuth2TokenGrantResponse } from '@authup/core';
+import type { OAuth2TokenGrantResponse } from '@authup/kit';
 import type { Request } from 'routup';
 import { OAuth2AuthorizationCodeEntity } from '../../../domains';
 import { AbstractGrant } from './abstract';

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

@@ -1 +1 @@
-{"version":3,"file":"authorize.d.ts","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/authorize.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAO7D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAE,6BAA6B,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAIpC,qBAAa,kBAAmB,SAAQ,aAAc,YAAW,KAAK;IAC5D,GAAG,CAAC,OAAO,EAAE,OAAO,GAAI,OAAO,CAAC,wBAAwB,CAAC;IA4BzD,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAI,OAAO,CAAC,6BAA6B,CAAC;IA8BzE,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAI,MAAM;IAczD,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,GAAI,MAAM;CAatD"}
+{"version":3,"file":"authorize.d.ts","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/authorize.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAU5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAE,6BAA6B,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAIpC,qBAAa,kBAAmB,SAAQ,aAAc,YAAW,KAAK;IAC5D,GAAG,CAAC,OAAO,EAAE,OAAO,GAAI,OAAO,CAAC,wBAAwB,CAAC;IA4BzD,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAI,OAAO,CAAC,6BAA6B,CAAC;IA8BzE,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAI,MAAM;IAczD,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,GAAI,MAAM;CAatD"}