@authup/server-core 1.0.0-beta.30 → 1.0.0-beta.32

package/dist/adapters/http/controllers/workflows/password-reset/module.js

@@ -16,57 +16,27 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
-import { NotFoundError } from '@ebec/http';
-import { DController, DPost, DRequest, DResponse, } from '@routup/decorators';
-import { RoutupContainerAdapter } from '@validup/adapter-routup';
+import { DBody, DController, DPost, DRequest, DResponse, } from '@routup/decorators';
 import { sendAccepted } from 'routup';
-import { useDataSource, validateEntityJoinColumns } from 'typeorm-extension';
-import { UserEntity, resolveRealm } from "../../../../database/domains/index.js";
-import { PasswordResetRequestValidator } from "./validator.js";
 let PasswordResetController = class PasswordResetController {
-    repository;
-    validator;
+    service;
     constructor(ctx) {
-        this.repository = ctx.repository;
-        const validator = new PasswordResetRequestValidator();
-        this.validator = new RoutupContainerAdapter(validator);
+        this.service = ctx.service;
     }
-    async execute(req, res) {
-        const data = await this.validator.run(req);
-        // todo: remove this.
-        const dataSource = await useDataSource();
-        await validateEntityJoinColumns(data, {
-            dataSource,
-            entityTarget: UserEntity,
-        });
-        const where = {
-            ...(data.name ? { name: data.name } : {}),
-            ...(data.email ? { email: data.email } : {}),
-            reset_hash: data.token,
-        };
-        const realm = await resolveRealm(data.realm_id, true);
-        where.realm_id = realm.id;
-        const entity = await this.repository.findOneBy(where);
-        if (!entity) {
-            throw new NotFoundError();
-        }
-        entity.reset_at = new Date().toISOString();
-        entity.reset_hash = null;
-        entity.reset_expires = null;
-        await this.repository.save(entity);
+    async execute(data, req, res) {
+        const result = await this.service.resetPassword(data);
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-expect-error
-        return sendAccepted(res, {
-            reset_at: entity.reset_at,
-        });
+        return sendAccepted(res, result);
     }
 };
 __decorate([
     DPost('', []),
-    __param(0, DRequest()),
-    __param(1, DResponse()),
+    __param(0, DBody()),
+    __param(1, DRequest()),
+    __param(2, DResponse()),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object]),
+    __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", Promise)
 ], PasswordResetController.prototype, "execute", null);
 PasswordResetController = __decorate([

package/dist/adapters/http/controllers/workflows/password-reset/module.js.map

@@ -1 +1 @@
-{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../../../src/adapters/http/controllers/workflows/password-reset/module.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;;;;;;;;;;;;;AAIH,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EACH,WAAW,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,GAC1C,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAE,aAAa,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AAC7E,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAE,6BAA6B,EAAE,MAAM,gBAAgB,CAAC;AAOxD,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IACtB,UAAU,CAAmB;IAE7B,SAAS,CAAoD;IAEvE,YAAY,GAAmC;QAC3C,IAAI,CAAC,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC;QAEjC,MAAM,SAAS,GAAG,IAAI,6BAA6B,EAAE,CAAC;QACtD,IAAI,CAAC,SAAS,GAAG,IAAI,sBAAsB,CAAC,SAAS,CAAC,CAAC;IAC3D,CAAC;IAGK,AAAN,KAAK,CAAC,OAAO,CACG,GAAY,EACP,GAAa;QAE9B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAE3C,qBAAqB;QACrB,MAAM,UAAU,GAAG,MAAM,aAAa,EAAE,CAAC;QACzC,MAAM,yBAAyB,CAAC,IAAI,EAAE;YAClC,UAAU;YACV,YAAY,EAAE,UAAU;SAC3B,CAAC,CAAC;QAEH,MAAM,KAAK,GAA4B;YACnC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACzC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC5C,UAAU,EAAE,IAAI,CAAC,KAAK;SACzB,CAAC;QAEF,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QACtD,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC,EAAE,CAAC;QAE1B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACtD,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,IAAI,aAAa,EAAE,CAAC;QAC9B,CAAC;QAED,MAAM,CAAC,QAAQ,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAC3C,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC;QACzB,MAAM,CAAC,aAAa,GAAG,IAAI,CAAC;QAE5B,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAEnC,6DAA6D;QAC7D,mBAAmB;QACnB,OAAO,YAAY,CAAC,GAAG,EAAE;YACrB,QAAQ,EAAE,MAAM,CAAC,QAAQ;SAC5B,CAAC,CAAC;IACP,CAAC;CACJ,CAAA;AAvCS;IADL,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC;IAET,WAAA,QAAQ,EAAE,CAAA;IACN,WAAA,SAAS,EAAE,CAAA;;;;sDAoCnB;AAnDQ,uBAAuB;IADnC,WAAW,CAAC,iBAAiB,CAAC;;GAClB,uBAAuB,CAoDnC"}
+{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../../../src/adapters/http/controllers/workflows/password-reset/module.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;;;;;;;;;;;;;AAGH,OAAO,EACH,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,GACjD,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAQ/B,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IACtB,OAAO,CAA2B;IAE5C,YAAY,GAAmC;QAC3C,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;IAC/B,CAAC;IAGK,AAAN,KAAK,CAAC,OAAO,CACA,IAAS,EACN,GAAY,EACX,GAAa;QAE1B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAEtD,6DAA6D;QAC7D,mBAAmB;QACnB,OAAO,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACrC,CAAC;CACJ,CAAA;AAXS;IADL,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC;IAET,WAAA,KAAK,EAAE,CAAA;IACP,WAAA,QAAQ,EAAE,CAAA;IACV,WAAA,SAAS,EAAE,CAAA;;;;sDAOf;AAlBQ,uBAAuB;IADnC,WAAW,CAAC,iBAAiB,CAAC;;GAClB,uBAAuB,CAmBnC"}

package/dist/adapters/http/controllers/workflows/register/module.d.ts

@@ -1,24 +1,12 @@
-import { RegisterResponse } from '@authup/core-http-kit';
-import { User } from '@authup/core-kit';
-import { RoutupContainerAdapter } from '@validup/adapter-routup';
+import type { RegisterResponse } from '@authup/core-http-kit';
 import type { Request, Response } from 'routup';
-import type { Repository } from 'typeorm';
-import { IMailClient } from '../../../../../core/index.ts';
-export type RegisterControllerOptions = {
-    registration?: boolean;
-    emailVerification?: boolean;
-};
+import type { IRegistrationService } from '../../../../../core/index.ts';
 export type RegisterControllerContext = {
-    options: RegisterControllerOptions;
-    mailClient: IMailClient;
-    repository: Repository<User>;
+    service: IRegistrationService;
 };
 export declare class RegisterController {
-    protected options: RegisterControllerOptions;
-    protected mailClient: IMailClient;
-    protected repository: Repository<User>;
-    protected validator: RoutupContainerAdapter<User>;
+    protected service: IRegistrationService;
     constructor(ctx: RegisterControllerContext);
-    execute(req: Request, res: Response): Promise<RegisterResponse>;
+    execute(data: any, req: Request, res: Response): Promise<RegisterResponse>;
 }
 //# sourceMappingURL=module.d.ts.map

package/dist/adapters/http/controllers/workflows/register/module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../../../../src/adapters/http/controllers/workflows/register/module.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAMxC,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAEhD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAE1C,OAAO,EAAE,WAAW,EAA0B,MAAM,8BAA8B,CAAC;AAKnF,MAAM,MAAM,yBAAyB,GAAG;IACpC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAC9B,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACpC,OAAO,EAAE,yBAAyB,CAAC;IACnC,UAAU,EAAE,WAAW,CAAC;IACxB,UAAU,EAAE,UAAU,CAAC,IAAI,CAAC,CAAA;CAC/B,CAAC;AAEF,qBACa,kBAAkB;IAC3B,SAAS,CAAC,OAAO,EAAE,yBAAyB,CAAC;IAE7C,SAAS,CAAC,UAAU,EAAE,WAAW,CAAC;IAElC,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;IAEvC,SAAS,CAAC,SAAS,EAAG,sBAAsB,CAAC,IAAI,CAAC,CAAC;gBAEvC,GAAG,EAAE,yBAAyB;IAUpC,OAAO,CACG,GAAG,EAAE,OAAO,EACP,GAAG,EAAE,QAAQ,GAC/B,OAAO,CAAC,gBAAgB,CAAC;CAmD/B"}
+{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../../../../src/adapters/http/controllers/workflows/register/module.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAI9D,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAEhD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEzE,MAAM,MAAM,yBAAyB,GAAG;IACpC,OAAO,EAAE,oBAAoB,CAAC;CACjC,CAAC;AAEF,qBACa,kBAAkB;IAC3B,SAAS,CAAC,OAAO,EAAE,oBAAoB,CAAC;gBAE5B,GAAG,EAAE,yBAAyB;IAKpC,OAAO,CACA,IAAI,EAAE,GAAG,EACN,GAAG,EAAE,OAAO,EACX,GAAG,EAAE,QAAQ,GAC3B,OAAO,CAAC,gBAAgB,CAAC;CAO/B"}

package/dist/adapters/http/controllers/workflows/register/module.js

@@ -16,79 +16,27 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
-import { createNanoID } from '@authup/kit';
-import { BadRequestError } from '@ebec/http';
-import { DController, DPost, DRequest, DResponse, } from '@routup/decorators';
-import { RoutupContainerAdapter } from '@validup/adapter-routup';
-import { randomBytes } from 'node:crypto';
+import { DBody, DController, DPost, DRequest, DResponse, } from '@routup/decorators';
 import { sendAccepted } from 'routup';
-import { useDataSource, validateEntityJoinColumns } from 'typeorm-extension';
-import { UserCredentialsService } from "../../../../../core/index.js";
-import { UserEntity, resolveRealm } from "../../../../database/domains/index.js";
-import { RequestHandlerOperation } from "../../../request/index.js";
-import { RegisterRequestValidator } from "./validator.js";
 let RegisterController = class RegisterController {
-    options;
-    mailClient;
-    repository;
-    validator;
+    service;
     constructor(ctx) {
-        this.options = ctx.options;
-        this.mailClient = ctx.mailClient;
-        this.repository = ctx.repository;
-        const validator = new RegisterRequestValidator();
-        this.validator = new RoutupContainerAdapter(validator);
+        this.service = ctx.service;
     }
-    async execute(req, res) {
-        if (!this.options.registration) {
-            throw new BadRequestError('User registration is not enabled.');
-        }
-        const data = await this.validator.run(req, {
-            group: RequestHandlerOperation.CREATE,
-        });
-        // todo: remove this
-        const dataSource = await useDataSource();
-        await validateEntityJoinColumns(data, {
-            dataSource,
-            entityTarget: UserEntity,
-        });
-        if (this.options.emailVerification) {
-            data.active = false;
-            data.activate_hash = randomBytes(32).toString('hex');
-        }
-        else {
-            data.active = true;
-        }
-        const entity = this.repository.create(data);
-        const credentialsService = new UserCredentialsService();
-        entity.password = entity.password || createNanoID(64);
-        entity.password = await credentialsService.protect(entity.password);
-        const realm = await resolveRealm(entity.realm_id, true);
-        entity.realm_id = realm.id;
-        await this.repository.save(entity);
-        if (this.options.emailVerification) {
-            await this.mailClient.send({
-                to: entity.email,
-                subject: 'Registration - Activation code',
-                html: `
-                <p>Please use the code below to activate your account and start using the site.</p>
-                <p>${entity.activate_hash}</p>
-                `,
-            });
-        }
+    async execute(data, req, res) {
+        const result = await this.service.register(data);
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-expect-error
-        return sendAccepted(res, {
-            active: entity.active,
-        });
+        return sendAccepted(res, result);
     }
 };
 __decorate([
     DPost('', []),
-    __param(0, DRequest()),
-    __param(1, DResponse()),
+    __param(0, DBody()),
+    __param(1, DRequest()),
+    __param(2, DResponse()),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object]),
+    __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", Promise)
 ], RegisterController.prototype, "execute", null);
 RegisterController = __decorate([

package/dist/adapters/http/controllers/workflows/register/module.js.map

@@ -1 +1 @@
-{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../../../src/adapters/http/controllers/workflows/register/module.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../../../src/adapters/http/controllers/workflows/register/module.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;;;;;;;;;;;;;AAGH,OAAO,EACH,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,GACjD,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAQ/B,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IACjB,OAAO,CAAuB;IAExC,YAAY,GAA8B;QACtC,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;IAC/B,CAAC;IAGK,AAAN,KAAK,CAAC,OAAO,CACA,IAAS,EACN,GAAY,EACX,GAAa;QAE1B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEjD,6DAA6D;QAC7D,mBAAmB;QACnB,OAAO,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACrC,CAAC;CACJ,CAAA;AAXS;IADL,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC;IAET,WAAA,KAAK,EAAE,CAAA;IACP,WAAA,QAAQ,EAAE,CAAA;IACV,WAAA,SAAS,EAAE,CAAA;;;;iDAOf;AAlBQ,kBAAkB;IAD9B,WAAW,CAAC,WAAW,CAAC;;GACZ,kBAAkB,CAmB9B"}

package/dist/adapters/http/controllers/workflows/token/module.d.ts

@@ -1,20 +1,21 @@
-import { OAuth2TokenGrant, OAuth2TokenGrantResponse, type OAuth2TokenIntrospectionResponse } from '@authup/specs';
+import type { OAuth2TokenGrantResponse, OAuth2TokenIntrospectionResponse } from '@authup/specs';
+import { OAuth2TokenGrant } from '@authup/specs';
 import type { Request, Response } from 'routup';
-import type { TokenControllerContext, TokenControllerOptions } from './types.ts';
-import { IIdentityResolver, IOAuth2TokenIssuer, IOAuth2TokenRevoker, IOAuth2TokenVerifier } from '../../../../../core/index.ts';
-import { IHTTPOAuth2Grant } from '../../../adapters/index.ts';
+import type { TokenControllerContext } from './types.ts';
+import type { IIdentityPermissionProvider, IIdentityResolver, IOAuth2TokenIssuer, IOAuth2TokenRevoker, IOAuth2TokenVerifier } from '../../../../../core/index.ts';
+import type { IHTTPOAuth2Grant } from '../../../adapters/index.ts';
 export declare class TokenController {
-    protected options: TokenControllerOptions;
     protected refreshTokenIssuer: IOAuth2TokenIssuer;
     protected accessTokenIssuer: IOAuth2TokenIssuer;
     protected tokenVerifier: IOAuth2TokenVerifier;
     protected tokenRevoker: IOAuth2TokenRevoker;
     protected identityResolver: IIdentityResolver;
+    protected identityPermissionProvider: IIdentityPermissionProvider;
     protected tokenGrants: Record<`${OAuth2TokenGrant}`, IHTTPOAuth2Grant>;
     constructor(ctx: TokenControllerContext);
     getIntrospect(req: Request): Promise<OAuth2TokenIntrospectionResponse>;
     postIntrospect(req: Request): Promise<OAuth2TokenIntrospectionResponse>;
     revokeToken(req: Request, res: Response): Promise<void>;
-    createToken(req: Request, res: Response): Promise<OAuth2TokenGrantResponse>;
+    createToken(req: Request): Promise<OAuth2TokenGrantResponse>;
 }
 //# sourceMappingURL=module.d.ts.map

package/dist/adapters/http/controllers/workflows/token/module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../../../../src/adapters/http/controllers/workflows/token/module.ts"],"names":[],"mappings":"AAOA,OAAO,EAEH,gBAAgB,EAChB,wBAAwB,EACxB,KAAK,gCAAgC,EACxC,MAAM,eAAe,CAAC;AAIvB,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAOhD,OAAO,KAAK,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AACjF,OAAO,EACH,iBAAiB,EACjB,kBAAkB,EAClB,mBAAmB,EACnB,oBAAoB,EAEvB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAMH,gBAAgB,EAEnB,MAAM,4BAA4B,CAAC;AAIpC,qBAEa,eAAe;IACxB,SAAS,CAAC,OAAO,EAAE,sBAAsB,CAAC;IAE1C,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAEjD,SAAS,CAAC,iBAAiB,EAAE,kBAAkB,CAAC;IAEhD,SAAS,CAAC,aAAa,EAAE,oBAAoB,CAAC;IAE9C,SAAS,CAAC,YAAY,EAAE,mBAAmB,CAAC;IAE5C,SAAS,CAAC,gBAAgB,EAAG,iBAAiB,CAAC;IAE/C,SAAS,CAAC,WAAW,EAAG,MAAM,CAAC,GAAG,gBAAgB,EAAE,EAAE,gBAAgB,CAAC,CAAC;gBAI5D,GAAG,EAAE,sBAAsB;IA4CjC,aAAa,CACH,GAAG,EAAE,OAAO,GACzB,OAAO,CAAC,gCAAgC,CAAC;IAKtC,cAAc,CACJ,GAAG,EAAE,OAAO,GACzB,OAAO,CAAC,gCAAgC,CAAC;IAsDtC,WAAW,CACL,GAAG,EAAE,OAAO,EACP,GAAG,EAAE,QAAQ;IAkBxB,WAAW,CACD,GAAG,EAAE,OAAO,EACP,GAAG,EAAE,QAAQ,GAC/B,OAAO,CAAC,wBAAwB,CAAC;CAwDvC"}
+{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../../../../src/adapters/http/controllers/workflows/token/module.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EACR,wBAAwB,EAAE,gCAAgC,EAAwB,MAAM,eAAe,CAAC;AAC5G,OAAO,EAAe,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAI9D,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAIhD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AACzD,OAAO,KAAK,EACR,2BAA2B,EAC3B,iBAAiB,EACjB,kBAAkB,EAClB,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAIpF,OAAO,KAAK,EACR,gBAAgB,EAAC,MAAM,4BAA4B,CAAC;AAWxD,qBAEa,eAAe;IACxB,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAEjD,SAAS,CAAC,iBAAiB,EAAE,kBAAkB,CAAC;IAEhD,SAAS,CAAC,aAAa,EAAE,oBAAoB,CAAC;IAE9C,SAAS,CAAC,YAAY,EAAE,mBAAmB,CAAC;IAE5C,SAAS,CAAC,gBAAgB,EAAG,iBAAiB,CAAC;IAE/C,SAAS,CAAC,0BAA0B,EAAG,2BAA2B,CAAC;IAEnE,SAAS,CAAC,WAAW,EAAG,MAAM,CAAC,GAAG,gBAAgB,EAAE,EAAE,gBAAgB,CAAC,CAAC;gBAI5D,GAAG,EAAE,sBAAsB;IA4CjC,aAAa,CACH,GAAG,EAAE,OAAO,GACzB,OAAO,CAAC,gCAAgC,CAAC;IAKtC,cAAc,CACJ,GAAG,EAAE,OAAO,GACzB,OAAO,CAAC,gCAAgC,CAAC;IA8DtC,WAAW,CACD,GAAG,EAAE,OAAO,EACX,GAAG,EAAE,QAAQ;IAkBxB,WAAW,CACD,GAAG,EAAE,OAAO,GACzB,OAAO,CAAC,wBAAwB,CAAC;CAavC"}

package/dist/adapters/http/controllers/workflows/token/module.js

@@ -16,34 +16,30 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
-import { OAuth2Error, OAuth2TokenGrant, } from '@authup/specs';
+import { OAuth2Error, OAuth2TokenGrant } from '@authup/specs';
 import { DController, DGet, DPost, DRequest, DResponse, DTags, } from '@routup/decorators';
-import { getRequestHostName, sendAccepted } from 'routup';
-import { setResponseCookie } from '@routup/basic/cookie';
-import { CookieName } from '@authup/core-http-kit';
-import { useDataSource } from 'typeorm-extension';
-import { pickRecord } from '@authup/kit';
+import { sendAccepted } from 'routup';
+import { buildPermissionBindingKey } from '@authup/core-kit';
 import { toOAuth2Error } from "../../../../../core/oauth2/helpers/index.js";
 import { OAuth2OpenIDClaimsBuilder, } from "../../../../../core/index.js";
 import { HTTPClientCredentialsGrant, HTTPOAuth2AuthorizeGrant, HTTPOAuth2RefreshTokenGrant, HTTPPasswordGrant, HTTPRobotCredentialsGrant, guessOauth2GrantTypeByRequest, } from "../../../adapters/index.js";
 import { extractTokenFromRequest } from "./utils/index.js";
-import { IdentityPermissionService } from "../../../../../services/index.js";
 let TokenController = class TokenController {
-    options;
     refreshTokenIssuer;
     accessTokenIssuer;
     tokenVerifier;
     tokenRevoker;
     identityResolver;
+    identityPermissionProvider;
     tokenGrants;
     // -------------------------------------------
     constructor(ctx) {
-        this.options = ctx.options;
         this.refreshTokenIssuer = ctx.refreshTokenIssuer;
         this.accessTokenIssuer = ctx.accessTokenIssuer;
         this.tokenVerifier = ctx.tokenVerifier;
         this.tokenRevoker = ctx.tokenRevoker;
         this.identityResolver = ctx.identityResolver;
+        this.identityPermissionProvider = ctx.identityPermissionProvider;
         this.tokenGrants = {
             [OAuth2TokenGrant.AUTHORIZATION_CODE]: new HTTPOAuth2AuthorizeGrant({
                 codeVerifier: ctx.codeVerifier,
@@ -86,13 +82,11 @@ let TokenController = class TokenController {
             const payload = await this.tokenVerifier.verify(token, {
                 skipActiveCheck: true,
             });
-            const dataSource = await useDataSource();
-            const identityPermissionService = new IdentityPermissionService(dataSource);
             if (!payload.sub || !payload.sub_kind) {
                 throw OAuth2Error.identityInvalid();
             }
             // todo: only receive client specific permissions
-            const permissions = await identityPermissionService.getFor({
+            const permissions = await this.identityPermissionProvider.getFor({
                 id: payload.sub,
                 type: payload.sub_kind,
                 clientId: payload.client_id,
@@ -116,8 +110,17 @@ let TokenController = class TokenController {
             return {
                 active,
                 // todo: permissions property should be removed.
-                permissions: permissions
-                    .map((permission) => pickRecord(permission, ['name', 'client_id', 'realm_id'])),
+                permissions: Object.values(permissions.reduce((acc, binding) => {
+                    const key = buildPermissionBindingKey(binding.permission);
+                    if (!acc[key]) {
+                        acc[key] = {
+                            name: binding.permission.name,
+                            client_id: binding.permission.client_id,
+                            realm_id: binding.permission.realm_id,
+                        };
+                    }
+                    return acc;
+                }, {})),
                 ...payload,
                 ...claims,
             };
@@ -139,7 +142,7 @@ let TokenController = class TokenController {
         }
     }
     // ----------------------------------------------------------
-    async createToken(req, res) {
+    async createToken(req) {
         const grantType = guessOauth2GrantTypeByRequest(req);
         if (!grantType) {
             throw OAuth2Error.grantInvalid();
@@ -148,32 +151,7 @@ let TokenController = class TokenController {
         if (!grant) {
             throw OAuth2Error.grantInvalid();
         }
-        const grantResponse = await grant.runWithRequest(req);
-        const domainsRaw = [
-            ...this.options.cookieDomains,
-        ];
-        const requestHostName = getRequestHostName(req, {
-            trustProxy: true,
-        });
-        if (requestHostName) {
-            domainsRaw.push(requestHostName);
-        }
-        const domains = [...new Set(domainsRaw)];
-        for (let i = 0; i < domains.length; i++) {
-            const domain = domains[i];
-            setResponseCookie(res, CookieName.ACCESS_TOKEN, grantResponse.access_token, {
-                domain,
-                maxAge: grantResponse.expires_in * 1_000,
-            });
-            if (grantResponse.refresh_token &&
-                grantResponse.refresh_token_expires_in) {
-                setResponseCookie(res, CookieName.REFRESH_TOKEN, grantResponse.refresh_token, {
-                    domain,
-                    maxAge: grantResponse.refresh_token_expires_in * 1_000,
-                });
-            }
-        }
-        return grantResponse;
+        return grant.runWithRequest(req);
     }
 };
 __decorate([
@@ -201,9 +179,8 @@ __decorate([
 __decorate([
     DPost('', []),
     __param(0, DRequest()),
-    __param(1, DResponse()),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object]),
+    __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", Promise)
 ], TokenController.prototype, "createToken", null);
 TokenController = __decorate([

package/dist/adapters/http/controllers/workflows/token/module.js.map

@@ -1 +1 @@
-{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../../../src/adapters/http/controllers/workflows/token/module.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../../../src/adapters/http/controllers/workflows/token/module.ts"],"names":[],"mappings":"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"}

package/dist/adapters/http/controllers/workflows/token/types.d.ts

@@ -1,11 +1,6 @@
 import type { Client, Robot, User } from '@authup/core-kit';
-import type { ICredentialsAuthenticator, IIdentityResolver, IOAuth2AuthorizationCodeVerifier, IOAuth2TokenIssuer, IOAuth2TokenRevoker, IOAuth2TokenVerifier, ISessionManager } from '../../../../../core/index.ts';
-export type TokenControllerOptions = {
-    cookieDomains: string[];
-};
+import type { ICredentialsAuthenticator, IIdentityPermissionProvider, IIdentityResolver, IOAuth2AuthorizationCodeVerifier, IOAuth2TokenIssuer, IOAuth2TokenRevoker, IOAuth2TokenVerifier, ISessionManager } from '../../../../../core/index.ts';
 export type TokenControllerContext = {
-    options: TokenControllerOptions;
-    cookieDomain?: string;
     codeVerifier: IOAuth2AuthorizationCodeVerifier;
     accessTokenIssuer: IOAuth2TokenIssuer;
     refreshTokenIssuer: IOAuth2TokenIssuer;
@@ -13,6 +8,7 @@ export type TokenControllerContext = {
     tokenRevoker: IOAuth2TokenRevoker;
     sessionManager: ISessionManager;
     identityResolver: IIdentityResolver;
+    identityPermissionProvider: IIdentityPermissionProvider;
     clientAuthenticator: ICredentialsAuthenticator<Client>;
     robotAuthenticator: ICredentialsAuthenticator<Robot>;
     userAuthenticator: ICredentialsAuthenticator<User>;

package/dist/adapters/http/controllers/workflows/token/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../src/adapters/http/controllers/workflows/token/types.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,KAAK,EACR,yBAAyB,EACzB,iBAAiB,EACjB,gCAAgC,EAChC,kBAAkB,EAClB,mBAAmB,EACnB,oBAAoB,EAAE,eAAe,EACxC,MAAM,8BAA8B,CAAC;AAEtC,MAAM,MAAM,sBAAsB,GAAG;IACjC,aAAa,EAAE,MAAM,EAAE,CAAA;CAC1B,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACjC,OAAO,EAAE,sBAAsB,CAAC;IAChC,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB,YAAY,EAAE,gCAAgC,CAAC;IAE/C,iBAAiB,EAAE,kBAAkB,CAAC;IACtC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,aAAa,EAAE,oBAAoB,CAAC;IACpC,YAAY,EAAE,mBAAmB,CAAC;IAElC,cAAc,EAAE,eAAe,CAAC;IAEhC,gBAAgB,EAAE,iBAAiB,CAAC;IAEpC,mBAAmB,EAAE,yBAAyB,CAAC,MAAM,CAAC,CAAA;IACtD,kBAAkB,EAAE,yBAAyB,CAAC,KAAK,CAAC,CAAA;IACpD,iBAAiB,EAAE,yBAAyB,CAAC,IAAI,CAAC,CAAA;CACrD,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../src/adapters/http/controllers/workflows/token/types.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,KAAK,EACR,yBAAyB,EACzB,2BAA2B,EAC3B,iBAAiB,EACjB,gCAAgC,EAChC,kBAAkB,EAClB,mBAAmB,EAAE,oBAAoB,EAAE,eAAe,EAC7D,MAAM,8BAA8B,CAAC;AAEtC,MAAM,MAAM,sBAAsB,GAAG;IACjC,YAAY,EAAE,gCAAgC,CAAC;IAE/C,iBAAiB,EAAE,kBAAkB,CAAC;IACtC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,aAAa,EAAE,oBAAoB,CAAC;IACpC,YAAY,EAAE,mBAAmB,CAAC;IAElC,cAAc,EAAE,eAAe,CAAC;IAEhC,gBAAgB,EAAE,iBAAiB,CAAC;IACpC,0BAA0B,EAAE,2BAA2B,CAAC;IAExD,mBAAmB,EAAE,yBAAyB,CAAC,MAAM,CAAC,CAAA;IACtD,kBAAkB,EAAE,yBAAyB,CAAC,KAAK,CAAC,CAAA;IACpD,iBAAiB,EAAE,yBAAyB,CAAC,IAAI,CAAC,CAAA;CACrD,CAAC"}

package/dist/adapters/http/controllers/workflows/token/utils/extract.js

@@ -18,7 +18,7 @@ export async function extractTokenFromRequest(req) {
         });
         token = data.token;
     }
-    catch (e) {
+    catch {
         token = useRequestToken(req);
     }
     if (!token) {

package/dist/adapters/http/controllers/workflows/token/utils/extract.js.map

@@ -1 +1 @@
-{"version":3,"file":"extract.js","sourceRoot":"","sources":["../../../../../../../src/adapters/http/controllers/workflows/token/utils/extract.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EACH,YAAY,EAAE,6BAA6B,EAAE,eAAe,GAC/D,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAEvD,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,GAAY;IACtD,IAAI,KAA0B,CAAC;IAE/B,IAAI,CAAC;QACD,MAAM,SAAS,GAAG,IAAI,qBAAqB,EAAE,CAAC;QAC9C,MAAM,gBAAgB,GAAG,IAAI,sBAAsB,CAAC,SAAS,CAAC,CAAC;QAC/D,MAAM,IAAI,GAAG,MAAM,gBAAgB,CAAC,GAAG,CAAC,GAAG,EAAE;YACzC,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC;SACzC,CAAC,CAAC;QAEH,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;IACvB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,KAAK,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;IACjC,CAAC;IAED,IAAI,CAAC,KAAK,EAAE,CAAC;QACT,MAAM,IAAI,YAAY,CAAC;YACnB,eAAe,CAAC;gBACZ,IAAI,EAAE,CAAC,OAAO,CAAC;gBACf,OAAO,EAAE,6BAA6B,CAAC,OAAO,CAAC;aAClD,CAAC;SACL,CAAC,CAAC;IACP,CAAC;IAED,OAAO,KAAK,CAAC;AACjB,CAAC"}
+{"version":3,"file":"extract.js","sourceRoot":"","sources":["../../../../../../../src/adapters/http/controllers/workflows/token/utils/extract.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EACH,YAAY,EAAE,6BAA6B,EAAE,eAAe,GAC/D,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAEvD,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,GAAY;IACtD,IAAI,KAA0B,CAAC;IAE/B,IAAI,CAAC;QACD,MAAM,SAAS,GAAG,IAAI,qBAAqB,EAAE,CAAC;QAC9C,MAAM,gBAAgB,GAAG,IAAI,sBAAsB,CAAC,SAAS,CAAC,CAAC;QAC/D,MAAM,IAAI,GAAG,MAAM,gBAAgB,CAAC,GAAG,CAAC,GAAG,EAAE;YACzC,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC;SACzC,CAAC,CAAC;QAEH,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;IACvB,CAAC;IAAC,MAAM,CAAC;QACL,KAAK,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;IACjC,CAAC;IAED,IAAI,CAAC,KAAK,EAAE,CAAC;QACT,MAAM,IAAI,YAAY,CAAC;YACnB,eAAe,CAAC;gBACZ,IAAI,EAAE,CAAC,OAAO,CAAC;gBACf,OAAO,EAAE,6BAA6B,CAAC,OAAO,CAAC;aAClD,CAAC;SACL,CAAC,CAAC;IACP,CAAC;IAED,OAAO,KAAK,CAAC;AACjB,CAAC"}

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

@@ -1,4 +1,4 @@
-import type { IPermissionChecker } from '@authup/access';
+import type { IPermissionEvaluator } from '@authup/access';
 import type { Client, Robot, User } from '@authup/core-kit';
 import type { Next, Request, Response } from 'routup';
 import { type BasicAuthorizationHeader, type BearerAuthorizationHeader } from 'hapic';
@@ -7,7 +7,7 @@ import type { HTTPAuthorizationMiddlewareContext, HTTPAuthorizationMiddlewareOpt
 export declare class AuthorizationMiddleware {
     protected options: HTTPAuthorizationMiddlewareOptions;
     protected oauth2TokenVerifier: IOAuth2TokenVerifier;
-    protected permissionChecker: IPermissionChecker;
+    protected permissionEvaluator: IPermissionEvaluator;
     protected identityResolver: IIdentityResolver;
     protected sessionManager: ISessionManager;
     protected clientAuthenticator: ICredentialsAuthenticator<Client>;

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

@@ -1 +1 @@
-{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../../../../src/adapters/http/middleware/built-in/authorization/module.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAGzD,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAU5D,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AACtD,OAAO,EAEH,KAAK,wBAAwB,EAC7B,KAAK,yBAAyB,EAGjC,MAAM,OAAO,CAAC;AAEf,OAAO,KAAK,EACR,yBAAyB,EAAE,iBAAiB,EAC5C,oBAAoB,EAAE,eAAe,EACxC,MAAM,8BAA8B,CAAC;AActC,OAAO,KAAK,EAAE,kCAAkC,EAAE,kCAAkC,EAAE,MAAM,YAAY,CAAC;AAEzG,qBAAa,uBAAuB;IAChC,SAAS,CAAC,OAAO,EAAE,kCAAkC,CAAC;IAItD,SAAS,CAAC,mBAAmB,EAAE,oBAAoB,CAAC;IAEpD,SAAS,CAAC,iBAAiB,EAAE,kBAAkB,CAAC;IAIhD,SAAS,CAAC,gBAAgB,EAAE,iBAAiB,CAAC;IAE9C,SAAS,CAAC,cAAc,EAAG,eAAe,CAAC;IAI3C,SAAS,CAAC,mBAAmB,EAAG,yBAAyB,CAAC,MAAM,CAAC,CAAC;IAElE,SAAS,CAAC,kBAAkB,EAAG,yBAAyB,CAAC,KAAK,CAAC,CAAC;IAEhE,SAAS,CAAC,iBAAiB,EAAG,yBAAyB,CAAC,IAAI,CAAC,CAAC;gBAIlD,GAAG,EAAE,kCAAkC;IAoB7C,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI;IAyD1D;;;;;;;;OAQG;cACa,+BAA+B,CAC3C,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,yBAAyB;cAwDrB,8BAA8B,CAC1C,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,wBAAwB;CA+CvC"}
+{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../../../../src/adapters/http/middleware/built-in/authorization/module.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAE3D,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAO5D,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AACtD,OAAO,EAEH,KAAK,wBAAwB,EAC7B,KAAK,yBAAyB,EAEjC,MAAM,OAAO,CAAC;AAMf,OAAO,KAAK,EACR,yBAAyB,EAAE,iBAAiB,EAC5C,oBAAoB,EAAE,eAAe,EACxC,MAAM,8BAA8B,CAAC;AAQtC,OAAO,KAAK,EAAE,kCAAkC,EAAE,kCAAkC,EAAE,MAAM,YAAY,CAAC;AAEzG,qBAAa,uBAAuB;IAChC,SAAS,CAAC,OAAO,EAAE,kCAAkC,CAAC;IAItD,SAAS,CAAC,mBAAmB,EAAE,oBAAoB,CAAC;IAEpD,SAAS,CAAC,mBAAmB,EAAE,oBAAoB,CAAC;IAIpD,SAAS,CAAC,gBAAgB,EAAE,iBAAiB,CAAC;IAE9C,SAAS,CAAC,cAAc,EAAG,eAAe,CAAC;IAI3C,SAAS,CAAC,mBAAmB,EAAG,yBAAyB,CAAC,MAAM,CAAC,CAAC;IAElE,SAAS,CAAC,kBAAkB,EAAG,yBAAyB,CAAC,KAAK,CAAC,CAAC;IAEhE,SAAS,CAAC,iBAAiB,EAAG,yBAAyB,CAAC,IAAI,CAAC,CAAC;gBAIlD,GAAG,EAAE,kCAAkC;IAsB7C,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI;IAiC1D;;;;;;;;OAQG;cACa,+BAA+B,CAC3C,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,yBAAyB;cAwDrB,8BAA8B,CAC1C,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,wBAAwB;CA+CvC"}

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

@@ -4,22 +4,18 @@
  * For the full copyright and license information,
  * view the LICENSE file that was distributed with this source code.
  */
-import { PermissionChecker } from '@authup/access';
-import { CookieName } from '@authup/core-http-kit';
+import { PermissionEvaluator } from '@authup/access';
 import { IdentityType, ScopeName, } from '@authup/core-kit';
 import { HTTPError } from '@authup/errors';
 import { JWTError, OAuth2TokenKind, deserializeOAuth2Scope } from '@authup/specs';
-import { unsetResponseCookie, useRequestCookie } from '@routup/basic/cookie';
-import { getRequestHostName } from 'routup';
-import { AuthorizationHeaderType, parseAuthorizationHeader, stringifyAuthorizationHeader, } from 'hapic';
-import { PolicyEngine } from "../../../../../security/index.js";
-import { ClientAuthenticator, RobotAuthenticator, UserAuthenticator, } from "../../../../../core/index.js";
-import { RequestPermissionChecker, setRequestIdentity, setRequestPermissionChecker, setRequestScopes, setRequestToken, } from "../../../request/index.js";
+import { AuthorizationHeaderType, parseAuthorizationHeader, } from 'hapic';
+import { ClientAuthenticator, PolicyEngine, RobotAuthenticator, UserAuthenticator } from "../../../../../core/index.js";
+import { RequestPermissionEvaluator, setRequestIdentity, setRequestPermissionEvaluator, setRequestScopes, setRequestToken, } from "../../../request/index.js";
 export class AuthorizationMiddleware {
     options;
     // --------------------------------------
     oauth2TokenVerifier;
-    permissionChecker;
+    permissionEvaluator;
     // --------------------------------------
     identityResolver;
     sessionManager;
@@ -36,26 +32,19 @@ export class AuthorizationMiddleware {
         this.robotAuthenticator = new RobotAuthenticator(ctx.identityResolver);
         this.userAuthenticator = new UserAuthenticator(ctx.identityResolver);
         this.oauth2TokenVerifier = ctx.oauth2TokenVerifier;
-        this.permissionChecker = new PermissionChecker({
+        this.permissionEvaluator = new PermissionEvaluator({
             repository: ctx.permissionProvider,
-            policyEngine: new PolicyEngine(),
+            policyEngine: new PolicyEngine(ctx.identityPermissionProvider),
+            realmId: null,
+            clientId: null,
         });
     }
     // --------------------------------------
     async run(request, response, next) {
-        const requestPermissionChecker = new RequestPermissionChecker(request, this.permissionChecker);
-        setRequestPermissionChecker(request, requestPermissionChecker);
-        let { authorization: headerValue } = request.headers;
+        const requestAccessContext = new RequestPermissionEvaluator(request, this.permissionEvaluator);
+        setRequestPermissionEvaluator(request, requestAccessContext);
+        const { authorization: headerValue } = request.headers;
         try {
-            if (typeof headerValue === 'undefined') {
-                const cookie = useRequestCookie(request, CookieName.ACCESS_TOKEN);
-                if (cookie) {
-                    headerValue = stringifyAuthorizationHeader({
-                        type: 'Bearer',
-                        token: cookie,
-                    });
-                }
-            }
             if (typeof headerValue !== 'string') {
                 next();
                 return;
@@ -74,18 +63,6 @@ export class AuthorizationMiddleware {
             next(HTTPError.unsupportedHeaderType(header.type));
         }
         catch (e) {
-            const cookieOptions = {};
-            if (this.options.cookieDomain) {
-                cookieOptions.domain = this.options.cookieDomain;
-            }
-            else {
-                cookieOptions.domain = getRequestHostName(response.req, {
-                    trustProxy: true,
-                });
-            }
-            unsetResponseCookie(response, CookieName.ACCESS_TOKEN, cookieOptions);
-            unsetResponseCookie(response, CookieName.REFRESH_TOKEN, cookieOptions);
-            unsetResponseCookie(response, CookieName.ACCESS_TOKEN_EXPIRE_DATE, cookieOptions);
             next(e);
         }
     }
@@ -121,7 +98,7 @@ export class AuthorizationMiddleware {
         try {
             await this.sessionManager.verify(session);
         }
-        catch (e) {
+        catch {
             throw JWTError.expired();
         }
         await this.sessionManager.ping(session);

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

@@ -1 +1 @@
-{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../../../src/adapters/http/middleware/built-in/authorization/module.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../../../src/adapters/http/middleware/built-in/authorization/module.ts"],"names":[],"mappings":"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"}