@nest-boot/auth 6.12.0 → 6.14.0

package/dist/auth.guard.d.ts

@@ -1,24 +1,38 @@
+import { EntityManager } from "@mikro-orm/core";
 import { type CanActivate, type ExecutionContext } from "@nestjs/common";
 import { Reflector } from "@nestjs/core";
+import { AuthService } from "./auth.service";
 import { AuthModuleOptions } from "./interfaces";
 /**
  * Authentication guard class used to protect routes and handle requests.
  */
 export declare class AuthGuard implements CanActivate {
     private readonly reflector;
+    private readonly em;
+    private readonly authService;
     private readonly options;
     private readonly defaultRequireAuth;
-    constructor(reflector: Reflector, options: AuthModuleOptions);
+    private readonly userEntityClass;
+    private readonly personalAccessTokenEntityClass;
+    private readonly personalAccessTokenAndUserDataLoader;
+    constructor(reflector: Reflector, em: EntityManager, authService: AuthService, options: AuthModuleOptions);
     /**
      * Get internationalized text based on the specified key.
      * @param key - The key of the internationalized text.
      * @returns The internationalized text.
      */
     private t;
+    /**
+     * Extracts the personal access token from the request.
+     * @param req - The request object.
+     * @returns The personal access token, or null if it doesn't exist.
+     */
+    private extractPersonalAccessToken;
+    private getPersonalAccessTokenAndUser;
     /**
      * Determines whether the request is allowed to be executed.
      * @param executionContext - The execution context object.
      * @returns True if the request is allowed to be executed, otherwise false.
      */
-    canActivate(executionContext: ExecutionContext): boolean;
+    canActivate(executionContext: ExecutionContext): Promise<boolean>;
 }

package/dist/auth.guard.js

@@ -16,21 +16,32 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuthGuard = void 0;
+const core_1 = require("@mikro-orm/core");
 const i18n_1 = require("@nest-boot/i18n");
 const request_context_1 = require("@nest-boot/request-context");
 const common_1 = require("@nestjs/common");
-const core_1 = require("@nestjs/core");
+const core_2 = require("@nestjs/core");
+const dataloader_1 = __importDefault(require("dataloader"));
 const lodash_1 = __importDefault(require("lodash"));
 const auth_constants_1 = require("./auth.constants");
 const auth_module_definition_1 = require("./auth.module-definition");
+const auth_service_1 = require("./auth.service");
+const entities_1 = require("./entities");
 /**
  * Authentication guard class used to protect routes and handle requests.
  */
 let AuthGuard = class AuthGuard {
-    constructor(reflector, options) {
+    constructor(reflector, em, authService, options) {
         this.reflector = reflector;
+        this.em = em;
+        this.authService = authService;
         this.options = options;
+        this.reflector = reflector;
         this.defaultRequireAuth = this.options?.defaultRequireAuth ?? true;
+        this.userEntityClass = this.options.entities?.User ?? entities_1.User;
+        this.personalAccessTokenEntityClass =
+            this.options.entities?.PersonalAccessToken ?? entities_1.PersonalAccessToken;
+        this.personalAccessTokenAndUserDataLoader = new dataloader_1.default((tokens) => Promise.all(tokens.map((token) => this.getPersonalAccessTokenAndUser(token))));
     }
     /**
      * Get internationalized text based on the specified key.
@@ -40,12 +51,43 @@ let AuthGuard = class AuthGuard {
     t(key) {
         return request_context_1.RequestContext.get(i18n_1.I18N)?.t(key, { ns: "auth" }) ?? key;
     }
+    /**
+     * Extracts the personal access token from the request.
+     * @param req - The request object.
+     * @returns The personal access token, or null if it doesn't exist.
+     */
+    extractPersonalAccessToken(req) {
+        const authorizationHeader = req.get("authorization");
+        if (typeof authorizationHeader !== "undefined") {
+            const matched = authorizationHeader.match(/(\S+)\s+(\S+)/);
+            if (matched !== null && matched[1].toLowerCase() === "bearer") {
+                return matched[2];
+            }
+        }
+        if (typeof req.cookies?.token === "string") {
+            return req.cookies.token;
+        }
+        return null;
+    }
+    async getPersonalAccessTokenAndUser(token) {
+        const personalAccessToken = await this.authService.getToken(token);
+        const user = await personalAccessToken?.user.load();
+        if (personalAccessToken === null || user == null) {
+            throw new common_1.UnauthorizedException(this.t("The personal access token is invalid."));
+        }
+        await this.authService.updateLastUsedAt(personalAccessToken);
+        request_context_1.RequestContext.set(this.userEntityClass, user);
+        request_context_1.RequestContext.set(this.personalAccessTokenEntityClass, personalAccessToken);
+        request_context_1.RequestContext.set(auth_constants_1.AUTH_USER, user);
+        request_context_1.RequestContext.set(auth_constants_1.AUTH_PERSONAL_ACCESS_TOKEN, personalAccessToken);
+        return { personalAccessToken, user };
+    }
     /**
      * Determines whether the request is allowed to be executed.
      * @param executionContext - The execution context object.
      * @returns True if the request is allowed to be executed, otherwise false.
      */
-    canActivate(executionContext) {
+    async canActivate(executionContext) {
         if (!["http", "graphql"].includes(executionContext.getType())) {
             return true;
         }
@@ -56,11 +98,15 @@ let AuthGuard = class AuthGuard {
         if (!(requireAuth ?? this.defaultRequireAuth ?? false)) {
             return true;
         }
-        const user = request_context_1.RequestContext.get(auth_constants_1.AUTH_USER);
-        const personalAccessToken = request_context_1.RequestContext.get(auth_constants_1.AUTH_PERSONAL_ACCESS_TOKEN);
-        if (personalAccessToken === null || user == null) {
+        // Get the Request object
+        const req = executionContext.switchToHttp().getRequest() ??
+            executionContext.getArgs()[2].req;
+        // Extract the token
+        const token = this.extractPersonalAccessToken(req);
+        if (token === null) {
             throw new common_1.UnauthorizedException(this.t("The personal access token is invalid."));
         }
+        const { user } = await this.personalAccessTokenAndUserDataLoader.load(token);
         // Get the method permissions
         const permissions = this.reflector.get(auth_constants_1.PERMISSIONS_METADATA_KEY, executionContext.getHandler());
         // If there are no permission requirements, allow access directly
@@ -74,8 +120,10 @@ let AuthGuard = class AuthGuard {
 };
 exports.AuthGuard = AuthGuard;
 exports.AuthGuard = AuthGuard = __decorate([
-    (0, common_1.Injectable)(),
-    __param(1, (0, common_1.Inject)(auth_module_definition_1.MODULE_OPTIONS_TOKEN)),
-    __metadata("design:paramtypes", [core_1.Reflector, Object])
+    (0, common_1.Injectable)({ scope: common_1.Scope.REQUEST }),
+    __param(3, (0, common_1.Inject)(auth_module_definition_1.MODULE_OPTIONS_TOKEN)),
+    __metadata("design:paramtypes", [core_2.Reflector,
+        core_1.EntityManager,
+        auth_service_1.AuthService, Object])
 ], AuthGuard);
 //# sourceMappingURL=auth.guard.js.map

package/dist/auth.guard.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth.guard.js","sourceRoot":"","sources":["../src/auth.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,0CAAkD;AAClD,gEAA4D;AAC5D,2CAOwB;AACxB,uCAAyC;AACzC,oDAAuB;AAEvB,qDAK0B;AAC1B,qEAAgE;AAIhE;;GAEG;AAEI,IAAM,SAAS,GAAf,MAAM,SAAS;IAGpB,YACmB,SAAoB,EAEpB,OAA0B;QAF1B,cAAS,GAAT,SAAS,CAAW;QAEpB,YAAO,GAAP,OAAO,CAAmB;QAE3C,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,OAAO,EAAE,kBAAkB,IAAI,IAAI,CAAC;IACrE,CAAC;IAED;;;;OAIG;IACK,CAAC,CAAC,GAAW;QACnB,OAAO,gCAAc,CAAC,GAAG,CAAO,WAAI,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,IAAI,GAAG,CAAC;IACvE,CAAC;IAED;;;;OAIG;IACI,WAAW,CAAC,gBAAkC;QACnD,IAAI,CAAC,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;YAC9D,OAAO,IAAI,CAAC;QACd,CAAC;QAED,iDAAiD;QACjD,MAAM,WAAW,GACf,IAAI,CAAC,SAAS,CAAC,GAAG,CAChB,0CAAyB,EACzB,gBAAgB,CAAC,UAAU,EAAE,CAC9B;YACD,IAAI,CAAC,SAAS,CAAC,GAAG,CAChB,0CAAyB,EACzB,gBAAgB,CAAC,QAAQ,EAAE,CAC5B,CAAC;QAEJ,gGAAgG;QAChG,IAAI,CAAC,CAAC,WAAW,IAAI,IAAI,CAAC,kBAAkB,IAAI,KAAK,CAAC,EAAE,CAAC;YACvD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,IAAI,GAAG,gCAAc,CAAC,GAAG,CAAO,0BAAS,CAAC,CAAC;QACjD,MAAM,mBAAmB,GAAG,gCAAc,CAAC,GAAG,CAC5C,2CAA0B,CAC3B,CAAC;QAEF,IAAI,mBAAmB,KAAK,IAAI,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;YACjD,MAAM,IAAI,8BAAqB,CAC7B,IAAI,CAAC,CAAC,CAAC,uCAAuC,CAAC,CAChD,CAAC;QACJ,CAAC;QAED,6BAA6B;QAC7B,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CACpC,yCAAwB,EACxB,gBAAgB,CAAC,UAAU,EAAE,CAC9B,CAAC;QAEF,iEAAiE;QACjE,6GAA6G;QAC7G,IACE,OAAO,WAAW,KAAK,WAAW;YAClC,gBAAC,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,MAAM,GAAG,CAAC,EACxD,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,IAAI,2BAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC;IAC7D,CAAC;CACF,CAAA;AA1EY,8BAAS;oBAAT,SAAS;IADrB,IAAA,mBAAU,GAAE;IAMR,WAAA,IAAA,eAAM,EAAC,6CAAoB,CAAC,CAAA;qCADD,gBAAS;GAJ5B,SAAS,CA0ErB"}
+{"version":3,"file":"auth.guard.js","sourceRoot":"","sources":["../src/auth.guard.ts"],"names":[],"mappings":"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"}

package/dist/auth.module.d.ts

@@ -1,16 +1,3 @@
-import { OnModuleInit } from "@nestjs/common";
 import { ConfigurableModuleClass } from "./auth.module-definition";
-import { AuthService } from "./auth.service";
-import { AuthModuleOptions } from "./interfaces";
-export declare class AuthModule extends ConfigurableModuleClass implements OnModuleInit {
-    private readonly authService;
-    private readonly options;
-    constructor(authService: AuthService, options: AuthModuleOptions);
-    onModuleInit(): void;
-    /**
-     * Extracts the personal access token from the request.
-     * @param req - The request object.
-     * @returns The personal access token, or null if it doesn't exist.
-     */
-    private extractPersonalAccessToken;
+export declare class AuthModule extends ConfigurableModuleClass {
 }

package/dist/auth.module.js

@@ -5,73 +5,15 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-var __param = (this && this.__param) || function (paramIndex, decorator) {
-    return function (target, key) { decorator(target, key, paramIndex); }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuthModule = void 0;
 const request_context_1 = require("@nest-boot/request-context");
 const common_1 = require("@nestjs/common");
 const core_1 = require("@nestjs/core");
-const auth_constants_1 = require("./auth.constants");
 const auth_guard_1 = require("./auth.guard");
 const auth_module_definition_1 = require("./auth.module-definition");
 const auth_service_1 = require("./auth.service");
-const entities_1 = require("./entities");
 let AuthModule = class AuthModule extends auth_module_definition_1.ConfigurableModuleClass {
-    constructor(authService, options) {
-        super();
-        this.authService = authService;
-        this.options = options;
-        this.defaultRequireAuth = this.options?.defaultRequireAuth ?? true;
-        this.userEntityClass = this.options.entities?.User ?? entities_1.User;
-        this.personalAccessTokenEntityClass =
-            this.options.entities?.PersonalAccessToken ?? entities_1.PersonalAccessToken;
-    }
-    onModuleInit() {
-        request_context_1.RequestContext.registerMiddleware("auth", async (ctx, next) => {
-            if (ctx.type === "http") {
-                const req = ctx.get(request_context_1.REQUEST);
-                if (req) {
-                    const token = this.extractPersonalAccessToken(req);
-                    if (token) {
-                        const personalAccessToken = await this.authService.getToken(token);
-                        const user = await personalAccessToken?.user.load();
-                        if (personalAccessToken && user) {
-                            request_context_1.RequestContext.set(this.userEntityClass, user);
-                            request_context_1.RequestContext.set(this
-                                .personalAccessTokenEntityClass, personalAccessToken);
-                            request_context_1.RequestContext.set(auth_constants_1.AUTH_USER, user);
-                            request_context_1.RequestContext.set(auth_constants_1.AUTH_PERSONAL_ACCESS_TOKEN, personalAccessToken);
-                            await this.authService.updateLastUsedAt(personalAccessToken);
-                        }
-                    }
-                }
-            }
-            return await next();
-        }, ["database"]);
-    }
-    /**
-     * Extracts the personal access token from the request.
-     * @param req - The request object.
-     * @returns The personal access token, or null if it doesn't exist.
-     */
-    extractPersonalAccessToken(req) {
-        const authorizationHeader = req.get("authorization");
-        if (typeof authorizationHeader !== "undefined") {
-            const matched = authorizationHeader.match(/(\S+)\s+(\S+)/);
-            if (matched !== null && matched[1].toLowerCase() === "bearer") {
-                return matched[2];
-            }
-        }
-        if (typeof req.cookies?.token === "string") {
-            return req.cookies.token;
-        }
-        return null;
-    }
 };
 exports.AuthModule = AuthModule;
 exports.AuthModule = AuthModule = __decorate([
@@ -86,8 +28,6 @@ exports.AuthModule = AuthModule = __decorate([
             core_1.Reflector,
         ],
         exports: [auth_service_1.AuthService],
-    }),
-    __param(1, (0, common_1.Inject)(auth_module_definition_1.MODULE_OPTIONS_TOKEN)),
-    __metadata("design:paramtypes", [auth_service_1.AuthService, Object])
+    })
 ], AuthModule);
 //# sourceMappingURL=auth.module.js.map

package/dist/auth.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth.module.js","sourceRoot":"","sources":["../src/auth.module.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"auth.module.js","sourceRoot":"","sources":["../src/auth.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,gEAAkE;AAClE,2CAAwC;AACxC,uCAAoD;AAEpD,6CAAyC;AACzC,qEAAmE;AACnE,iDAA6C;AActC,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,gDAAuB;CAAG,CAAA;AAA7C,gCAAU;qBAAV,UAAU;IAZtB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE,CAAC,sCAAoB,CAAC;QAC/B,SAAS,EAAE;YACT;gBACE,OAAO,EAAE,gBAAS;gBAClB,QAAQ,EAAE,sBAAS;aACpB;YACD,0BAAW;YACX,gBAAS;SACV;QACD,OAAO,EAAE,CAAC,0BAAW,CAAC;KACvB,CAAC;GACW,UAAU,CAAmC"}

package/dist/auth.service.d.ts

@@ -1,4 +1,4 @@
-import { MikroORM } from "@mikro-orm/core";
+import { EntityManager } from "@mikro-orm/core";
 import { HashService } from "@nest-boot/hash";
 import { PersonalAccessToken, User } from "./entities";
 import { AuthModuleOptions } from "./interfaces";
@@ -6,10 +6,9 @@ import { AuthModuleOptions } from "./interfaces";
  * Service responsible for handling authentication-related operations.
  */
 export declare class AuthService {
-    private readonly orm;
+    private readonly em;
     private readonly hashService;
     private readonly options;
-    private readonly em;
     private readonly User;
     private readonly PersonalAccessToken;
     private readonly expiresIn?;
@@ -19,7 +18,7 @@ export declare class AuthService {
      * @param hashService The HashService instance.
      * @param options The options for the Auth module.
      */
-    constructor(orm: MikroORM, hashService: HashService, options: AuthModuleOptions);
+    constructor(em: EntityManager, hashService: HashService, options: AuthModuleOptions);
     /**
      * Attempts to authenticate a user with the provided email and password.
      * @param email The user's email.
@@ -60,5 +59,5 @@ export declare class AuthService {
      * @returns The registered user.
      */
     register(name: string, email: string, password: string, permissions?: string[]): Promise<User>;
-    updateLastUsedAt(personalAccessToken: PersonalAccessToken, flush?: boolean): Promise<void>;
+    updateLastUsedAt(personalAccessToken: PersonalAccessToken): Promise<void>;
 }

package/dist/auth.service.js

@@ -29,11 +29,10 @@ let AuthService = class AuthService {
      * @param hashService The HashService instance.
      * @param options The options for the Auth module.
      */
-    constructor(orm, hashService, options) {
-        this.orm = orm;
+    constructor(em, hashService, options) {
+        this.em = em;
         this.hashService = hashService;
         this.options = options;
-        this.em = this.orm.em;
         this.User = this.options?.entities?.User ?? entities_1.User;
         this.PersonalAccessToken =
             this.options?.entities?.PersonalAccessToken ?? entities_1.PersonalAccessToken;
@@ -64,7 +63,7 @@ let AuthService = class AuthService {
     async getToken(token) {
         return await this.em.findOne(this.PersonalAccessToken, {
             token,
-        }, { filters: false });
+        }, { populate: ["user"] });
     }
     /**
      * Creates a new personal access token for a user.
@@ -118,18 +117,16 @@ let AuthService = class AuthService {
         await this.em.persistAndFlush(user);
         return user;
     }
-    async updateLastUsedAt(personalAccessToken, flush = true) {
+    async updateLastUsedAt(personalAccessToken) {
         personalAccessToken.lastUsedAt = new Date();
-        if (flush) {
-            await this.em.flush();
-        }
+        await this.em.flush();
     }
 };
 exports.AuthService = AuthService;
 exports.AuthService = AuthService = __decorate([
     (0, common_1.Injectable)(),
     __param(2, (0, common_1.Inject)(auth_module_definition_1.MODULE_OPTIONS_TOKEN)),
-    __metadata("design:paramtypes", [core_1.MikroORM,
+    __metadata("design:paramtypes", [core_1.EntityManager,
         hash_1.HashService, Object])
 ], AuthService);
 //# sourceMappingURL=auth.service.js.map

package/dist/auth.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../src/auth.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../src/auth.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,0CAA6D;AAC7D,0CAA8C;AAC9C,2CAAoD;AAEpD,qEAAgE;AAChE,yCAAuD;AAEvD,mEAA0D;AAE1D;;GAEG;AAEI,IAAM,WAAW,GAAjB,MAAM,WAAW;IAMtB;;;;;OAKG;IACH,YACmB,EAAiB,EACjB,WAAwB,EAExB,OAA0B;QAH1B,OAAE,GAAF,EAAE,CAAe;QACjB,gBAAW,GAAX,WAAW,CAAa;QAExB,YAAO,GAAP,OAAO,CAAmB;QAE3C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,IAAI,eAAI,CAAC;QACjD,IAAI,CAAC,mBAAmB;YACtB,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,mBAAmB,IAAI,8BAAmB,CAAC;QAErE,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC;IAC3C,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,OAAO,CAAC,KAAa,EAAE,QAAgB;QAC3C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,OAAO,CAChC,IAAI,CAAC,IAAI,EACT,EAAE,KAAK,EAAE,EACT,EAAE,OAAO,EAAE,KAAK,EAAE,CACnB,CAAC;QAEF;QACE,oEAAoE;QACpE,IAAI,KAAK,IAAI;YACb,IAAI,CAAC,QAAQ,KAAK,IAAI;YACtB,CAAC,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,EACzD,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,QAAQ,CAAC,KAAa;QAC1B,OAAO,MAAM,IAAI,CAAC,EAAE,CAAC,OAAO,CAC1B,IAAI,CAAC,mBAAmB,EACxB;YACE,KAAK;SACN,EACD,EAAE,QAAQ,EAAE,CAAC,MAAM,CAAC,EAAE,CACvB,CAAC;IACJ,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,WAAW,CACf,IAAU,EACV,IAAY,EACZ,cAAwB,CAAC,GAAG,CAAC,EAC7B,SAAkB;QAElB,MAAM,KAAK,GAAG,IAAA,iCAAY,EAAC,EAAE,CAAC,CAAC;QAE/B,SAAS,GAAG,SAAS,IAAI,IAAI,CAAC,SAAS,CAAC;QAExC,MAAM,mBAAmB,GAAG,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,EAAE;YACnE,IAAI;YACJ,IAAI;YACJ,KAAK;YACL,WAAW;YACX,SAAS,EACP,OAAO,SAAS,KAAK,WAAW;gBAC9B,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;gBAClC,CAAC,CAAC,IAAI;SACX,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,EAAE,CAAC,eAAe,CAAC,mBAAmB,CAAC,CAAC;QAEnD,OAAO,EAAE,KAAK,EAAE,mBAAmB,EAAE,CAAC;IACxC,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,WAAW,CAAC,mBAAwC;QACxD,MAAM,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,KAAK,EAAE,CAAC;IACpD,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,QAAQ,CACZ,IAAY,EACZ,KAAa,EACb,QAAgB,EAChB,cAAwB,EAAE;QAE1B,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAE/D,MAAM,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE;YACrC,IAAI;YACJ,KAAK;YACL,QAAQ,EAAE,cAAc;YACxB,WAAW;YACX,SAAS,EAAE,IAAI,IAAI,EAAE;YACrB,SAAS,EAAE,IAAI,IAAI,EAAE;SACtB,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAEpC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,mBAAwC;QAC7D,mBAAmB,CAAC,UAAU,GAAG,IAAI,IAAI,EAAE,CAAC;QAC5C,MAAM,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC;CACF,CAAA;AA9IY,kCAAW;sBAAX,WAAW;IADvB,IAAA,mBAAU,GAAE;IAgBR,WAAA,IAAA,eAAM,EAAC,6CAAoB,CAAC,CAAA;qCAFR,oBAAa;QACJ,kBAAW;GAdhC,WAAW,CA8IvB"}