@authup/server-core 1.0.0-beta.0 → 1.0.0-beta.10

package/dist/http/middleware/module.js

@@ -35,7 +35,7 @@ function registerMiddlewares(router) {
         (0, built_in_1.registerSwaggerMiddleware)(router, {
             documentPath: node_path_1.default.join(config.writableDirectoryPath, 'swagger.json'),
             options: {
-                baseUrl: config.publicUrl,
+                baseURL: config.publicUrl,
                 ...(0, utils_1.transformBoolToEmptyObject)(swagger),
             },
         });

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":"AAaA,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"}
+{"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"}

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

@@ -8,7 +8,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runOAuth2Authorization = void 0;
 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");
@@ -44,32 +45,32 @@ async function runOAuth2Authorization(req, options) {
         issuer: options.issuer,
         remoteAddress: (0, routup_1.getRequestIP)(req, { trustProxy: true }),
         sub: (0, utils_1.useRequestEnv)(req, 'userId'),
-        subKind: core_1.OAuth2SubKind.USER,
+        subKind: kit_1.OAuth2SubKind.USER,
         realmId,
         realmName,
         clientId: result.data.client_id,
         ...(result.data.scope ? { scope: result.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;

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,4 +1,4 @@
-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';

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":"AAQA,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,kBAAkB,CAAC;AASvE,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"}

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

@@ -8,7 +8,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateAuthorizeRequest = void 0;
 const express_validator_1 = require("express-validator");
-const core_1 = require("@authup/core");
+const kit_1 = require("@authup/kit");
+const core_kit_1 = require("@authup/core-kit");
 const http_1 = require("@ebec/http");
 const typeorm_extension_1 = require("typeorm-extension");
 const domains_1 = require("../../../domains");
@@ -20,11 +21,11 @@ async function validateAuthorizeRequest(req) {
         .isString()
         .notEmpty()
         .custom((value) => {
-        const availableResponseTypes = Object.values(core_1.OAuth2AuthorizationResponseType);
+        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 core_1.TokenError.responseTypeUnsupported();
+                throw kit_1.TokenError.responseTypeUnsupported();
             }
         }
         return true;
@@ -79,7 +80,7 @@ async function validateAuthorizeRequest(req) {
         });
         const scopeNames = clientScopes.map((clientScope) => clientScope.scope.name);
         if (result.data.scope) {
-            if (!(0, core_1.isOAuth2ScopeAllowed)(scopeNames, result.data.scope)) {
+            if (!(0, core_kit_1.isOAuth2ScopeAllowed)(scopeNames, result.data.scope)) {
                 throw new http_1.BadRequestError('The requested scope is not covered by the client scope.');
             }
         }

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,16 +1,16 @@
-import { Cache } from 'redis-extension';
+import { RedisCache } 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 driver: RedisCache<T['id'], T> | 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<RedisCache<T['id'], T> | undefined>;
     protected toDate(input: string | number | Date): Date;
     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":"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"}

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;
@@ -37,7 +37,7 @@ 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;
         }
@@ -49,12 +49,12 @@ class OAuth2AbstractCache {
             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) {
@@ -69,11 +69,11 @@ class OAuth2AbstractCache {
         if (this.driver) {
             return this.driver;
         }
-        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)(),
+        this.driver = new server_kit_1.RedisCache({
+            redis: (0, server_kit_1.useRedisClient)(),
         }, { prefix: this.prefix });
         return this.driver;
     }

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/cleaner/event.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"event.d.ts","sourceRoot":"","sources":["../../../../src/http/oauth2/cleaner/event.ts"],"names":[],"mappings":"AAMA,wBAAsB,uBAAuB,kBA0B5C"}
+{"version":3,"file":"event.d.ts","sourceRoot":"","sources":["../../../../src/http/oauth2/cleaner/event.ts"],"names":[],"mappings":"AAIA,wBAAsB,uBAAuB,kBA0B5C"}

package/dist/http/oauth2/cleaner/event.js

@@ -1,14 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runOAuth2CleanerByEvent = void 0;
-const redis_extension_1 = require("redis-extension");
-const typeorm_extension_1 = require("typeorm-extension");
 const server_kit_1 = require("@authup/server-kit");
-const database_1 = require("../../../database");
+const typeorm_extension_1 = require("typeorm-extension");
 const domains_1 = require("../../../domains");
 async function runOAuth2CleanerByEvent() {
-    const redis = (0, redis_extension_1.useClient)();
-    const authorizationCodeCache = new redis_extension_1.Cache({ redis }, { prefix: database_1.CachePrefix.OAUTH2_AUTHORIZATION_CODE });
+    const redis = (0, server_kit_1.useRedisClient)();
+    const authorizationCodeCache = new server_kit_1.RedisCache({ redis }, { prefix: domains_1.CachePrefix.OAUTH2_AUTHORIZATION_CODE });
     authorizationCodeCache.on('expired', async (data) => {
         const dataSource = await (0, typeorm_extension_1.useDataSource)();
         const repository = dataSource.getRepository(domains_1.OAuth2AuthorizationCodeEntity);
@@ -17,7 +15,7 @@ async function runOAuth2CleanerByEvent() {
     });
     await authorizationCodeCache.start();
     // -------------------------------------------------
-    const refreshTokenCache = new redis_extension_1.Cache({ redis }, { prefix: database_1.CachePrefix.OAUTH2_REFRESH_TOKEN });
+    const refreshTokenCache = new server_kit_1.RedisCache({ redis }, { prefix: domains_1.CachePrefix.OAUTH2_REFRESH_TOKEN });
     refreshTokenCache.on('expired', async (data) => {
         const dataSource = await (0, typeorm_extension_1.useDataSource)();
         const repository = dataSource.getRepository(domains_1.OAuth2RefreshTokenEntity);

package/dist/http/oauth2/cleaner/event.js.map

@@ -1 +1 @@
-{"version":3,"file":"event.js","sourceRoot":"","sources":["../../../../src/http/oauth2/cleaner/event.ts"],"names":[],"mappings":";;;AAAA,qDAAmD;AACnD,yDAAkD;AAClD,mDAA+C;AAC/C,gDAAgD;AAChD,8CAA2F;AAEpF,KAAK,UAAU,uBAAuB;IACzC,MAAM,KAAK,GAAG,IAAA,2BAAS,GAAE,CAAC;IAE1B,MAAM,sBAAsB,GAAG,IAAI,uBAAK,CAAS,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,sBAAW,CAAC,yBAAyB,EAAE,CAAC,CAAC;IAC/G,sBAAsB,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QAChD,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,IAAI,CAAC,EAAE,CAAC,CAAC;QAEjC,IAAA,sBAAS,GAAE,CAAC,KAAK,CAAC,yCAAyC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;IAC1E,CAAC,CAAC,CAAC;IAEH,MAAM,sBAAsB,CAAC,KAAK,EAAE,CAAC;IAErC,oDAAoD;IAEpD,MAAM,iBAAiB,GAAG,IAAI,uBAAK,CAAS,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,sBAAW,CAAC,oBAAoB,EAAE,CAAC,CAAC;IACrG,iBAAiB,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QAC3C,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,IAAI,CAAC,EAAE,CAAC,CAAC;QAEjC,IAAA,sBAAS,GAAE,CAAC,IAAI,CAAC,oCAAoC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;IACpE,CAAC,CAAC,CAAC;IAEH,MAAM,iBAAiB,CAAC,KAAK,EAAE,CAAC;AACpC,CAAC;AA1BD,0DA0BC"}
+{"version":3,"file":"event.js","sourceRoot":"","sources":["../../../../src/http/oauth2/cleaner/event.ts"],"names":[],"mappings":";;;AAAA,mDAA2E;AAC3E,yDAAkD;AAClD,8CAAwG;AAEjG,KAAK,UAAU,uBAAuB;IACzC,MAAM,KAAK,GAAG,IAAA,2BAAc,GAAE,CAAC;IAE/B,MAAM,sBAAsB,GAAG,IAAI,uBAAU,CAAS,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,qBAAW,CAAC,yBAAyB,EAAE,CAAC,CAAC;IACpH,sBAAsB,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QAChD,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,IAAI,CAAC,EAAE,CAAC,CAAC;QAEjC,IAAA,sBAAS,GAAE,CAAC,KAAK,CAAC,yCAAyC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;IAC1E,CAAC,CAAC,CAAC;IAEH,MAAM,sBAAsB,CAAC,KAAK,EAAE,CAAC;IAErC,oDAAoD;IAEpD,MAAM,iBAAiB,GAAG,IAAI,uBAAU,CAAS,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,qBAAW,CAAC,oBAAoB,EAAE,CAAC,CAAC;IAC1G,iBAAiB,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QAC3C,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,IAAI,CAAC,EAAE,CAAC,CAAC;QAEjC,IAAA,sBAAS,GAAE,CAAC,IAAI,CAAC,oCAAoC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;IACpE,CAAC,CAAC,CAAC;IAEH,MAAM,iBAAiB,CAAC,KAAK,EAAE,CAAC;AACpC,CAAC;AA1BD,0DA0BC"}

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

@@ -7,13 +7,13 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runOAuth2Cleaner = void 0;
-const redis_extension_1 = require("redis-extension");
+const server_kit_1 = require("@authup/server-kit");
 const utils_1 = require("./utils");
 const interval_1 = require("./interval");
 const event_1 = require("./event");
 async function runOAuth2Cleaner() {
     await (0, utils_1.cleanUp)();
-    if ((0, redis_extension_1.hasConfig)() || (0, redis_extension_1.hasClient)()) {
+    if ((0, server_kit_1.isRedisClientUsable)()) {
         await (0, event_1.runOAuth2CleanerByEvent)();
     }
     else {

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

@@ -1 +1 @@
-{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../src/http/oauth2/cleaner/module.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qDAAuD;AACvD,mCAAkC;AAClC,yCAAwD;AACxD,mCAAkD;AAE3C,KAAK,UAAU,gBAAgB;IAClC,MAAM,IAAA,eAAO,GAAE,CAAC;IAEhB,IAAI,IAAA,2BAAS,GAAE,IAAI,IAAA,2BAAS,GAAE,EAAE,CAAC;QAC7B,MAAM,IAAA,+BAAuB,GAAE,CAAC;IACpC,CAAC;SAAM,CAAC;QACJ,MAAM,IAAA,qCAA0B,GAAE,CAAC;IACvC,CAAC;AACL,CAAC;AARD,4CAQC"}
+{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../src/http/oauth2/cleaner/module.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,mDAAyD;AACzD,mCAAkC;AAClC,yCAAwD;AACxD,mCAAkD;AAE3C,KAAK,UAAU,gBAAgB;IAClC,MAAM,IAAA,eAAO,GAAE,CAAC;IAEhB,IAAI,IAAA,gCAAmB,GAAE,EAAE,CAAC;QACxB,MAAM,IAAA,+BAAuB,GAAE,CAAC;IACpC,CAAC;SAAM,CAAC;QACJ,MAAM,IAAA,qCAA0B,GAAE,CAAC;IACvC,CAAC;AACL,CAAC;AARD,4CAQC"}

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"}

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

@@ -7,7 +7,8 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuthorizeGrantType = void 0;
-const core_1 = require("@authup/core");
+const kit_1 = require("@authup/kit");
+const core_kit_1 = require("@authup/core-kit");
 const body_1 = require("@routup/basic/body");
 const query_1 = require("@routup/basic/query");
 const typeorm_extension_1 = require("typeorm-extension");
@@ -21,7 +22,7 @@ class AuthorizeGrantType extends abstract_1.AbstractGrant {
         const accessToken = await this.issueAccessToken({
             remoteAddress: (0, routup_1.getRequestIP)(request, { trustProxy: true }),
             sub: authorizationCode.user_id,
-            subKind: core_1.OAuth2SubKind.USER,
+            subKind: kit_1.OAuth2SubKind.USER,
             realmId: authorizationCode.realm.id,
             realmName: authorizationCode.realm.name,
             scope: authorizationCode.scope,
@@ -30,11 +31,11 @@ class AuthorizeGrantType extends abstract_1.AbstractGrant {
         const refreshToken = await this.issueRefreshToken(accessToken);
         const buildContext = {
             accessToken,
-            accessTokenMaxAge: this.config.tokenMaxAgeAccessToken,
+            accessTokenMaxAge: this.config.tokenAccessMaxAge,
             refreshToken,
-            refreshTokenMaxAge: this.config.tokenMaxAgeRefreshToken,
+            refreshTokenMaxAge: this.config.tokenRefreshMaxAge,
         };
-        if ((0, core_1.hasOAuth2OpenIDScope)(authorizationCode.scope)) {
+        if ((0, core_kit_1.hasOAuth2OpenIDScope)(authorizationCode.scope)) {
             buildContext.idToken = authorizationCode.id_token;
         }
         return (0, response_1.buildOAuth2BearerTokenResponse)(buildContext);
@@ -50,12 +51,12 @@ class AuthorizeGrantType extends abstract_1.AbstractGrant {
             relations: ['user', 'realm'],
         });
         if (!entity) {
-            throw core_1.TokenError.grantInvalid();
+            throw kit_1.TokenError.grantInvalid();
         }
         if (entity.redirect_uri) {
             const redirectUri = this.getRedirectURI(request);
             if (!redirectUri || entity.redirect_uri !== redirectUri) {
-                throw core_1.TokenError.redirectUriMismatch();
+                throw kit_1.TokenError.redirectUriMismatch();
             }
         }
         await repository.remove(entity);
@@ -67,7 +68,7 @@ class AuthorizeGrantType extends abstract_1.AbstractGrant {
             code = (0, query_1.useRequestQuery)(request, 'code');
         }
         if (!code || typeof code !== 'string') {
-            throw core_1.TokenError.requestInvalid();
+            throw kit_1.TokenError.requestInvalid();
         }
         return code;
     }
@@ -77,7 +78,7 @@ class AuthorizeGrantType extends abstract_1.AbstractGrant {
             redirectUri = (0, query_1.useRequestQuery)(request, 'redirect_uri');
         }
         if (!redirectUri || typeof redirectUri !== 'string') {
-            throw core_1.TokenError.redirectUriMismatch();
+            throw kit_1.TokenError.redirectUriMismatch();
         }
         return redirectUri;
     }

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

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

package/dist/http/oauth2/grant-types/client-credentials.d.ts

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

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

@@ -1 +1 @@
-{"version":3,"file":"client-credentials.d.ts","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/client-credentials.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAO7D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAGtC,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAGpC,qBAAa,sBAAuB,SAAQ,aAAc,YAAW,KAAK;IAChE,GAAG,CAAC,OAAO,EAAE,OAAO,GAAI,OAAO,CAAC,wBAAwB,CAAC;IAuBzD,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAI,OAAO,CAAC,YAAY,CAAC;IAqBxD,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAI,CAAC,MAAM,EAAE,MAAM,CAAC;CAmBtE"}
+{"version":3,"file":"client-credentials.d.ts","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/client-credentials.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAU5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAGtC,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAGpC,qBAAa,sBAAuB,SAAQ,aAAc,YAAW,KAAK;IAChE,GAAG,CAAC,OAAO,EAAE,OAAO,GAAI,OAAO,CAAC,wBAAwB,CAAC;IAuBzD,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAI,OAAO,CAAC,YAAY,CAAC;IAqBxD,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAI,CAAC,MAAM,EAAE,MAAM,CAAC;CAmBtE"}

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

@@ -7,7 +7,8 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClientCredentialsGrant = void 0;
-const core_1 = require("@authup/core");
+const kit_1 = require("@authup/kit");
+const core_kit_1 = require("@authup/core-kit");
 const body_1 = require("@routup/basic/body");
 const query_1 = require("@routup/basic/query");
 const hapic_1 = require("hapic");
@@ -21,9 +22,9 @@ class ClientCredentialsGrant extends abstract_1.AbstractGrant {
         const client = await this.validate(request);
         const accessToken = await this.issueAccessToken({
             remoteAddress: (0, routup_1.getRequestIP)(request, { trustProxy: true }),
-            scope: core_1.ScopeName.GLOBAL,
+            scope: core_kit_1.ScopeName.GLOBAL,
             sub: client.id,
-            subKind: core_1.OAuth2SubKind.CLIENT,
+            subKind: kit_1.OAuth2SubKind.CLIENT,
             realmId: client.realm.id,
             realmName: client.realm.name,
             clientId: client.id,
@@ -31,9 +32,9 @@ class ClientCredentialsGrant extends abstract_1.AbstractGrant {
         const refreshToken = await this.issueRefreshToken(accessToken);
         return (0, response_1.buildOAuth2BearerTokenResponse)({
             accessToken,
-            accessTokenMaxAge: this.config.tokenMaxAgeAccessToken,
+            accessTokenMaxAge: this.config.tokenAccessMaxAge,
             refreshToken,
-            refreshTokenMaxAge: this.config.tokenMaxAgeRefreshToken,
+            refreshTokenMaxAge: this.config.tokenRefreshMaxAge,
         });
     }
     async validate(request) {
@@ -48,7 +49,7 @@ class ClientCredentialsGrant extends abstract_1.AbstractGrant {
             relations: ['realm'],
         });
         if (!entity) {
-            throw core_1.UserError.credentialsInvalid();
+            throw core_kit_1.UserError.credentialsInvalid();
         }
         return entity;
     }
@@ -59,7 +60,7 @@ class ClientCredentialsGrant extends abstract_1.AbstractGrant {
             const { authorization: headerValue } = request.headers;
             const header = (0, hapic_1.parseAuthorizationHeader)(headerValue);
             if (header.type !== hapic_1.AuthorizationHeaderType.BASIC) {
-                throw core_1.TokenError.requestInvalid();
+                throw kit_1.TokenError.requestInvalid();
             }
             clientId = header.username;
             clientSecret = header.password;

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

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

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

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

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,EAAQ,MAAM,cAAc,CAAC;AAInE,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,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"}