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

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

@@ -7,7 +7,8 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InternalGrantType = void 0;
-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 utils_1 = require("../../utils");
 const abstract_1 = require("./abstract");
@@ -17,18 +18,18 @@ class InternalGrantType extends abstract_1.AbstractGrant {
         const realm = (0, utils_1.useRequestEnv)(request, 'realm');
         const accessToken = await this.issueAccessToken({
             remoteAddress: (0, routup_1.getRequestIP)(request, { trustProxy: true }),
-            scope: core_1.ScopeName.GLOBAL,
+            scope: core_kit_1.ScopeName.GLOBAL,
             realmId: realm.id,
             realmName: realm.name,
             sub: (0, utils_1.useRequestEnv)(request, 'userId'),
-            subKind: core_1.OAuth2SubKind.USER,
+            subKind: kit_1.OAuth2SubKind.USER,
         });
         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,
         });
     }
 }

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;;;AAGH,uCAEsB;AAEtB,mCAAsC;AACtC,uCAA4C;AAC5C,yCAA2C;AAI3C,0CAA6D;AAE7D,MAAa,iBAAkB,SAAQ,wBAAa;IAChD,KAAK,CAAC,GAAG,CAAC,OAAgB;QACtB,MAAM,KAAK,GAAG,IAAA,qBAAa,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC9C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC;YAC5C,aAAa,EAAE,IAAA,qBAAY,EAAC,OAAO,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;YAC1D,KAAK,EAAE,gBAAS,CAAC,MAAM;YACvB,OAAO,EAAE,KAAK,CAAC,EAAE;YACjB,SAAS,EAAE,KAAK,CAAC,IAAI;YACrB,GAAG,EAAE,IAAA,qBAAa,EAAC,OAAO,EAAE,QAAQ,CAAe;YACnD,OAAO,EAAE,oBAAa,CAAC,IAAI;SAC9B,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;QAE/D,OAAO,IAAA,yCAA8B,EAAC;YAClC,WAAW;YACX,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,sBAAsB;YACrD,YAAY;YACZ,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,uBAAuB;SAC1D,CAAC,CAAC;IACP,CAAC;CACJ;AArBD,8CAqBC"}
+{"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"}

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

@@ -1,10 +1,11 @@
-import type { OAuth2TokenGrantResponse } from '@authup/core';
+import type { OAuth2TokenGrantResponse } from '@authup/kit';
 import type { Request } from 'routup';
-import type { UserEntity } from '../../../domains';
+import { UserEntity } from '../../../domains';
 import { AbstractGrant } from './abstract';
 import type { Grant } from './type';
 export declare class PasswordGrantType extends AbstractGrant implements Grant {
     run(request: Request): Promise<OAuth2TokenGrantResponse>;
     validate(request: Request): Promise<UserEntity>;
+    protected verifyCredentialsByLDAP(user: string, password: string, realmId?: string): Promise<UserEntity>;
 }
 //# sourceMappingURL=password.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"password.d.ts","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/password.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAO7D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAGtC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAEpC,qBAAa,iBAAkB,SAAQ,aAAc,YAAW,KAAK;IAC3D,GAAG,CAAC,OAAO,EAAE,OAAO,GAAI,OAAO,CAAC,wBAAwB,CAAC;IAsBzD,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAI,OAAO,CAAC,UAAU,CAAC;CA0BzD"}
+{"version":3,"file":"password.d.ts","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/password.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAO5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAItC,OAAO,EAEuB,UAAU,EAEvC,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAEpC,qBAAa,iBAAkB,SAAQ,aAAc,YAAW,KAAK;IAC3D,GAAG,CAAC,OAAO,EAAE,OAAO,GAAI,OAAO,CAAC,wBAAwB,CAAC;IAsBzD,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAI,OAAO,CAAC,UAAU,CAAC;cAmCtC,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAI,OAAO,CAAC,UAAU,CAAC;CA2DlH"}

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

@@ -7,46 +7,103 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PasswordGrantType = 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 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 abstract_1 = require("./abstract");
 class PasswordGrantType extends abstract_1.AbstractGrant {
     async run(request) {
         const user = 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: user.id,
-            subKind: core_1.OAuth2SubKind.USER,
+            subKind: kit_1.OAuth2SubKind.USER,
             realmId: user.realm.id,
             realmName: user.realm.name,
         });
         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) {
-        const { username, password, realm_id: realmId } = (0, body_1.useRequestBody)(request);
-        const realm = await (0, domains_1.resolveRealm)((0, routup_1.useRequestParam)(request, 'realmId') || realmId);
+        const { username, password, realm_id: requestRealmId } = (0, body_1.useRequestBody)(request);
+        const realm = await (0, domains_1.resolveRealm)((0, routup_1.useRequestParam)(request, 'realmId') || requestRealmId);
         const dataSource = await (0, typeorm_extension_1.useDataSource)();
         const repository = new domains_1.UserRepository(dataSource);
-        const entity = await repository.verifyCredentials(username, password, (0, core_1.extractObjectProperty)(realm, 'id'));
+        let realmId;
+        if (realm && realm.id) {
+            realmId = realm.id;
+        }
+        let entity = await repository.verifyCredentials(username, password, realmId);
         if (!entity) {
-            throw core_1.UserError.credentialsInvalid();
+            entity = await this.verifyCredentialsByLDAP(username, password, realmId);
+        }
+        if (!entity) {
+            throw core_kit_1.UserError.credentialsInvalid();
         }
         if (!entity.active) {
-            throw core_1.UserError.inactive();
+            throw core_kit_1.UserError.inactive();
         }
         return entity;
     }
+    async verifyCredentialsByLDAP(user, password, realmId) {
+        const dataSource = await (0, typeorm_extension_1.useDataSource)();
+        const repository = new domains_1.IdentityProviderRepository(dataSource);
+        let entities = [];
+        if (realmId) {
+            entities = await repository.createQueryBuilder('provider')
+                .where('provider.realm_id = :realmId', { realmId })
+                .andWhere('provider.protocol = :protocol', { protocol: core_kit_1.IdentityProviderProtocol.LDAP })
+                .getMany();
+        }
+        else {
+            entities = await repository.createQueryBuilder('provider')
+                .andWhere('provider.protocol = :protocol', { protocol: core_kit_1.IdentityProviderProtocol.LDAP })
+                .getMany();
+        }
+        let account;
+        let identity;
+        for (let i = 0; i < entities.length; i++) {
+            const entity = await repository.extendEntity(entities[i]);
+            if (entity.protocol !== core_kit_1.IdentityProviderProtocol.LDAP) {
+                continue;
+            }
+            const flow = new domains_1.LdapIdentityProviderFlow(entity);
+            try {
+                identity = await flow.getIdentityForCredentials(user, password);
+                await flow.unbind();
+            }
+            catch (e) {
+                await flow.unbind();
+                continue;
+            }
+            account = await (0, domains_1.createIdentityProviderAccount)(entity, identity);
+            break;
+        }
+        if (!account) {
+            return undefined;
+        }
+        if (account.user &&
+            account.user.realm) {
+            return account.user;
+        }
+        const userRepository = dataSource.getRepository(domains_1.UserEntity);
+        return userRepository.findOne({
+            where: {
+                id: account.user_id,
+            },
+            relations: ['realm'],
+        });
+    }
 }
 exports.PasswordGrantType = PasswordGrantType;
 //# sourceMappingURL=password.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"password.js","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/password.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,uCAIsB;AACtB,6CAAoD;AAEpD,mCAAuD;AACvD,yDAAkD;AAElD,8CAAgE;AAChE,yCAA2C;AAC3C,0CAA6D;AAG7D,MAAa,iBAAkB,SAAQ,wBAAa;IAChD,KAAK,CAAC,GAAG,CAAC,OAAgB;QACtB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAE1C,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,IAAI,CAAC,EAAE;YACZ,OAAO,EAAE,oBAAa,CAAC,IAAI;YAC3B,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE;YACtB,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI;SAC7B,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,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,IAAA,qBAAc,EAAC,OAAO,CAAC,CAAC;QAE1E,MAAM,KAAK,GAAG,MAAM,IAAA,sBAAY,EAC5B,IAAA,wBAAe,EAAC,OAAO,EAAE,SAAS,CAAC,IAAI,OAAO,CACjD,CAAC;QAEF,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;QACzC,MAAM,UAAU,GAAG,IAAI,wBAAc,CAAC,UAAU,CAAC,CAAC;QAElD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,iBAAiB,CAC7C,QAAQ,EACR,QAAQ,EACR,IAAA,4BAAqB,EAAC,KAAK,EAAE,IAAI,CAAC,CACrC,CAAC;QAEF,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,gBAAS,CAAC,kBAAkB,EAAE,CAAC;QACzC,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACjB,MAAM,gBAAS,CAAC,QAAQ,EAAE,CAAC;QAC/B,CAAC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AAjDD,8CAiDC"}
+{"version":3,"file":"password.js","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/password.ts"],"names":[],"mappings":"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"}

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

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

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

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

@@ -7,7 +7,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RefreshTokenGrantType = void 0;
-const core_1 = require("@authup/core");
+const kit_1 = require("@authup/kit");
 const body_1 = require("@routup/basic/body");
 const routup_1 = require("routup");
 const typeorm_extension_1 = require("typeorm-extension");
@@ -18,8 +18,8 @@ const token_1 = require("../token");
 class RefreshTokenGrantType extends abstract_1.AbstractGrant {
     async run(request) {
         const token = await this.validate(request);
-        const subKind = (0, core_1.getOAuth2SubKindByEntity)(token);
-        const sub = (0, core_1.getOAuth2SubByEntity)(token);
+        const subKind = (0, kit_1.getOAuth2SubKindByEntity)(token);
+        const sub = (0, kit_1.getOAuth2SubByEntity)(token);
         const accessToken = await this.issueAccessToken({
             remoteAddress: (0, routup_1.getRequestIP)(request, { trustProxy: true }),
             scope: token.scope,
@@ -31,9 +31,9 @@ class RefreshTokenGrantType 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,11 +48,11 @@ class RefreshTokenGrantType extends abstract_1.AbstractGrant {
             relations: ['realm'],
         });
         if (!entity) {
-            throw core_1.TokenError.tokenNotFound(core_1.OAuth2TokenKind.REFRESH);
+            throw kit_1.TokenError.tokenNotFound(kit_1.OAuth2TokenKind.REFRESH);
         }
         const expires = Date.parse(entity.expires);
         if (expires < Date.now()) {
-            throw core_1.TokenError.expired(core_1.OAuth2TokenKind.REFRESH);
+            throw kit_1.TokenError.expired(kit_1.OAuth2TokenKind.REFRESH);
         }
         await repository.remove(entity);
         return entity;

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,uCAEsB;AACtB,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,+BAAwB,EAAC,KAAK,CAAC,CAAC;QAChD,MAAM,GAAG,GAAG,IAAA,2BAAoB,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,sBAAsB;YACrD,YAAY;YACZ,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,uBAAuB;SAC1D,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,iBAAU,CAAC,aAAa,CAAC,sBAAe,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,iBAAU,CAAC,OAAO,CAAC,sBAAe,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":";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"}

package/dist/http/oauth2/grant-types/robot-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 type { RobotEntity } from '../../../domains';
 import { AbstractGrant } from './abstract';

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

@@ -1 +1 @@
-{"version":3,"file":"robot-credentials.d.ts","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/robot-credentials.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAO7D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAGtC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAEpC,qBAAa,yBAA0B,SAAQ,aAAc,YAAW,KAAK;IACnE,GAAG,CAAC,OAAO,EAAE,OAAO,GAAI,OAAO,CAAC,wBAAwB,CAAC;IAmBzD,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAI,OAAO,CAAC,WAAW,CAAC;CAiB1D"}
+{"version":3,"file":"robot-credentials.d.ts","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/robot-credentials.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAO5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAGtC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAEpC,qBAAa,yBAA0B,SAAQ,aAAc,YAAW,KAAK;IACnE,GAAG,CAAC,OAAO,EAAE,OAAO,GAAI,OAAO,CAAC,wBAAwB,CAAC;IAmBzD,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAI,OAAO,CAAC,WAAW,CAAC;CAiB1D"}

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

@@ -7,7 +7,8 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RobotCredentialsGrantType = 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 routup_1 = require("routup");
 const typeorm_extension_1 = require("typeorm-extension");
@@ -19,16 +20,16 @@ class RobotCredentialsGrantType extends abstract_1.AbstractGrant {
         const entity = await this.validate(request);
         const accessToken = await this.issueAccessToken({
             remoteAddress: (0, routup_1.getRequestIP)(request, { trustProxy: true }),
-            scope: core_1.ScopeName.GLOBAL,
-            subKind: core_1.OAuth2SubKind.ROBOT,
+            scope: core_kit_1.ScopeName.GLOBAL,
+            subKind: kit_1.OAuth2SubKind.ROBOT,
             sub: entity.id,
             realmId: entity.realm.id,
             realmName: entity.realm.name,
         });
         return (0, response_1.buildOAuth2BearerTokenResponse)({
             accessToken,
-            accessTokenMaxAge: this.config.tokenMaxAgeAccessToken,
-            refreshTokenMaxAge: this.config.tokenMaxAgeRefreshToken,
+            accessTokenMaxAge: this.config.tokenAccessMaxAge,
+            refreshTokenMaxAge: this.config.tokenRefreshMaxAge,
         });
     }
     async validate(request) {
@@ -37,10 +38,10 @@ class RobotCredentialsGrantType extends abstract_1.AbstractGrant {
         const repository = new domains_1.RobotRepository(dataSource);
         const entity = await repository.verifyCredentials(id, secret);
         if (!entity) {
-            throw core_1.RobotError.credentialsInvalid();
+            throw core_kit_1.RobotError.credentialsInvalid();
         }
         if (!entity.active) {
-            throw core_1.RobotError.inactive();
+            throw core_kit_1.RobotError.inactive();
         }
         return entity;
     }

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

@@ -1 +1 @@
-{"version":3,"file":"robot-credentials.js","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/robot-credentials.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,uCAIsB;AACtB,6CAAoD;AAEpD,mCAAsC;AACtC,yDAAkD;AAElD,8CAAmD;AACnD,yCAA2C;AAC3C,0CAA6D;AAG7D,MAAa,yBAA0B,SAAQ,wBAAa;IACxD,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,OAAO,EAAE,oBAAa,CAAC,KAAK;YAC5B,GAAG,EAAE,MAAM,CAAC,EAAE;YACd,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE;YACxB,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI;SAC/B,CAAC,CAAC;QAEH,OAAO,IAAA,yCAA8B,EAAC;YAClC,WAAW;YACX,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,sBAAsB;YACrD,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,uBAAuB;SAC1D,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAAgB;QAC3B,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,IAAA,qBAAc,EAAC,OAAO,CAAC,CAAC;QAE/C,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;QACzC,MAAM,UAAU,GAAG,IAAI,yBAAe,CAAC,UAAU,CAAC,CAAC;QACnD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,iBAAiB,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QAE9D,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,iBAAU,CAAC,kBAAkB,EAAE,CAAC;QAC1C,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACjB,MAAM,iBAAU,CAAC,QAAQ,EAAE,CAAC;QAChC,CAAC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AArCD,8DAqCC"}
+{"version":3,"file":"robot-credentials.js","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/robot-credentials.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,qCAA4C;AAC5C,+CAG0B;AAC1B,6CAAoD;AAEpD,mCAAsC;AACtC,yDAAkD;AAElD,8CAAmD;AACnD,yCAA2C;AAC3C,0CAA6D;AAG7D,MAAa,yBAA0B,SAAQ,wBAAa;IACxD,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,OAAO,EAAE,mBAAa,CAAC,KAAK;YAC5B,GAAG,EAAE,MAAM,CAAC,EAAE;YACd,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE;YACxB,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI;SAC/B,CAAC,CAAC;QAEH,OAAO,IAAA,yCAA8B,EAAC;YAClC,WAAW;YACX,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,iBAAiB;YAChD,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,kBAAkB;SACrD,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAAgB;QAC3B,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,IAAA,qBAAc,EAAC,OAAO,CAAC,CAAC;QAE/C,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;QACzC,MAAM,UAAU,GAAG,IAAI,yBAAe,CAAC,UAAU,CAAC,CAAC;QACnD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,iBAAiB,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QAE9D,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,qBAAU,CAAC,kBAAkB,EAAE,CAAC;QAC1C,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACjB,MAAM,qBAAU,CAAC,QAAQ,EAAE,CAAC;QAChC,CAAC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AArCD,8DAqCC"}

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

@@ -1,4 +1,4 @@
-import type { OAuth2SubKind, OAuth2TokenGrantResponse } from '@authup/core';
+import type { OAuth2SubKind, OAuth2TokenGrantResponse } from '@authup/kit';
 import type { Request } from 'routup';
 export type AccessTokenIssueContext = {
     remoteAddress: string;

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

@@ -1 +1 @@
-{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/type.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EACR,aAAa,EAAE,wBAAwB,EAC1C,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAEtC,MAAM,MAAM,uBAAuB,GAAG;IAClC,aAAa,EAAE,MAAM,CAAC;IAEtB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,GAAG,aAAa,EAAE,CAAC;IAE5B,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAElB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAIF,MAAM,WAAW,KAAK;IAClB,GAAG,CAAC,OAAO,EAAE,OAAO,GAAI,OAAO,CAAC,wBAAwB,CAAC,CAAC;CAC7D"}
+{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/type.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EACR,aAAa,EAAE,wBAAwB,EAC1C,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAEtC,MAAM,MAAM,uBAAuB,GAAG;IAClC,aAAa,EAAE,MAAM,CAAC;IAEtB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,GAAG,aAAa,EAAE,CAAC;IAE5B,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAElB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAIF,MAAM,WAAW,KAAK;IAClB,GAAG,CAAC,OAAO,EAAE,OAAO,GAAI,OAAO,CAAC,wBAAwB,CAAC,CAAC;CAC7D"}

package/dist/http/oauth2/grant-types/utils/guess.d.ts

@@ -1,4 +1,4 @@
-import { OAuth2TokenGrant } from '@authup/core';
+import { OAuth2TokenGrant } from '@authup/kit';
 import type { Request } from 'routup';
 export declare function guessOauth2GrantTypeByRequest(request: Request): `${OAuth2TokenGrant}` | undefined;
 //# sourceMappingURL=guess.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"guess.d.ts","sourceRoot":"","sources":["../../../../../src/http/oauth2/grant-types/utils/guess.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAIhD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAEtC,wBAAgB,6BAA6B,CACzC,OAAO,EAAE,OAAO,GAChB,GAAG,gBAAgB,EAAE,GAAG,SAAS,CA6DpC"}
+{"version":3,"file":"guess.d.ts","sourceRoot":"","sources":["../../../../../src/http/oauth2/grant-types/utils/guess.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAI/C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAEtC,wBAAgB,6BAA6B,CACzC,OAAO,EAAE,OAAO,GAChB,GAAG,gBAAgB,EAAE,GAAG,SAAS,CA6DpC"}

package/dist/http/oauth2/grant-types/utils/guess.js

@@ -7,36 +7,36 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.guessOauth2GrantTypeByRequest = void 0;
-const core_1 = require("@authup/core");
+const kit_1 = require("@authup/kit");
 const body_1 = require("@routup/basic/body");
 const query_1 = require("@routup/basic/query");
 const hapic_1 = require("hapic");
 function guessOauth2GrantTypeByRequest(request) {
     const grantType = (0, body_1.useRequestBody)(request, 'grant_type') || (0, query_1.useRequestQuery)(request, 'grant_type');
-    const validGrantTypes = Object.values(core_1.OAuth2TokenGrant);
+    const validGrantTypes = Object.values(kit_1.OAuth2TokenGrant);
     if (validGrantTypes.indexOf(grantType) !== -1) {
         return grantType;
     }
     const username = (0, body_1.useRequestBody)(request, 'username') || (0, query_1.useRequestQuery)(request, 'username');
     const password = (0, body_1.useRequestBody)(request, 'password') || (0, query_1.useRequestQuery)(request, 'password');
     if (username && password) {
-        return core_1.OAuth2TokenGrant.PASSWORD;
+        return kit_1.OAuth2TokenGrant.PASSWORD;
     }
     // ------------------------------------------------------------------
     const robotId = (0, body_1.useRequestBody)(request, 'id') || (0, query_1.useRequestQuery)(request, 'id');
     const robotSecret = (0, body_1.useRequestBody)(request, 'secret') || (0, query_1.useRequestQuery)(request, 'secret');
     if (robotId && robotSecret) {
-        return core_1.OAuth2TokenGrant.ROBOT_CREDENTIALS;
+        return kit_1.OAuth2TokenGrant.ROBOT_CREDENTIALS;
     }
     // ------------------------------------------------------------------
     const refreshToken = (0, body_1.useRequestBody)(request, 'refresh_token') || (0, query_1.useRequestQuery)(request, 'refresh_token');
     if (refreshToken) {
-        return core_1.OAuth2TokenGrant.REFRESH_TOKEN;
+        return kit_1.OAuth2TokenGrant.REFRESH_TOKEN;
     }
     // ------------------------------------------------------------------
     const code = (0, body_1.useRequestBody)(request, 'code') || (0, query_1.useRequestQuery)(request, 'code');
     if (code) {
-        return core_1.OAuth2TokenGrant.AUTHORIZATION_CODE;
+        return kit_1.OAuth2TokenGrant.AUTHORIZATION_CODE;
     }
     // ------------------------------------------------------------------
     let clientId = (0, body_1.useRequestBody)(request, 'client_id') || (0, query_1.useRequestQuery)(request, 'client_id');
@@ -52,7 +52,7 @@ function guessOauth2GrantTypeByRequest(request) {
         }
     }
     if (clientId && clientSecret) {
-        return core_1.OAuth2TokenGrant.CLIENT_CREDENTIALS;
+        return kit_1.OAuth2TokenGrant.CLIENT_CREDENTIALS;
     }
     return undefined;
 }

package/dist/http/oauth2/grant-types/utils/guess.js.map

@@ -1 +1 @@
-{"version":3,"file":"guess.js","sourceRoot":"","sources":["../../../../../src/http/oauth2/grant-types/utils/guess.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,uCAAgD;AAChD,6CAAoD;AACpD,+CAAsD;AACtD,iCAA0E;AAG1E,SAAgB,6BAA6B,CACzC,OAAgB;IAEhB,MAAM,SAAS,GAAG,IAAA,qBAAc,EAAC,OAAO,EAAE,YAAY,CAAC,IAAI,IAAA,uBAAe,EAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAElG,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC,uBAAgB,CAAC,CAAC;IACxD,IAAI,eAAe,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;QAC5C,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,QAAQ,GAAG,IAAA,qBAAc,EAAC,OAAO,EAAE,UAAU,CAAC,IAAI,IAAA,uBAAe,EAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAC7F,MAAM,QAAQ,GAAG,IAAA,qBAAc,EAAC,OAAO,EAAE,UAAU,CAAC,IAAI,IAAA,uBAAe,EAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAE7F,IAAI,QAAQ,IAAI,QAAQ,EAAE,CAAC;QACvB,OAAO,uBAAgB,CAAC,QAAQ,CAAC;IACrC,CAAC;IAED,qEAAqE;IAErE,MAAM,OAAO,GAAG,IAAA,qBAAc,EAAC,OAAO,EAAE,IAAI,CAAC,IAAI,IAAA,uBAAe,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAChF,MAAM,WAAW,GAAG,IAAA,qBAAc,EAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,IAAA,uBAAe,EAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAE5F,IAAI,OAAO,IAAI,WAAW,EAAE,CAAC;QACzB,OAAO,uBAAgB,CAAC,iBAAiB,CAAC;IAC9C,CAAC;IAED,qEAAqE;IAErE,MAAM,YAAY,GAAG,IAAA,qBAAc,EAAC,OAAO,EAAE,eAAe,CAAC,IAAI,IAAA,uBAAe,EAAC,OAAO,EAAE,eAAe,CAAC,CAAC;IAC3G,IAAI,YAAY,EAAE,CAAC;QACf,OAAO,uBAAgB,CAAC,aAAa,CAAC;IAC1C,CAAC;IAED,qEAAqE;IAErE,MAAM,IAAI,GAAG,IAAA,qBAAc,EAAC,OAAO,EAAE,MAAM,CAAC,IAAI,IAAA,uBAAe,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACjF,IAAI,IAAI,EAAE,CAAC;QACP,OAAO,uBAAgB,CAAC,kBAAkB,CAAC;IAC/C,CAAC;IAED,qEAAqE;IAErE,IAAI,QAAQ,GAAG,IAAA,qBAAc,EAAC,OAAO,EAAE,WAAW,CAAC,IAAI,IAAA,uBAAe,EAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IAC7F,IAAI,YAAY,GAAG,IAAA,qBAAc,EAAC,OAAO,EAAE,eAAe,CAAC,IAAI,IAAA,uBAAe,EAAC,OAAO,EAAE,eAAe,CAAC,CAAC;IAEzG,IAAI,CAAC,QAAQ,IAAI,CAAC,YAAY,EAAE,CAAC;QAC7B,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;QAEvD,IAAI,WAAW,EAAE,CAAC;YACd,MAAM,MAAM,GAAG,IAAA,gCAAwB,EAAC,WAAW,CAAC,CAAC;YAErD,IAAI,MAAM,CAAC,IAAI,KAAK,+BAAuB,CAAC,KAAK,EAAE,CAAC;gBAChD,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;gBAC3B,YAAY,GAAG,MAAM,CAAC,QAAQ,CAAC;YACnC,CAAC;QACL,CAAC;IACL,CAAC;IAED,IAAI,QAAQ,IAAI,YAAY,EAAE,CAAC;QAC3B,OAAO,uBAAgB,CAAC,kBAAkB,CAAC;IAC/C,CAAC;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AA/DD,sEA+DC"}
+{"version":3,"file":"guess.js","sourceRoot":"","sources":["../../../../../src/http/oauth2/grant-types/utils/guess.ts"],"names":[],"mappings":"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"}

package/dist/http/oauth2/openid/claims.d.ts

@@ -1,4 +1,4 @@
-import type { OAuth2OpenIdTokenPayload } from '@authup/core';
-import { OAuth2SubKind } from '@authup/core';
+import type { OAuth2OpenIdTokenPayload } from '@authup/kit';
+import { OAuth2SubKind } from '@authup/kit';
 export declare function resolveOpenIdClaimsFromSubEntity(subKind: OAuth2SubKind | `${OAuth2SubKind}`, attributes: Record<string, any>): Partial<OAuth2OpenIdTokenPayload>;
 //# sourceMappingURL=claims.d.ts.map

package/dist/http/oauth2/openid/claims.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"claims.d.ts","sourceRoot":"","sources":["../../../../src/http/oauth2/openid/claims.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EACA,wBAAwB,EACnC,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAkB,MAAM,cAAc,CAAC;AAgC7D,wBAAgB,gCAAgC,CAC5C,OAAO,EAAE,aAAa,GAAG,GAAG,aAAa,EAAE,EAC3C,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC/B,OAAO,CAAC,wBAAwB,CAAC,CAwDpC"}
+{"version":3,"file":"claims.d.ts","sourceRoot":"","sources":["../../../../src/http/oauth2/openid/claims.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAkB,MAAM,aAAa,CAAC;AAmC5D,wBAAgB,gCAAgC,CAC5C,OAAO,EAAE,aAAa,GAAG,GAAG,aAAa,EAAE,EAC3C,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC/B,OAAO,CAAC,wBAAwB,CAAC,CAwDpC"}

package/dist/http/oauth2/openid/claims.js

@@ -7,20 +7,20 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveOpenIdClaimsFromSubEntity = void 0;
-const core_1 = require("@authup/core");
+const kit_1 = require("@authup/kit");
 function extractAttributesByAttributeMap(attributeMap, attributes) {
     const result = {};
     const keys = Object.keys(attributeMap);
     for (let i = 0; i < keys.length; i++) {
         const attribute = attributeMap[keys[i]];
         if (typeof attribute === 'string') {
-            if ((0, core_1.hasOwnProperty)(attributes, attribute)) {
+            if ((0, kit_1.hasOwnProperty)(attributes, attribute)) {
                 result[keys[i]] = attributes[attribute];
             }
         }
         else {
             const [key, transformer] = attribute;
-            if ((0, core_1.hasOwnProperty)(attributes, key)) {
+            if ((0, kit_1.hasOwnProperty)(attributes, key)) {
                 result[keys[i]] = transformer(attributes[key]);
             }
         }
@@ -29,7 +29,7 @@ function extractAttributesByAttributeMap(attributeMap, attributes) {
 }
 function resolveOpenIdClaimsFromSubEntity(subKind, attributes) {
     switch (subKind) {
-        case core_1.OAuth2SubKind.USER: {
+        case kit_1.OAuth2SubKind.USER: {
             const attributeMap = {
                 name: 'name',
                 family_name: 'last_name',
@@ -47,7 +47,7 @@ function resolveOpenIdClaimsFromSubEntity(subKind, attributes) {
             };
             return extractAttributesByAttributeMap(attributeMap, attributes);
         }
-        case core_1.OAuth2SubKind.CLIENT: {
+        case kit_1.OAuth2SubKind.CLIENT: {
             const attributeMap = {
                 name: 'name',
                 nickname: 'name',
@@ -61,7 +61,7 @@ function resolveOpenIdClaimsFromSubEntity(subKind, attributes) {
             };
             return extractAttributesByAttributeMap(attributeMap, attributes);
         }
-        case core_1.OAuth2SubKind.ROBOT: {
+        case kit_1.OAuth2SubKind.ROBOT: {
             const attributeMap = {
                 name: 'name',
                 nickname: 'name',

package/dist/http/oauth2/openid/claims.js.map

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

package/dist/http/oauth2/response/bearer.d.ts

@@ -1,4 +1,4 @@
-import type { OAuth2TokenGrantResponse } from '@authup/core';
+import type { OAuth2TokenGrantResponse } from '@authup/kit';
 import type { OAuth2BearerResponseBuildContext } from './type';
 export declare function buildOAuth2BearerTokenResponse(context: OAuth2BearerResponseBuildContext): Promise<OAuth2TokenGrantResponse>;
 //# sourceMappingURL=bearer.d.ts.map

package/dist/http/oauth2/response/bearer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bearer.d.ts","sourceRoot":"","sources":["../../../../src/http/oauth2/response/bearer.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,wBAAwB,EAAsB,MAAM,cAAc,CAAC;AAIjF,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,QAAQ,CAAC;AAE/D,wBAAsB,8BAA8B,CAChD,OAAO,EAAE,gCAAgC,qCA+E5C"}
+{"version":3,"file":"bearer.d.ts","sourceRoot":"","sources":["../../../../src/http/oauth2/response/bearer.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,wBAAwB,EAAsB,MAAM,aAAa,CAAC;AAIhF,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,QAAQ,CAAC;AAE/D,wBAAsB,8BAA8B,CAChD,OAAO,EAAE,gCAAgC,qCAkF5C"}

package/dist/http/oauth2/response/bearer.js

@@ -7,7 +7,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildOAuth2BearerTokenResponse = void 0;
-const core_1 = require("@authup/core");
+const kit_1 = require("@authup/kit");
 const domains_1 = require("../../../domains");
 async function buildOAuth2BearerTokenResponse(context) {
     const accessTokenMaxAge = context.accessTokenMaxAge || 7200;
@@ -35,13 +35,15 @@ async function buildOAuth2BearerTokenResponse(context) {
         if (typeof key === 'undefined') {
             const realmId = getRealmId();
             if (!realmId) {
-                throw core_1.TokenError.signingKeyMissing();
+                throw kit_1.TokenError.signingKeyMissing();
             }
             key = await (0, domains_1.useKey)({ realm_id: realmId });
         }
+        if (typeof token.exp === 'undefined') {
+            token.exp = Math.floor(new Date().getTime() / 1000) + (maxAge || accessTokenMaxAge);
+        }
         return (0, domains_1.signOAuth2TokenWithKey)(token, key, {
-            keyid: key.id,
-            expiresIn: maxAge || accessTokenMaxAge,
+            keyId: key.id,
         });
     };
     const response = {

package/dist/http/oauth2/response/bearer.js.map

@@ -1 +1 @@
-{"version":3,"file":"bearer.js","sourceRoot":"","sources":["../../../../src/http/oauth2/response/bearer.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,uCAA0C;AAE1C,8CAAkE;AAG3D,KAAK,UAAU,8BAA8B,CAChD,OAAyC;IAEzC,MAAM,iBAAiB,GAAY,OAAO,CAAC,iBAAiB,IAAI,IAAI,CAAC;IAErE,MAAM,UAAU,GAAG,GAAwB,EAAE;QACzC,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YAClB,OAAO,OAAO,CAAC,OAAO,CAAC;QAC3B,CAAC;QAED,IAAI,OAAO,OAAO,CAAC,WAAW,KAAK,QAAQ,EAAE,CAAC;YAC1C,OAAO,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC;QACxC,CAAC;QAED,IACI,OAAO,CAAC,YAAY;YACpB,OAAO,OAAO,CAAC,YAAY,KAAK,QAAQ,EAC1C,CAAC;YACC,OAAO,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC;QACzC,CAAC;QAED,OAAO,OAAO,CAAC,OAAO;YAClB,OAAO,OAAO,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC;YACrC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAC1B,SAAS,CAAC;IAClB,CAAC,CAAC;IAEF,IAAI,GAA2B,CAAC;IAEhC,MAAM,SAAS,GAAG,KAAK,EACnB,KAA2C,EAC3C,MAAe,EACC,EAAE;QAClB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC5B,OAAO,KAAK,CAAC;QACjB,CAAC;QAED,IAAI,OAAO,GAAG,KAAK,WAAW,EAAE,CAAC;YAC7B,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;YAC7B,IAAI,CAAC,OAAO,EAAE,CAAC;gBACX,MAAM,iBAAU,CAAC,iBAAiB,EAAE,CAAC;YACzC,CAAC;YAED,GAAG,GAAG,MAAM,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;QAC9C,CAAC;QAED,OAAO,IAAA,gCAAsB,EACzB,KAAK,EACL,GAAG,EACH;YACI,KAAK,EAAE,GAAG,CAAC,EAAE;YACb,SAAS,EAAE,MAAM,IAAI,iBAAiB;SACzC,CACJ,CAAC;IACN,CAAC,CAAC;IAEF,MAAM,QAAQ,GAA8B;QACxC,YAAY,EAAE,MAAM,SAAS,CAAC,OAAO,CAAC,WAAW,CAAC;QAClD,UAAU,EAAE,iBAAiB;QAC7B,UAAU,EAAE,QAAQ;KACvB,CAAC;IAEF,IACI,OAAO,OAAO,CAAC,WAAW,KAAK,QAAQ;QACvC,OAAO,CAAC,WAAW,CAAC,KAAK,EAC3B,CAAC;QACC,QAAQ,CAAC,KAAK,GAAG,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC;IAC/C,CAAC;SAAM,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;QACvB,QAAQ,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IACnC,CAAC;IAED,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;QACvB,QAAQ,CAAC,aAAa,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAC/F,CAAC;IAED,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QAClB,QAAQ,CAAC,QAAQ,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;IAChF,CAAC;IAED,OAAO,QAAQ,CAAC;AACpB,CAAC;AAhFD,wEAgFC"}
+{"version":3,"file":"bearer.js","sourceRoot":"","sources":["../../../../src/http/oauth2/response/bearer.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,qCAAyC;AAEzC,8CAAkE;AAG3D,KAAK,UAAU,8BAA8B,CAChD,OAAyC;IAEzC,MAAM,iBAAiB,GAAY,OAAO,CAAC,iBAAiB,IAAI,IAAI,CAAC;IAErE,MAAM,UAAU,GAAG,GAAwB,EAAE;QACzC,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YAClB,OAAO,OAAO,CAAC,OAAO,CAAC;QAC3B,CAAC;QAED,IAAI,OAAO,OAAO,CAAC,WAAW,KAAK,QAAQ,EAAE,CAAC;YAC1C,OAAO,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC;QACxC,CAAC;QAED,IACI,OAAO,CAAC,YAAY;YACpB,OAAO,OAAO,CAAC,YAAY,KAAK,QAAQ,EAC1C,CAAC;YACC,OAAO,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC;QACzC,CAAC;QAED,OAAO,OAAO,CAAC,OAAO;YAClB,OAAO,OAAO,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC;YACrC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAC1B,SAAS,CAAC;IAClB,CAAC,CAAC;IAEF,IAAI,GAA2B,CAAC;IAEhC,MAAM,SAAS,GAAG,KAAK,EACnB,KAA2C,EAC3C,MAAe,EACC,EAAE;QAClB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC5B,OAAO,KAAK,CAAC;QACjB,CAAC;QAED,IAAI,OAAO,GAAG,KAAK,WAAW,EAAE,CAAC;YAC7B,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;YAC7B,IAAI,CAAC,OAAO,EAAE,CAAC;gBACX,MAAM,gBAAU,CAAC,iBAAiB,EAAE,CAAC;YACzC,CAAC;YAED,GAAG,GAAG,MAAM,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;QAC9C,CAAC;QAED,IAAI,OAAO,KAAK,CAAC,GAAG,KAAK,WAAW,EAAE,CAAC;YACnC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,iBAAiB,CAAC,CAAC;QACxF,CAAC;QAED,OAAO,IAAA,gCAAsB,EACzB,KAAK,EACL,GAAG,EACH;YACI,KAAK,EAAE,GAAG,CAAC,EAAE;SAChB,CACJ,CAAC;IACN,CAAC,CAAC;IAEF,MAAM,QAAQ,GAA8B;QACxC,YAAY,EAAE,MAAM,SAAS,CAAC,OAAO,CAAC,WAAW,CAAC;QAClD,UAAU,EAAE,iBAAiB;QAC7B,UAAU,EAAE,QAAQ;KACvB,CAAC;IAEF,IACI,OAAO,OAAO,CAAC,WAAW,KAAK,QAAQ;QACvC,OAAO,CAAC,WAAW,CAAC,KAAK,EAC3B,CAAC;QACC,QAAQ,CAAC,KAAK,GAAG,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC;IAC/C,CAAC;SAAM,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;QACvB,QAAQ,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IACnC,CAAC;IAED,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;QACvB,QAAQ,CAAC,aAAa,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAC/F,CAAC;IAED,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QAClB,QAAQ,CAAC,QAAQ,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;IAChF,CAAC;IAED,OAAO,QAAQ,CAAC;AACpB,CAAC;AAnFD,wEAmFC"}

package/dist/http/oauth2/response/type.d.ts

@@ -1,4 +1,4 @@
-import type { OAuth2TokenPayload } from '@authup/core';
+import type { OAuth2TokenPayload } from '@authup/kit';
 export type OAuth2BearerResponseBuildContext = {
     accessToken: Partial<OAuth2TokenPayload> | string;
     accessTokenMaxAge?: number;

package/dist/http/oauth2/response/type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../../../src/http/oauth2/response/type.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAEvD,MAAM,MAAM,gCAAgC,GAAG;IAC3C,WAAW,EAAE,OAAO,CAAC,kBAAkB,CAAC,GAAG,MAAM,CAAC;IAClD,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,YAAY,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,GAAG,MAAM,CAAC;IACpD,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAE5B,OAAO,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,GAAG,MAAM,CAAC;IAC/C,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,KAAK,CAAC,EAAE,MAAM,CAAA;CACjB,CAAC"}
+{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../../../src/http/oauth2/response/type.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEtD,MAAM,MAAM,gCAAgC,GAAG;IAC3C,WAAW,EAAE,OAAO,CAAC,kBAAkB,CAAC,GAAG,MAAM,CAAC;IAClD,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,YAAY,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,GAAG,MAAM,CAAC;IACpD,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAE5B,OAAO,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,GAAG,MAAM,CAAC;IAC/C,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,KAAK,CAAC,EAAE,MAAM,CAAA;CACjB,CAAC"}

package/dist/http/oauth2/response/utils/type.d.ts

@@ -1,4 +1,4 @@
-import { OAuth2AuthorizationResponseType } from '@authup/core';
+import { OAuth2AuthorizationResponseType } from '@authup/kit';
 import type { Request } from 'routup';
 export declare function getOauth2AuthorizeResponseTypesByRequest(request: Request): Record<`${OAuth2AuthorizationResponseType}`, boolean>;
 //# sourceMappingURL=type.d.ts.map

package/dist/http/oauth2/response/utils/type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../../../../src/http/oauth2/response/utils/type.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,+BAA+B,EAAc,MAAM,cAAc,CAAC;AAG3E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAEtC,wBAAgB,wCAAwC,CACpD,OAAO,EAAE,OAAO,GAChB,MAAM,CAAC,GAAG,+BAA+B,EAAE,EAAE,OAAO,CAAC,CA2BxD"}
+{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../../../../src/http/oauth2/response/utils/type.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,+BAA+B,EAAc,MAAM,aAAa,CAAC;AAG1E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAEtC,wBAAgB,wCAAwC,CACpD,OAAO,EAAE,OAAO,GAChB,MAAM,CAAC,GAAG,+BAA+B,EAAE,EAAE,OAAO,CAAC,CA2BxD"}