@neohm/nestend 4.1.0 → 5.0.0

package/dist/auth/es6.classes.js.map

@@ -1 +1 @@
-{"version":3,"file":"es6.classes.js","sourceRoot":"","sources":["../../src/auth/es6.classes.ts"],"names":[],"mappings":";;;AAAA,mEAA+D;AAC/D,+EAA0E;AAC1E,qFAAiF;AACjF,6FAAwF;AACxF,qFAAgF;AAChF,yFAAoF;AACpF,6FAAwF;AACxF,gEAA2D;AAC3D,4DAAwD;AACxD,0DAAsD;AACtD,0DAAsD;AACtD,sEAAiE;AACjE,wEAAmE;AACnE,4EAAwE;AACxE,oFAA+E;AAC/E,oFAA+E;AAC/E,oGAA8F;AAC9F,oGAA8F;AAC9F,4FAAsF;AACtF,4DAAuD;AACvD,oEAA+D;AAC/D,8DAAyD;AACzD,4EAAuE;AACvE,0EAAoE;AACpE,gDAA4C;AAC5C,8DAAyD;AACzD,gEAA2D;AAC3D,sDAAkD;AAClD,4EAAuE;AACvE,kFAA4E;AAC5E,0EAAoE;AAEvD,QAAA,UAAU,GAAG;IACxB,WAAW,EAAE;QACX,gCAAc;QACd,2CAAmB;QACnB,kDAAuB;QACvB,yDAA0B;QAC1B,iDAAsB;QACtB,qDAAwB;QACxB,yDAA0B;KAC3B;IACD,QAAQ,EAAE;QACR,+BAAa;QACb,4BAAY;QACZ,0BAAW;QACX,qCAAgB;QAChB,uCAAiB;QACjB,0BAAW;QACX,4CAAoB;QACpB,mDAAuB;QACvB,mDAAuB;KACf;IACV,SAAS,EAAE;QACT,gEAA6B;QAC7B,gEAA6B;QAC7B,wDAAyB;KAC1B;IACD,IAAI,EAAE;QACJ,+BAAa;QACb,uCAAiB;QACjB,iCAAc;QACd,+CAAqB;QACrB,4CAAmB;QACnB,oBAAQ;QACR,iCAAc;QACd,mCAAe;QACf,0BAAW;QACX,+CAAqB;QACrB,oDAAuB;QACvB,4CAAmB;KACpB;IACD,IAAI,EAAE,EAAE;IACR,WAAW,EAAE,EAAE;CAChB,CAAC"}
+{"version":3,"file":"es6.classes.js","sourceRoot":"","sources":["../../src/auth/es6.classes.ts"],"names":[],"mappings":";;;AAAA,mEAA+D;AAC/D,+EAA0E;AAC1E,qFAAiF;AACjF,6FAAwF;AACxF,qFAAgF;AAChF,yFAAoF;AACpF,6FAAwF;AACxF,gEAA2D;AAC3D,4DAAwD;AACxD,0DAAsD;AACtD,0DAAsD;AACtD,sEAAiE;AACjE,wEAAmE;AACnE,4EAAwE;AACxE,oFAA+E;AAC/E,oFAA+E;AAC/E,4DAAwD;AACxD,8EAAyE;AACzE,sFAAiF;AACjF,0FAAmF;AACnF,oGAA8F;AAC9F,oGAA8F;AAC9F,4FAAsF;AACtF,4DAAuD;AACvD,oEAA+D;AAC/D,8DAAyD;AACzD,4EAAuE;AACvE,0EAAoE;AACpE,gDAA4C;AAC5C,8DAAyD;AACzD,gEAA2D;AAC3D,sDAAkD;AAClD,4EAAuE;AACvE,kFAA4E;AAC5E,0EAAoE;AACpE,8DAAyD;AAE5C,QAAA,UAAU,GAAG;IACxB,WAAW,EAAE;QACX,gCAAc;QACd,2CAAmB;QACnB,kDAAuB;QACvB,yDAA0B;QAC1B,iDAAsB;QACtB,qDAAwB;QACxB,yDAA0B;KAC3B;IACD,QAAQ,EAAE;QACR,+BAAa;QACb,4BAAY;QACZ,0BAAW;QACX,qCAAgB;QAChB,uCAAiB;QACjB,0BAAW;QACX,4CAAoB;QACpB,mDAAuB;QACvB,mDAAuB;QACvB,4BAAY;QACZ,6CAAoB;QACpB,qDAAwB;KAChB;IACV,SAAS,EAAE;QACT,gEAA6B;QAC7B,gEAA6B;QAC7B,wDAAyB;KAC1B;IACD,IAAI,EAAE;QACJ,+BAAa;QACb,uCAAiB;QACjB,iCAAc;QACd,+CAAqB;QACrB,4CAAmB;QACnB,oBAAQ;QACR,iCAAc;QACd,mCAAe;QACf,0BAAW;QACX,+CAAqB;QACrB,oDAAuB;QACvB,4CAAmB;QACnB,iCAAc;KACf;IACD,IAAI,EAAE,CAAC,2DAA0B,CAAU;IAC3C,WAAW,EAAE,EAAE;CAChB,CAAC"}

package/dist/auth/guards/api.key.guard.d.ts

@@ -1,11 +1,12 @@
 import { CanActivate, ExecutionContext } from '@nestjs/common';
 import { Reflector } from '@nestjs/core';
 import { ApiKeyService } from '../services/api.key.service';
+import { AuthConfig } from '../utilities/auth.config';
 export declare class ApiKeyGuard implements CanActivate {
     private readonly apiKeyService;
     private readonly reflector;
-    constructor(apiKeyService: ApiKeyService, reflector: Reflector);
+    private readonly config;
+    constructor(apiKeyService: ApiKeyService, reflector: Reflector, config: AuthConfig);
     canActivate(context: ExecutionContext): Promise<boolean>;
-    private extractKey;
 }
 //# sourceMappingURL=api.key.guard.d.ts.map

package/dist/auth/guards/api.key.guard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api.key.guard.d.ts","sourceRoot":"","sources":["../../../src/auth/guards/api.key.guard.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,gBAAgB,EAGjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAMzC,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAS5D,qBACa,WAAY,YAAW,WAAW;IAE3C,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,SAAS;gBADT,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,SAAS;IAGjC,WAAW,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IAgC9D,OAAO,CAAC,UAAU;CAYnB"}
+{"version":3,"file":"api.key.guard.d.ts","sourceRoot":"","sources":["../../../src/auth/guards/api.key.guard.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,gBAAgB,EAGjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAQzC,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAUtD,qBACa,WAAY,YAAW,WAAW;IAE3C,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAFN,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,UAAU;IAG/B,WAAW,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;CAuC/D"}

package/dist/auth/guards/api.key.guard.js

@@ -14,56 +14,45 @@ const common_1 = require("@nestjs/common");
 const core_1 = require("@nestjs/core");
 const access_exception_1 = require("../../global/exceptions/access.exception");
 const api_key_scopes_decorator_1 = require("../decorators/api.key.scopes.decorator");
-const api_key_default_enum_1 = require("../enums/api.key.default.enum");
 const public_decorator_1 = require("../decorators/public.decorator");
 const api_key_service_1 = require("../services/api.key.service");
+const auth_config_1 = require("../utilities/auth.config");
+const request_credentials_1 = require("../utilities/request.credentials");
 let ApiKeyGuard = class ApiKeyGuard {
-    constructor(apiKeyService, reflector) {
+    constructor(apiKeyService, reflector, config) {
         this.apiKeyService = apiKeyService;
         this.reflector = reflector;
+        this.config = config;
     }
     async canActivate(context) {
-        const isPublic = this.reflector.getAllAndOverride(public_decorator_1.IS_PUBLIC_KEY, [
-            context.getHandler(),
-            context.getClass(),
-        ]);
-        if (isPublic)
+        const targets = [context.getHandler(), context.getClass()];
+        if (this.reflector.getAllAndOverride(public_decorator_1.IS_PUBLIC_KEY, targets))
             return true;
         const request = context.switchToHttp().getRequest();
-        const rawKey = this.extractKey(request);
+        const rawKey = request_credentials_1.RequestCredentials.apiKey(request, this.config.apiKeyHeaderName);
         if (!rawKey)
             throw new common_1.UnauthorizedException('API key is missing.');
         const apiKey = await this.apiKeyService.validateApiKey(rawKey);
         if (!apiKey)
             throw new common_1.UnauthorizedException('API key is invalid, revoked or expired.');
-        const requiredScopes = this.reflector.getAllAndOverride(api_key_scopes_decorator_1.API_KEY_SCOPES_KEY, [
-            context.getHandler(),
-            context.getClass(),
-        ]) ?? [];
-        for (const scope of requiredScopes) {
-            if (!(await this.apiKeyService.hasScope(apiKey, scope))) {
-                throw new access_exception_1.AccessException(`API key is missing the "${scope}" scope.`);
-            }
-        }
-        request.apiKey = apiKey;
+        const requiredScopes = this.reflector.getAllAndOverride(api_key_scopes_decorator_1.API_KEY_SCOPES_KEY, targets) ??
+            [];
+        const anyScope = this.reflector.getAllAndOverride(api_key_scopes_decorator_1.API_KEY_ANY_SCOPE_KEY, targets);
+        if (!requiredScopes.length && !anyScope)
+            throw new access_exception_1.AccessException('This route accepts no API key scope.');
+        const scopes = await this.apiKeyService.effectiveScopes(apiKey);
+        const missing = requiredScopes.find((scope) => !api_key_service_1.ApiKeyService.grants(scopes, scope));
+        if (missing)
+            throw new access_exception_1.AccessException(`API key is missing the "${missing}" scope.`);
+        Object.assign(request, { apiKey, apiKeyScopes: scopes });
         return true;
     }
-    extractKey(request) {
-        const headerName = process.env.API_KEY_HEADER_NAME || api_key_default_enum_1.ApiKeyDefault.HEADER_NAME;
-        const headerKey = request.headers[headerName];
-        if (headerKey)
-            return Array.isArray(headerKey) ? headerKey[0] : headerKey;
-        const authorization = request.headers.authorization;
-        if (authorization?.toLowerCase().startsWith('apikey ')) {
-            return authorization.slice('apikey '.length).trim();
-        }
-        return null;
-    }
 };
 exports.ApiKeyGuard = ApiKeyGuard;
 exports.ApiKeyGuard = ApiKeyGuard = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [api_key_service_1.ApiKeyService,
-        core_1.Reflector])
+        core_1.Reflector,
+        auth_config_1.AuthConfig])
 ], ApiKeyGuard);
 //# sourceMappingURL=api.key.guard.js.map

package/dist/auth/guards/api.key.guard.js.map

@@ -1 +1 @@
-{"version":3,"file":"api.key.guard.js","sourceRoot":"","sources":["../../../src/auth/guards/api.key.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAKwB;AACxB,uCAAyC;AAEzC,+EAA2E;AAC3E,qFAA4E;AAC5E,wEAA8D;AAC9D,qEAA+D;AAC/D,iEAA4D;AAUrD,IAAM,WAAW,GAAjB,MAAM,WAAW;IACtB,YACmB,aAA4B,EAC5B,SAAoB;QADpB,kBAAa,GAAb,aAAa,CAAe;QAC5B,cAAS,GAAT,SAAS,CAAW;IACpC,CAAC;IAEJ,KAAK,CAAC,WAAW,CAAC,OAAyB;QACzC,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAU,gCAAa,EAAE;YACxE,OAAO,CAAC,UAAU,EAAE;YACpB,OAAO,CAAC,QAAQ,EAAE;SACnB,CAAC,CAAC;QACH,IAAI,QAAQ;YAAE,OAAO,IAAI,CAAC;QAE1B,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAW,CAAC;QAC7D,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QACxC,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,8BAAqB,CAAC,qBAAqB,CAAC,CAAC;QAEpE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QAC/D,IAAI,CAAC,MAAM;YACT,MAAM,IAAI,8BAAqB,CAC7B,yCAAyC,CAC1C,CAAC;QAEJ,MAAM,cAAc,GAClB,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAW,6CAAkB,EAAE;YAC7D,OAAO,CAAC,UAAU,EAAE;YACpB,OAAO,CAAC,QAAQ,EAAE;SACnB,CAAC,IAAI,EAAE,CAAC;QACX,KAAK,MAAM,KAAK,IAAI,cAAc,EAAE,CAAC;YACnC,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC;gBACxD,MAAM,IAAI,kCAAe,CAAC,2BAA2B,KAAK,UAAU,CAAC,CAAC;YACxE,CAAC;QACH,CAAC;QAEA,OAAgC,CAAC,MAAM,GAAG,MAAM,CAAC;QAClD,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,UAAU,CAAC,OAAgB;QACjC,MAAM,UAAU,GACd,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,oCAAa,CAAC,WAAW,CAAC;QAC/D,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC9C,IAAI,SAAS;YAAE,OAAO,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAE1E,MAAM,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC;QACpD,IAAI,aAAa,EAAE,WAAW,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YACvD,OAAO,aAAa,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;QACtD,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AAlDY,kCAAW;sBAAX,WAAW;IADvB,IAAA,mBAAU,GAAE;qCAGuB,+BAAa;QACjB,gBAAS;GAH5B,WAAW,CAkDvB"}
+{"version":3,"file":"api.key.guard.js","sourceRoot":"","sources":["../../../src/auth/guards/api.key.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAKwB;AACxB,uCAAyC;AAEzC,+EAA2E;AAC3E,qFAGgD;AAChD,qEAA+D;AAC/D,iEAA4D;AAC5D,0DAAsD;AACtD,0EAAsE;AAU/D,IAAM,WAAW,GAAjB,MAAM,WAAW;IACtB,YACmB,aAA4B,EAC5B,SAAoB,EACpB,MAAkB;QAFlB,kBAAa,GAAb,aAAa,CAAe;QAC5B,cAAS,GAAT,SAAS,CAAW;QACpB,WAAM,GAAN,MAAM,CAAY;IAClC,CAAC;IAEJ,KAAK,CAAC,WAAW,CAAC,OAAyB;QACzC,MAAM,OAAO,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC3D,IAAI,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAU,gCAAa,EAAE,OAAO,CAAC;YACnE,OAAO,IAAI,CAAC;QAEd,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAW,CAAC;QAC7D,MAAM,MAAM,GAAG,wCAAkB,CAAC,MAAM,CACtC,OAAO,EACP,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAC7B,CAAC;QACF,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,8BAAqB,CAAC,qBAAqB,CAAC,CAAC;QAEpE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QAC/D,IAAI,CAAC,MAAM;YACT,MAAM,IAAI,8BAAqB,CAC7B,yCAAyC,CAC1C,CAAC;QAEJ,MAAM,cAAc,GAClB,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAW,6CAAkB,EAAE,OAAO,CAAC;YACvE,EAAE,CAAC;QACL,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAC/C,gDAAqB,EACrB,OAAO,CACR,CAAC;QACF,IAAI,CAAC,cAAc,CAAC,MAAM,IAAI,CAAC,QAAQ;YACrC,MAAM,IAAI,kCAAe,CAAC,sCAAsC,CAAC,CAAC;QAGpE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QAChE,MAAM,OAAO,GAAG,cAAc,CAAC,IAAI,CACjC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,+BAAa,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAChD,CAAC;QACF,IAAI,OAAO;YACT,MAAM,IAAI,kCAAe,CAAC,2BAA2B,OAAO,UAAU,CAAC,CAAC;QAE1E,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,CAAC;QACzD,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AA9CY,kCAAW;sBAAX,WAAW;IADvB,IAAA,mBAAU,GAAE;qCAGuB,+BAAa;QACjB,gBAAS;QACZ,wBAAU;GAJ1B,WAAW,CA8CvB"}

package/dist/auth/guards/jwt.auth.guard.d.ts

@@ -4,7 +4,7 @@ declare const JwtAuthGuard_base: import("@nestjs/passport").Type<import("@nestjs
 export declare class JwtAuthGuard extends JwtAuthGuard_base {
     private readonly reflector;
     constructor(reflector: Reflector);
-    canActivate(context: ExecutionContext): boolean | Promise<boolean> | import("rxjs").Observable<boolean>;
+    canActivate(context: ExecutionContext): Promise<boolean>;
 }
 export {};
 //# sourceMappingURL=jwt.auth.guard.d.ts.map

package/dist/auth/guards/jwt.auth.guard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jwt.auth.guard.d.ts","sourceRoot":"","sources":["../../../src/auth/guards/jwt.auth.guard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAc,MAAM,gBAAgB,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;;AAIzC,qBACa,YAAa,SAAQ,iBAAgB;IACpC,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,SAAS;IAIjD,WAAW,CAAC,OAAO,EAAE,gBAAgB;CAQtC"}
+{"version":3,"file":"jwt.auth.guard.d.ts","sourceRoot":"","sources":["../../../src/auth/guards/jwt.auth.guard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAc,MAAM,gBAAgB,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;;AAYzC,qBACa,YAAa,SAAQ,iBAAgB;IACpC,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,SAAS;IAI3C,WAAW,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;CAsB/D"}

package/dist/auth/guards/jwt.auth.guard.js

@@ -13,20 +13,27 @@ exports.JwtAuthGuard = void 0;
 const common_1 = require("@nestjs/common");
 const core_1 = require("@nestjs/core");
 const passport_1 = require("@nestjs/passport");
+const access_exception_1 = require("../../global/exceptions/access.exception");
+const allow_pending_password_change_decorator_1 = require("../decorators/allow.pending.password.change.decorator");
 const public_decorator_1 = require("../decorators/public.decorator");
 let JwtAuthGuard = class JwtAuthGuard extends (0, passport_1.AuthGuard)('jwt') {
     constructor(reflector) {
         super();
         this.reflector = reflector;
     }
-    canActivate(context) {
-        const isPublic = this.reflector.getAllAndOverride(public_decorator_1.IS_PUBLIC_KEY, [
-            context.getHandler(),
-            context.getClass(),
-        ]);
-        if (isPublic)
+    async canActivate(context) {
+        const targets = [context.getHandler(), context.getClass()];
+        if (this.reflector.getAllAndOverride(public_decorator_1.IS_PUBLIC_KEY, targets))
             return true;
-        return super.canActivate(context);
+        if (!(await super.canActivate(context)))
+            return false;
+        const user = context
+            .switchToHttp()
+            .getRequest().user;
+        if (user?.passwordChangeRequired &&
+            !this.reflector.getAllAndOverride(allow_pending_password_change_decorator_1.ALLOW_PENDING_PASSWORD_CHANGE_KEY, targets))
+            throw new access_exception_1.AccessException('Change your one-time password before continuing.');
+        return true;
     }
 };
 exports.JwtAuthGuard = JwtAuthGuard;

package/dist/auth/guards/jwt.auth.guard.js.map

@@ -1 +1 @@
-{"version":3,"file":"jwt.auth.guard.js","sourceRoot":"","sources":["../../../src/auth/guards/jwt.auth.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA8D;AAC9D,uCAAyC;AACzC,+CAA6C;AAC7C,qEAA+D;AAGxD,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,IAAA,oBAAS,EAAC,KAAK,CAAC;IAChD,YAA6B,SAAoB;QAC/C,KAAK,EAAE,CAAC;QADmB,cAAS,GAAT,SAAS,CAAW;IAEjD,CAAC;IAED,WAAW,CAAC,OAAyB;QACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAU,gCAAa,EAAE;YACxE,OAAO,CAAC,UAAU,EAAE;YACpB,OAAO,CAAC,QAAQ,EAAE;SACnB,CAAC,CAAC;QACH,IAAI,QAAQ;YAAE,OAAO,IAAI,CAAC;QAC1B,OAAO,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IACpC,CAAC;CACF,CAAA;AAbY,oCAAY;uBAAZ,YAAY;IADxB,IAAA,mBAAU,GAAE;qCAE6B,gBAAS;GADtC,YAAY,CAaxB"}
+{"version":3,"file":"jwt.auth.guard.js","sourceRoot":"","sources":["../../../src/auth/guards/jwt.auth.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA8D;AAC9D,uCAAyC;AACzC,+CAA6C;AAC7C,+EAA2E;AAC3E,mHAA0G;AAC1G,qEAA+D;AASxD,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,IAAA,oBAAS,EAAC,KAAK,CAAC;IAChD,YAA6B,SAAoB;QAC/C,KAAK,EAAE,CAAC;QADmB,cAAS,GAAT,SAAS,CAAW;IAEjD,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAyB;QACzC,MAAM,OAAO,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC3D,IAAI,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAU,gCAAa,EAAE,OAAO,CAAC;YACnE,OAAO,IAAI,CAAC;QAEd,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAAE,OAAO,KAAK,CAAC;QAEtD,MAAM,IAAI,GAAG,OAAO;aACjB,YAAY,EAAE;aACd,UAAU,EAA0B,CAAC,IAAI,CAAC;QAC7C,IACE,IAAI,EAAE,sBAAsB;YAC5B,CAAC,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAC/B,2EAAiC,EACjC,OAAO,CACR;YAED,MAAM,IAAI,kCAAe,CACvB,kDAAkD,CACnD,CAAC;QACJ,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AA3BY,oCAAY;uBAAZ,YAAY;IADxB,IAAA,mBAAU,GAAE;qCAE6B,gBAAS;GADtC,YAAY,CA2BxB"}

package/dist/auth/helpers/admin.auth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"admin.auth.d.ts","sourceRoot":"","sources":["../../../src/auth/helpers/admin.auth.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAWjE,qBAAa,SAAS;WAMP,oBAAoB,CAC/B,WAAW,EAAE,MAAM,EACnB,iBAAiB,CAAC,EAAE,MAAM,GACzB,OAAO,CAAC,qBAAqB,GAAG,IAAI,CAAC;IAwBxC,MAAM,CAAC,cAAc,CAAC,CAAC,EACrB,OAAO,EAAE,qBAAqB,EAC9B,QAAQ,EAAE,MAAM,CAAC,GAChB,CAAC;IASJ,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,qBAAqB,GAAG,IAAI;IAIzD,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS;IAInD,MAAM,CAAC,OAAO,IAAI,MAAM,GAAG,SAAS;CAGrC"}
+{"version":3,"file":"admin.auth.d.ts","sourceRoot":"","sources":["../../../src/auth/helpers/admin.auth.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAWjE,qBAAa,SAAS;WAMP,oBAAoB,CAC/B,WAAW,EAAE,MAAM,EACnB,iBAAiB,CAAC,EAAE,MAAM,GACzB,OAAO,CAAC,qBAAqB,GAAG,IAAI,CAAC;IAyBxC,MAAM,CAAC,cAAc,CAAC,CAAC,EACrB,OAAO,EAAE,qBAAqB,EAC9B,QAAQ,EAAE,MAAM,CAAC,GAChB,CAAC;IASJ,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,qBAAqB,GAAG,IAAI;IAIzD,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS;IAInD,MAAM,CAAC,OAAO,IAAI,MAAM,GAAG,SAAS;CAGrC"}

package/dist/auth/helpers/admin.auth.js

@@ -9,7 +9,7 @@ class AdminAuth {
         const adminUser = await admin_user_entity_1.AdminUserEntity.findOne({
             where: { id: adminUserId },
         });
-        if (!adminUser)
+        if (!adminUser?.active)
             return null;
         const adminUserObject = { ...adminUser };
         delete adminUserObject.password;

package/dist/auth/helpers/admin.auth.js.map

@@ -1 +1 @@
-{"version":3,"file":"admin.auth.js","sourceRoot":"","sources":["../../../src/auth/helpers/admin.auth.ts"],"names":[],"mappings":";;;AAAA,6CAAgD;AAChD,qEAAgE;AAGhE,MAAM,OAAO,GAAG,IAAI,+BAAiB,EAAyB,CAAC;AAS/D,MAAa,SAAS;IAMpB,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAC/B,WAAmB,EACnB,iBAA0B;QAE1B,MAAM,SAAS,GAAG,MAAM,mCAAe,CAAC,OAAO,CAAC;YAC9C,KAAK,EAAE,EAAE,EAAE,EAAE,WAAW,EAAE;SAC3B,CAAC,CAAC;QACH,IAAI,CAAC,SAAS;YAAE,OAAO,IAAI,CAAC;QAE5B,MAAM,eAAe,GAAwB,EAAE,GAAG,SAAS,EAAE,CAAC;QAC9D,OAAO,eAAe,CAAC,QAAQ,CAAC;QAChC,OAAO,eAAe,CAAC,UAAU,CAAC;QAClC,OAAO,eAAe,CAAC,UAAU,CAAC;QAClC,OAAO,eAAe,CAAC,UAAU,CAAC;QAElC,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,iBAAiB,EAAE,CAAC;IAC3D,CAAC;IAWD,MAAM,CAAC,cAAc,CACnB,OAA8B,EAC9B,QAAiB;QAEjB,OAAO,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACxC,CAAC;IAOD,MAAM,CAAC,YAAY,CAAC,OAA8B;QAChD,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IAC7B,CAAC;IAED,MAAM,CAAC,SAAS;QACd,OAAO,OAAO,CAAC,QAAQ,EAAE,EAAE,SAAS,CAAC;IACvC,CAAC;IAED,MAAM,CAAC,OAAO;QACZ,OAAO,OAAO,CAAC,QAAQ,EAAE,EAAE,iBAAiB,CAAC;IAC/C,CAAC;CACF;AAxDD,8BAwDC"}
+{"version":3,"file":"admin.auth.js","sourceRoot":"","sources":["../../../src/auth/helpers/admin.auth.ts"],"names":[],"mappings":";;;AAAA,6CAAgD;AAChD,qEAAgE;AAGhE,MAAM,OAAO,GAAG,IAAI,+BAAiB,EAAyB,CAAC;AAS/D,MAAa,SAAS;IAMpB,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAC/B,WAAmB,EACnB,iBAA0B;QAE1B,MAAM,SAAS,GAAG,MAAM,mCAAe,CAAC,OAAO,CAAC;YAC9C,KAAK,EAAE,EAAE,EAAE,EAAE,WAAW,EAAE;SAC3B,CAAC,CAAC;QAEH,IAAI,CAAC,SAAS,EAAE,MAAM;YAAE,OAAO,IAAI,CAAC;QAEpC,MAAM,eAAe,GAAwB,EAAE,GAAG,SAAS,EAAE,CAAC;QAC9D,OAAO,eAAe,CAAC,QAAQ,CAAC;QAChC,OAAO,eAAe,CAAC,UAAU,CAAC;QAClC,OAAO,eAAe,CAAC,UAAU,CAAC;QAClC,OAAO,eAAe,CAAC,UAAU,CAAC;QAElC,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,iBAAiB,EAAE,CAAC;IAC3D,CAAC;IAWD,MAAM,CAAC,cAAc,CACnB,OAA8B,EAC9B,QAAiB;QAEjB,OAAO,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACxC,CAAC;IAOD,MAAM,CAAC,YAAY,CAAC,OAA8B;QAChD,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IAC7B,CAAC;IAED,MAAM,CAAC,SAAS;QACd,OAAO,OAAO,CAAC,QAAQ,EAAE,EAAE,SAAS,CAAC;IACvC,CAAC;IAED,MAAM,CAAC,OAAO;QACZ,OAAO,OAAO,CAAC,QAAQ,EAAE,EAAE,iBAAiB,CAAC;IAC/C,CAAC;CACF;AAzDD,8BAyDC"}

package/dist/auth/jobs/purge.expired.auth.records.job.d.ts

@@ -0,0 +1,15 @@
+import { DataSource, EntityTarget, ObjectLiteral } from 'typeorm';
+import { CommonJob } from '../../common/jobs/common.job';
+import { QueueService } from '../../common/services/queue.service';
+import { AuthConfig } from '../utilities/auth.config';
+export declare class PurgeExpiredAuthRecordsJob extends CommonJob {
+    protected readonly queueService: QueueService;
+    private readonly dataSource;
+    private readonly config;
+    schedulable: boolean;
+    static readonly targets: EntityTarget<ObjectLiteral>[];
+    constructor(queueService: QueueService, dataSource: DataSource, config: AuthConfig);
+    handle(): Promise<void>;
+    private purge;
+}
+//# sourceMappingURL=purge.expired.auth.records.job.d.ts.map

package/dist/auth/jobs/purge.expired.auth.records.job.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"purge.expired.auth.records.job.d.ts","sourceRoot":"","sources":["../../../src/auth/jobs/purge.expired.auth.records.job.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAKnE,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAQtD,qBACa,0BAA2B,SAAQ,SAAS;IAUrD,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY;IAC7C,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM;IAXlB,WAAW,UAAQ;IAE1B,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC,aAAa,CAAC,EAAE,CAIpD;gBAGmB,YAAY,EAAE,YAAY,EAC5B,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,UAAU;IAK/B,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;YAYf,KAAK;CAsBpB"}

package/dist/auth/jobs/purge.expired.auth.records.job.js

@@ -0,0 +1,72 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    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 PurgeExpiredAuthRecordsJob_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PurgeExpiredAuthRecordsJob = void 0;
+const common_1 = require("@nestjs/common");
+const typeorm_1 = require("typeorm");
+const common_job_1 = require("../../common/jobs/common.job");
+const queue_service_1 = require("../../common/services/queue.service");
+const email_verification_token_entity_1 = require("../entities/email.verification.token.entity");
+const system_auth_session_entity_1 = require("../entities/system.auth.session.entity");
+const system_refresh_token_entity_1 = require("../entities/system.refresh.token.entity");
+const auth_default_enum_1 = require("../enums/auth.default.enum");
+const auth_config_1 = require("../utilities/auth.config");
+let PurgeExpiredAuthRecordsJob = PurgeExpiredAuthRecordsJob_1 = class PurgeExpiredAuthRecordsJob extends common_job_1.CommonJob {
+    constructor(queueService, dataSource, config) {
+        super(String(auth_default_enum_1.AuthDefault.PURGE_EXPIRED_RECORDS_JOB));
+        this.queueService = queueService;
+        this.dataSource = dataSource;
+        this.config = config;
+        this.schedulable = true;
+    }
+    async handle() {
+        const days = this.config.recordRetentionDays;
+        if (days <= 0)
+            return;
+        const before = new Date(Date.now() - days * 86_400_000);
+        let removed = 0;
+        for (const target of PurgeExpiredAuthRecordsJob_1.targets)
+            removed += await this.purge(target, before);
+        if (removed)
+            this.logger.log(`Purged ${removed} expired auth record(s).`);
+    }
+    async purge(target, before) {
+        const table = this.dataSource.getMetadata(target).tableName;
+        const limit = Number(auth_default_enum_1.AuthDefault.PURGE_BATCH_SIZE);
+        let total = 0;
+        for (;;) {
+            const result = await this.dataSource
+                .createQueryBuilder()
+                .delete()
+                .from(target)
+                .where(`id IN (SELECT id FROM ${table} WHERE expires_at < :before LIMIT :limit)`, { before, limit })
+                .execute();
+            const affected = result.affected ?? 0;
+            total += affected;
+            if (affected < limit)
+                return total;
+        }
+    }
+};
+exports.PurgeExpiredAuthRecordsJob = PurgeExpiredAuthRecordsJob;
+PurgeExpiredAuthRecordsJob.targets = [
+    system_auth_session_entity_1.SystemAuthSessionEntity,
+    system_refresh_token_entity_1.SystemRefreshTokenEntity,
+    email_verification_token_entity_1.EmailVerificationTokenEntity,
+];
+exports.PurgeExpiredAuthRecordsJob = PurgeExpiredAuthRecordsJob = PurgeExpiredAuthRecordsJob_1 = __decorate([
+    (0, common_1.Injectable)(),
+    __metadata("design:paramtypes", [queue_service_1.QueueService,
+        typeorm_1.DataSource,
+        auth_config_1.AuthConfig])
+], PurgeExpiredAuthRecordsJob);
+//# sourceMappingURL=purge.expired.auth.records.job.js.map

package/dist/auth/jobs/purge.expired.auth.records.job.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"purge.expired.auth.records.job.js","sourceRoot":"","sources":["../../../src/auth/jobs/purge.expired.auth.records.job.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,qCAAkE;AAClE,6DAAyD;AACzD,uEAAmE;AACnE,iGAA2F;AAC3F,uFAAiF;AACjF,yFAAmF;AACnF,kEAAyD;AACzD,0DAAsD;AAS/C,IAAM,0BAA0B,kCAAhC,MAAM,0BAA2B,SAAQ,sBAAS;IASvD,YACqB,YAA0B,EAC5B,UAAsB,EACtB,MAAkB;QAEnC,KAAK,CAAC,MAAM,CAAC,+BAAW,CAAC,yBAAyB,CAAC,CAAC,CAAC;QAJlC,iBAAY,GAAZ,YAAY,CAAc;QAC5B,eAAU,GAAV,UAAU,CAAY;QACtB,WAAM,GAAN,MAAM,CAAY;QAX9B,gBAAW,GAAG,IAAI,CAAC;IAc1B,CAAC;IAED,KAAK,CAAC,MAAM;QACV,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC;QAC7C,IAAI,IAAI,IAAI,CAAC;YAAE,OAAO;QAEtB,MAAM,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,GAAG,UAAU,CAAC,CAAC;QACxD,IAAI,OAAO,GAAG,CAAC,CAAC;QAChB,KAAK,MAAM,MAAM,IAAI,4BAA0B,CAAC,OAAO;YACrD,OAAO,IAAI,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC9C,IAAI,OAAO;YAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,OAAO,0BAA0B,CAAC,CAAC;IAC5E,CAAC;IAGO,KAAK,CAAC,KAAK,CACjB,MAAmC,EACnC,MAAY;QAEZ,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC;QAC5D,MAAM,KAAK,GAAG,MAAM,CAAC,+BAAW,CAAC,gBAAgB,CAAC,CAAC;QACnD,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,SAAS,CAAC;YACR,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU;iBACjC,kBAAkB,EAAE;iBACpB,MAAM,EAAE;iBACR,IAAI,CAAC,MAAM,CAAC;iBACZ,KAAK,CACJ,yBAAyB,KAAK,2CAA2C,EACzE,EAAE,MAAM,EAAE,KAAK,EAAE,CAClB;iBACA,OAAO,EAAE,CAAC;YACb,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,CAAC,CAAC;YACtC,KAAK,IAAI,QAAQ,CAAC;YAClB,IAAI,QAAQ,GAAG,KAAK;gBAAE,OAAO,KAAK,CAAC;QACrC,CAAC;IACH,CAAC;;AAlDU,gEAA0B;AAGrB,kCAAO,GAAkC;IACvD,oDAAuB;IACvB,sDAAwB;IACxB,8DAA4B;CAC7B,AAJsB,CAIrB;qCAPS,0BAA0B;IADtC,IAAA,mBAAU,GAAE;qCAWwB,4BAAY;QAChB,oBAAU;QACd,wBAAU;GAZ1B,0BAA0B,CAmDtC"}

package/dist/auth/middlewares/admin.jwt.middleware.d.ts

@@ -1,11 +1,10 @@
 import { NestMiddleware } from '@nestjs/common';
-import { JwtService } from '@nestjs/jwt';
 import { NextFunction, Request, Response } from 'express';
+import { TokenService } from '../services/token.service';
 export declare class AdminJwtMiddleware implements NestMiddleware {
-    private readonly jwtService;
-    constructor(jwtService: JwtService);
+    private readonly tokenService;
+    constructor(tokenService: TokenService);
     use(request: Request, _response: Response, next: NextFunction): Promise<void>;
     private resolveContext;
-    private extractToken;
 }
 //# sourceMappingURL=admin.jwt.middleware.d.ts.map

package/dist/auth/middlewares/admin.jwt.middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"admin.jwt.middleware.d.ts","sourceRoot":"","sources":["../../../src/auth/middlewares/admin.jwt.middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAkB1D,qBACa,kBAAmB,YAAW,cAAc;IAC3C,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAAV,UAAU,EAAE,UAAU;IAE7C,GAAG,CACP,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,QAAQ,EACnB,IAAI,EAAE,YAAY,GACjB,OAAO,CAAC,IAAI,CAAC;YAcF,cAAc;IA4B5B,OAAO,CAAC,YAAY;CAOrB"}
+{"version":3,"file":"admin.jwt.middleware.d.ts","sourceRoot":"","sources":["../../../src/auth/middlewares/admin.jwt.middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAG1D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAUzD,qBACa,kBAAmB,YAAW,cAAc;IAC3C,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAAZ,YAAY,EAAE,YAAY;IAEjD,GAAG,CACP,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,QAAQ,EACnB,IAAI,EAAE,YAAY,GACjB,OAAO,CAAC,IAAI,CAAC;YAYF,cAAc;CAiB7B"}

package/dist/auth/middlewares/admin.jwt.middleware.js

@@ -11,12 +11,12 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AdminJwtMiddleware = void 0;
 const common_1 = require("@nestjs/common");
-const jwt_1 = require("@nestjs/jwt");
-const system_auth_session_entity_1 = require("../entities/system.auth.session.entity");
 const admin_auth_1 = require("../helpers/admin.auth");
+const token_service_1 = require("../services/token.service");
+const request_credentials_1 = require("../utilities/request.credentials");
 let AdminJwtMiddleware = class AdminJwtMiddleware {
-    constructor(jwtService) {
-        this.jwtService = jwtService;
+    constructor(tokenService) {
+        this.tokenService = tokenService;
     }
     async use(request, _response, next) {
         const context = await this.resolveContext(request);
@@ -27,42 +27,23 @@ let AdminJwtMiddleware = class AdminJwtMiddleware {
         next();
     }
     async resolveContext(request) {
-        const token = this.extractToken(request);
+        const token = request_credentials_1.RequestCredentials.bearerToken(request);
         if (!token)
             return null;
         try {
-            const payload = await this.jwtService.verifyAsync(token, {
-                secret: process.env.ACCESS_TOKEN_SECRET,
-            });
-            if (!payload.sid)
+            const session = await this.tokenService.resolveSession('admin', token);
+            if (!session)
                 return null;
-            const session = await system_auth_session_entity_1.SystemAuthSessionEntity.findOne({
-                where: { session_identifier: payload.sid, is_admin: true },
-            });
-            const active = !!session &&
-                !session.invalidated_at &&
-                session.expires_at.getTime() > Date.now();
-            if (!active)
-                return null;
-            return await admin_auth_1.AdminAuth.loadAdminUserContext(payload.sub, payload.sid);
+            return await admin_auth_1.AdminAuth.loadAdminUserContext(session.payload.sub, session.sessionIdentifier);
         }
         catch {
             return null;
         }
     }
-    extractToken(request) {
-        const header = request.headers['authorization'];
-        if (!header)
-            return undefined;
-        const [scheme, value] = header.split(' ');
-        if (scheme?.toLowerCase() !== 'bearer' || !value)
-            return undefined;
-        return value.trim();
-    }
 };
 exports.AdminJwtMiddleware = AdminJwtMiddleware;
 exports.AdminJwtMiddleware = AdminJwtMiddleware = __decorate([
     (0, common_1.Injectable)(),
-    __metadata("design:paramtypes", [jwt_1.JwtService])
+    __metadata("design:paramtypes", [token_service_1.TokenService])
 ], AdminJwtMiddleware);
 //# sourceMappingURL=admin.jwt.middleware.js.map

package/dist/auth/middlewares/admin.jwt.middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"admin.jwt.middleware.js","sourceRoot":"","sources":["../../../src/auth/middlewares/admin.jwt.middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4D;AAC5D,qCAAyC;AAEzC,uFAAiF;AAEjF,sDAAkD;AAgB3C,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAC7B,YAA6B,UAAsB;QAAtB,eAAU,GAAV,UAAU,CAAY;IAAG,CAAC;IAEvD,KAAK,CAAC,GAAG,CACP,OAAgB,EAChB,SAAmB,EACnB,IAAkB;QAElB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAKnD,IAAI,OAAO,EAAE,CAAC;YACZ,sBAAS,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YACxC,OAAO;QACT,CAAC;QACD,IAAI,EAAE,CAAC;IACT,CAAC;IAGO,KAAK,CAAC,cAAc,CAC1B,OAAgB;QAEhB,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QACzC,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QAExB,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAAa,KAAK,EAAE;gBACnE,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB;aACxC,CAAC,CAAC;YACH,IAAI,CAAC,OAAO,CAAC,GAAG;gBAAE,OAAO,IAAI,CAAC;YAE9B,MAAM,OAAO,GAAG,MAAM,oDAAuB,CAAC,OAAO,CAAC;gBACpD,KAAK,EAAE,EAAE,kBAAkB,EAAE,OAAO,CAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE;aAC3D,CAAC,CAAC;YACH,MAAM,MAAM,GACV,CAAC,CAAC,OAAO;gBACT,CAAC,OAAO,CAAC,cAAc;gBACvB,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC5C,IAAI,CAAC,MAAM;gBAAE,OAAO,IAAI,CAAC;YAEzB,OAAO,MAAM,sBAAS,CAAC,oBAAoB,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;QACxE,CAAC;QAAC,MAAM,CAAC;YAEP,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAEO,YAAY,CAAC,OAAgB;QACnC,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;QAChD,IAAI,CAAC,MAAM;YAAE,OAAO,SAAS,CAAC;QAC9B,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC1C,IAAI,MAAM,EAAE,WAAW,EAAE,KAAK,QAAQ,IAAI,CAAC,KAAK;YAAE,OAAO,SAAS,CAAC;QACnE,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC;IACtB,CAAC;CACF,CAAA;AAxDY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;qCAE8B,gBAAU;GADxC,kBAAkB,CAwD9B"}
+{"version":3,"file":"admin.jwt.middleware.js","sourceRoot":"","sources":["../../../src/auth/middlewares/admin.jwt.middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4D;AAG5D,sDAAkD;AAClD,6DAAyD;AACzD,0EAAsE;AAU/D,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAC7B,YAA6B,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IAAG,CAAC;IAE3D,KAAK,CAAC,GAAG,CACP,OAAgB,EAChB,SAAmB,EACnB,IAAkB;QAElB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAGnD,IAAI,OAAO,EAAE,CAAC;YACZ,sBAAS,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YACxC,OAAO;QACT,CAAC;QACD,IAAI,EAAE,CAAC;IACT,CAAC;IAGO,KAAK,CAAC,cAAc,CAC1B,OAAgB;QAEhB,MAAM,KAAK,GAAG,wCAAkB,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QACtD,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QAExB,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YACvE,IAAI,CAAC,OAAO;gBAAE,OAAO,IAAI,CAAC;YAC1B,OAAO,MAAM,sBAAS,CAAC,oBAAoB,CACzC,OAAO,CAAC,OAAO,CAAC,GAAG,EACnB,OAAO,CAAC,iBAAiB,CAC1B,CAAC;QACJ,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;CACF,CAAA;AApCY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;qCAEgC,4BAAY;GAD5C,kBAAkB,CAoC9B"}

package/dist/auth/middlewares/api.key.middleware.d.ts

@@ -1,11 +1,12 @@
 import { NestMiddleware } from '@nestjs/common';
 import { NextFunction, Request, Response } from 'express';
 import { ApiKeyService } from '../services/api.key.service';
+import { AuthConfig } from '../utilities/auth.config';
 export declare class ApiKeyMiddleware implements NestMiddleware {
     private readonly apiKeyService;
-    constructor(apiKeyService: ApiKeyService);
+    private readonly config;
+    constructor(apiKeyService: ApiKeyService, config: AuthConfig);
     use(request: Request, _response: Response, next: NextFunction): Promise<void>;
     private resolveContext;
-    private extractKey;
 }
 //# sourceMappingURL=api.key.middleware.d.ts.map

package/dist/auth/middlewares/api.key.middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api.key.middleware.d.ts","sourceRoot":"","sources":["../../../src/auth/middlewares/api.key.middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE1D,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAiB5D,qBACa,gBAAiB,YAAW,cAAc;IACzC,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAEnD,GAAG,CACP,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,QAAQ,EACnB,IAAI,EAAE,YAAY,GACjB,OAAO,CAAC,IAAI,CAAC;YAcF,cAAc;IAgB5B,OAAO,CAAC,UAAU;CAYnB"}
+{"version":3,"file":"api.key.middleware.d.ts","sourceRoot":"","sources":["../../../src/auth/middlewares/api.key.middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAG5D,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAWtD,qBACa,gBAAiB,YAAW,cAAc;IAEnD,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,MAAM;gBADN,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,UAAU;IAG/B,GAAG,CACP,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,QAAQ,EACnB,IAAI,EAAE,YAAY,GACjB,OAAO,CAAC,IAAI,CAAC;YAWF,cAAc;CAsB7B"}

package/dist/auth/middlewares/api.key.middleware.js

@@ -11,12 +11,14 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApiKeyMiddleware = void 0;
 const common_1 = require("@nestjs/common");
-const api_key_default_enum_1 = require("../enums/api.key.default.enum");
 const api_key_service_1 = require("../services/api.key.service");
 const api_key_context_1 = require("../helpers/api.key.context");
+const auth_config_1 = require("../utilities/auth.config");
+const request_credentials_1 = require("../utilities/request.credentials");
 let ApiKeyMiddleware = class ApiKeyMiddleware {
-    constructor(apiKeyService) {
+    constructor(apiKeyService, config) {
         this.apiKeyService = apiKeyService;
+        this.config = config;
     }
     async use(request, _response, next) {
         const context = await this.resolveContext(request);
@@ -27,33 +29,28 @@ let ApiKeyMiddleware = class ApiKeyMiddleware {
         next();
     }
     async resolveContext(request) {
-        const rawKey = this.extractKey(request);
+        const rawKey = request_credentials_1.RequestCredentials.apiKey(request, this.config.apiKeyHeaderName);
         if (!rawKey)
             return null;
-        const apiKey = await this.apiKeyService.validateApiKey(rawKey);
-        if (!apiKey)
+        try {
+            const apiKey = await this.apiKeyService.validateApiKey(rawKey);
+            if (!apiKey)
+                return null;
+            return {
+                apiKey,
+                tenant: apiKey.tenant ?? undefined,
+                scopes: await this.apiKeyService.effectiveScopes(apiKey),
+            };
+        }
+        catch {
             return null;
-        return {
-            apiKey,
-            tenant: apiKey.tenant ?? undefined,
-            scopes: await this.apiKeyService.grantedScopes(apiKey.id),
-        };
-    }
-    extractKey(request) {
-        const headerName = process.env.API_KEY_HEADER_NAME || api_key_default_enum_1.ApiKeyDefault.HEADER_NAME;
-        const headerKey = request.headers[headerName];
-        if (headerKey)
-            return Array.isArray(headerKey) ? headerKey[0] : headerKey;
-        const authorization = request.headers.authorization;
-        if (authorization?.toLowerCase().startsWith('apikey ')) {
-            return authorization.slice('apikey '.length).trim();
         }
-        return null;
     }
 };
 exports.ApiKeyMiddleware = ApiKeyMiddleware;
 exports.ApiKeyMiddleware = ApiKeyMiddleware = __decorate([
     (0, common_1.Injectable)(),
-    __metadata("design:paramtypes", [api_key_service_1.ApiKeyService])
+    __metadata("design:paramtypes", [api_key_service_1.ApiKeyService,
+        auth_config_1.AuthConfig])
 ], ApiKeyMiddleware);
 //# sourceMappingURL=api.key.middleware.js.map

package/dist/auth/middlewares/api.key.middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"api.key.middleware.js","sourceRoot":"","sources":["../../../src/auth/middlewares/api.key.middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4D;AAE5D,wEAA8D;AAC9D,iEAA4D;AAC5D,gEAA2D;AAiBpD,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAC3B,YAA6B,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAAG,CAAC;IAE7D,KAAK,CAAC,GAAG,CACP,OAAgB,EAChB,SAAmB,EACnB,IAAkB;QAElB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAKnD,IAAI,OAAO,EAAE,CAAC;YACZ,+BAAa,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YAC5C,OAAO;QACT,CAAC;QACD,IAAI,EAAE,CAAC;IACT,CAAC;IAGO,KAAK,CAAC,cAAc,CAC1B,OAAgB;QAEhB,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QACxC,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QAEzB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QAC/D,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QAEzB,OAAO;YACL,MAAM;YACN,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,SAAS;YAClC,MAAM,EAAE,MAAM,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;SAC1D,CAAC;IACJ,CAAC;IAEO,UAAU,CAAC,OAAgB;QACjC,MAAM,UAAU,GACd,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,oCAAa,CAAC,WAAW,CAAC;QAC/D,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC9C,IAAI,SAAS;YAAE,OAAO,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAE1E,MAAM,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC;QACpD,IAAI,aAAa,EAAE,WAAW,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YACvD,OAAO,aAAa,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;QACtD,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AAjDY,4CAAgB;2BAAhB,gBAAgB;IAD5B,IAAA,mBAAU,GAAE;qCAEiC,+BAAa;GAD9C,gBAAgB,CAiD5B"}
+{"version":3,"file":"api.key.middleware.js","sourceRoot":"","sources":["../../../src/auth/middlewares/api.key.middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4D;AAE5D,iEAA4D;AAC5D,gEAA2D;AAE3D,0DAAsD;AACtD,0EAAsE;AAW/D,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAC3B,YACmB,aAA4B,EAC5B,MAAkB;QADlB,kBAAa,GAAb,aAAa,CAAe;QAC5B,WAAM,GAAN,MAAM,CAAY;IAClC,CAAC;IAEJ,KAAK,CAAC,GAAG,CACP,OAAgB,EAChB,SAAmB,EACnB,IAAkB;QAElB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAGnD,IAAI,OAAO,EAAE,CAAC;YACZ,+BAAa,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YAC5C,OAAO;QACT,CAAC;QACD,IAAI,EAAE,CAAC;IACT,CAAC;IAEO,KAAK,CAAC,cAAc,CAC1B,OAAgB;QAEhB,MAAM,MAAM,GAAG,wCAAkB,CAAC,MAAM,CACtC,OAAO,EACP,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAC7B,CAAC;QACF,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QAEzB,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YAC/D,IAAI,CAAC,MAAM;gBAAE,OAAO,IAAI,CAAC;YAEzB,OAAO;gBACL,MAAM;gBACN,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,SAAS;gBAClC,MAAM,EAAE,MAAM,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,MAAM,CAAC;aACzD,CAAC;QACJ,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;CACF,CAAA;AA3CY,4CAAgB;2BAAhB,gBAAgB;IAD5B,IAAA,mBAAU,GAAE;qCAGuB,+BAAa;QACpB,wBAAU;GAH1B,gBAAgB,CA2C5B"}

package/dist/auth/middlewares/jwt.middleware.d.ts

@@ -1,11 +1,10 @@
 import { NestMiddleware } from '@nestjs/common';
-import { JwtService } from '@nestjs/jwt';
 import { NextFunction, Request, Response } from 'express';
+import { TokenService } from '../services/token.service';
 export declare class JwtMiddleware implements NestMiddleware {
-    private readonly jwtService;
-    constructor(jwtService: JwtService);
+    private readonly tokenService;
+    constructor(tokenService: TokenService);
     use(request: Request, _response: Response, next: NextFunction): Promise<void>;
     private resolveContext;
-    private extractToken;
 }
 //# sourceMappingURL=jwt.middleware.d.ts.map

package/dist/auth/middlewares/jwt.middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jwt.middleware.d.ts","sourceRoot":"","sources":["../../../src/auth/middlewares/jwt.middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAkB1D,qBACa,aAAc,YAAW,cAAc;IACtC,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAAV,UAAU,EAAE,UAAU;IAE7C,GAAG,CACP,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,QAAQ,EACnB,IAAI,EAAE,YAAY,GACjB,OAAO,CAAC,IAAI,CAAC;YAcF,cAAc;IAiC5B,OAAO,CAAC,YAAY;CAOrB"}
+{"version":3,"file":"jwt.middleware.d.ts","sourceRoot":"","sources":["../../../src/auth/middlewares/jwt.middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAI1D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAUzD,qBACa,aAAc,YAAW,cAAc;IACtC,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAAZ,YAAY,EAAE,YAAY;IAEjD,GAAG,CACP,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,QAAQ,EACnB,IAAI,EAAE,YAAY,GACjB,OAAO,CAAC,IAAI,CAAC;YAYF,cAAc;CA8B7B"}

package/dist/auth/middlewares/jwt.middleware.js

@@ -11,12 +11,13 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JwtMiddleware = void 0;
 const common_1 = require("@nestjs/common");
-const jwt_1 = require("@nestjs/jwt");
-const system_auth_session_entity_1 = require("../entities/system.auth.session.entity");
+const tenant_entity_1 = require("../../tenant/entities/tenant.entity");
 const auth_1 = require("../helpers/auth");
+const token_service_1 = require("../services/token.service");
+const request_credentials_1 = require("../utilities/request.credentials");
 let JwtMiddleware = class JwtMiddleware {
-    constructor(jwtService) {
-        this.jwtService = jwtService;
+    constructor(tokenService) {
+        this.tokenService = tokenService;
     }
     async use(request, _response, next) {
         const context = await this.resolveContext(request);
@@ -27,42 +28,29 @@ let JwtMiddleware = class JwtMiddleware {
         next();
     }
     async resolveContext(request) {
-        const token = this.extractToken(request);
+        const token = request_credentials_1.RequestCredentials.bearerToken(request);
         if (!token)
             return null;
         try {
-            const payload = await this.jwtService.verifyAsync(token, {
-                secret: process.env.ACCESS_TOKEN_SECRET,
-            });
-            if (!payload.sid)
+            const session = await this.tokenService.resolveSession('user', token);
+            if (!session)
                 return null;
-            const session = await system_auth_session_entity_1.SystemAuthSessionEntity.findOne({
-                where: { session_identifier: payload.sid, is_admin: false },
-            });
-            const active = !!session &&
-                !session.invalidated_at &&
-                session.expires_at.getTime() > Date.now();
-            if (!active)
+            if (session.tenantId &&
+                !(await tenant_entity_1.TenantEntity.existsBy({
+                    id: session.tenantId,
+                    is_active: true,
+                })))
                 return null;
-            return await auth_1.Auth.loadUserContext(payload.sub, payload.sid, session.tenant_id ?? undefined);
+            return await auth_1.Auth.loadUserContext(session.payload.sub, session.sessionIdentifier, session.tenantId ?? undefined);
         }
         catch {
             return null;
         }
     }
-    extractToken(request) {
-        const header = request.headers['authorization'];
-        if (!header)
-            return undefined;
-        const [scheme, value] = header.split(' ');
-        if (scheme?.toLowerCase() !== 'bearer' || !value)
-            return undefined;
-        return value.trim();
-    }
 };
 exports.JwtMiddleware = JwtMiddleware;
 exports.JwtMiddleware = JwtMiddleware = __decorate([
     (0, common_1.Injectable)(),
-    __metadata("design:paramtypes", [jwt_1.JwtService])
+    __metadata("design:paramtypes", [token_service_1.TokenService])
 ], JwtMiddleware);
 //# sourceMappingURL=jwt.middleware.js.map

package/dist/auth/middlewares/jwt.middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"jwt.middleware.js","sourceRoot":"","sources":["../../../src/auth/middlewares/jwt.middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4D;AAC5D,qCAAyC;AAEzC,uFAAiF;AAEjF,0CAAuC;AAgBhC,IAAM,aAAa,GAAnB,MAAM,aAAa;IACxB,YAA6B,UAAsB;QAAtB,eAAU,GAAV,UAAU,CAAY;IAAG,CAAC;IAEvD,KAAK,CAAC,GAAG,CACP,OAAgB,EAChB,SAAmB,EACnB,IAAkB;QAElB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAKnD,IAAI,OAAO,EAAE,CAAC;YACZ,WAAI,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YACnC,OAAO;QACT,CAAC;QACD,IAAI,EAAE,CAAC;IACT,CAAC;IAGO,KAAK,CAAC,cAAc,CAC1B,OAAgB;QAEhB,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QACzC,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QAExB,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAAa,KAAK,EAAE;gBACnE,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB;aACxC,CAAC,CAAC;YACH,IAAI,CAAC,OAAO,CAAC,GAAG;gBAAE,OAAO,IAAI,CAAC;YAE9B,MAAM,OAAO,GAAG,MAAM,oDAAuB,CAAC,OAAO,CAAC;gBACpD,KAAK,EAAE,EAAE,kBAAkB,EAAE,OAAO,CAAC,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE;aAC5D,CAAC,CAAC;YACH,MAAM,MAAM,GACV,CAAC,CAAC,OAAO;gBACT,CAAC,OAAO,CAAC,cAAc;gBACvB,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC5C,IAAI,CAAC,MAAM;gBAAE,OAAO,IAAI,CAAC;YAGzB,OAAO,MAAM,WAAI,CAAC,eAAe,CAC/B,OAAO,CAAC,GAAG,EACX,OAAO,CAAC,GAAG,EACX,OAAO,CAAC,SAAS,IAAI,SAAS,CAC/B,CAAC;QACJ,CAAC;QAAC,MAAM,CAAC;YAEP,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAEO,YAAY,CAAC,OAAgB;QACnC,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;QAChD,IAAI,CAAC,MAAM;YAAE,OAAO,SAAS,CAAC;QAC9B,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC1C,IAAI,MAAM,EAAE,WAAW,EAAE,KAAK,QAAQ,IAAI,CAAC,KAAK;YAAE,OAAO,SAAS,CAAC;QACnE,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC;IACtB,CAAC;CACF,CAAA;AA7DY,sCAAa;wBAAb,aAAa;IADzB,IAAA,mBAAU,GAAE;qCAE8B,gBAAU;GADxC,aAAa,CA6DzB"}
+{"version":3,"file":"jwt.middleware.js","sourceRoot":"","sources":["../../../src/auth/middlewares/jwt.middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4D;AAE5D,uEAAmE;AAEnE,0CAAuC;AACvC,6DAAyD;AACzD,0EAAsE;AAU/D,IAAM,aAAa,GAAnB,MAAM,aAAa;IACxB,YAA6B,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IAAG,CAAC;IAE3D,KAAK,CAAC,GAAG,CACP,OAAgB,EAChB,SAAmB,EACnB,IAAkB;QAElB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAGnD,IAAI,OAAO,EAAE,CAAC;YACZ,WAAI,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YACnC,OAAO;QACT,CAAC;QACD,IAAI,EAAE,CAAC;IACT,CAAC;IAGO,KAAK,CAAC,cAAc,CAC1B,OAAgB;QAEhB,MAAM,KAAK,GAAG,wCAAkB,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QACtD,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QAExB,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YACtE,IAAI,CAAC,OAAO;gBAAE,OAAO,IAAI,CAAC;YAG1B,IACE,OAAO,CAAC,QAAQ;gBAChB,CAAC,CAAC,MAAM,4BAAY,CAAC,QAAQ,CAAC;oBAC5B,EAAE,EAAE,OAAO,CAAC,QAAQ;oBACpB,SAAS,EAAE,IAAI;iBAChB,CAAC,CAAC;gBAEH,OAAO,IAAI,CAAC;YAGd,OAAO,MAAM,WAAI,CAAC,eAAe,CAC/B,OAAO,CAAC,OAAO,CAAC,GAAG,EACnB,OAAO,CAAC,iBAAiB,EACzB,OAAO,CAAC,QAAQ,IAAI,SAAS,CAC9B,CAAC;QACJ,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;CACF,CAAA;AAjDY,sCAAa;wBAAb,aAAa;IADzB,IAAA,mBAAU,GAAE;qCAEgC,4BAAY;GAD5C,aAAa,CAiDzB"}