@servicelabsco/nestjs-utility-services 2.0.15 → 3.0.2

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

@@ -41,6 +41,7 @@ var __importStar = (this && this.__importStar) || (function () {
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var InternalMiddleware_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InternalMiddleware = void 0;
 const common_1 = require("@nestjs/common");
@@ -49,9 +50,10 @@ const access_exception_1 = require("../../common/exceptions/access.exception");
 const no_logged_user_exception_1 = require("../../common/exceptions/no.logged.user.exception");
 const operation_exception_1 = require("../../common/exceptions/operation.exception");
 const auth_1 = require("../../common/libraries/auth");
+const user_constants_1 = require("../../common/constants/user.constants");
 const property_service_1 = require("../../system/services/property.service");
 const auth_service_1 = require("../services/auth.service");
-let InternalMiddleware = class InternalMiddleware {
+let InternalMiddleware = InternalMiddleware_1 = class InternalMiddleware {
     constructor(authService, propertyService) {
         this.authService = authService;
         this.propertyService = propertyService;
@@ -60,16 +62,38 @@ let InternalMiddleware = class InternalMiddleware {
         const credential = req.headers['x-internal-token'];
         if (!credential)
             throw new no_logged_user_exception_1.NoLoggedUserException();
-        const key = await this.propertyService.get('internal.server.key');
+        const key = await this.getServerKey();
         if (!key)
             throw new operation_exception_1.OperationException('Internal Auth key is not set');
         if (!this.constantTimeEquals(String(key), String(credential))) {
             throw new access_exception_1.AccessException('Invalid credential');
         }
-        const accessObject = await this.authService.getUserObject(2);
+        const accessObject = await this.authService.getUserObject(user_constants_1.UserConstants.INTERNAL);
         auth_1.Auth.login(accessObject);
         next();
     }
+    async getServerKey() {
+        const envKey = process.env.INTERNAL_SERVER_KEY;
+        if (envKey)
+            return envKey;
+        if (process.env.INTERNAL_SERVER_KEY_ALLOW_DB_FALLBACK !== 'true') {
+            if (!InternalMiddleware_1.dbFallbackWarned) {
+                global.console.error('InternalMiddleware: INTERNAL_SERVER_KEY env is unset and the admin-mutable ' +
+                    '`internal.server.key` DB fallback is disabled — internal/* requests will be rejected. ' +
+                    'Set INTERNAL_SERVER_KEY, or set INTERNAL_SERVER_KEY_ALLOW_DB_FALLBACK=true to restore ' +
+                    'the legacy (less safe) behaviour during migration. See FIN-115 / U-S12.');
+                InternalMiddleware_1.dbFallbackWarned = true;
+            }
+            return null;
+        }
+        if (!InternalMiddleware_1.dbFallbackWarned) {
+            global.console.warn('InternalMiddleware: falling back to the `internal.server.key` DB property. ' +
+                'That row is admin-mutable from the API — set INTERNAL_SERVER_KEY in env for ' +
+                'proper isolation. See FIN-115 / U-S12.');
+            InternalMiddleware_1.dbFallbackWarned = true;
+        }
+        return this.propertyService.get('internal.server.key');
+    }
     constantTimeEquals(a, b) {
         const bufA = Buffer.from(a, 'utf8');
         const bufB = Buffer.from(b, 'utf8');
@@ -79,7 +103,8 @@ let InternalMiddleware = class InternalMiddleware {
     }
 };
 exports.InternalMiddleware = InternalMiddleware;
-exports.InternalMiddleware = InternalMiddleware = __decorate([
+InternalMiddleware.dbFallbackWarned = false;
+exports.InternalMiddleware = InternalMiddleware = InternalMiddleware_1 = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [auth_service_1.AuthService,
         property_service_1.PropertyService])

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

@@ -1 +1 @@
-{"version":3,"file":"internal.middleware.js","sourceRoot":"","sources":["../../../src/auth/middlewares/internal.middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA4D;AAC5D,+CAAiC;AAEjC,+EAA2E;AAC3E,+FAAyF;AACzF,qFAAiF;AACjF,sDAAmD;AACnD,6EAAyE;AACzE,2DAAuD;AAShD,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAM3B,YACqB,WAAwB,EACxB,eAAgC;QADhC,gBAAW,GAAX,WAAW,CAAa;QACxB,oBAAe,GAAf,eAAe,CAAiB;IAClD,CAAC;IAWJ,KAAK,CAAC,GAAG,CAAC,GAAQ,EAAE,GAAa,EAAE,IAAc;QAC7C,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;QACnD,IAAI,CAAC,UAAU;YAAE,MAAM,IAAI,gDAAqB,EAAE,CAAC;QAEnD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;QAClE,IAAI,CAAC,GAAG;YAAE,MAAM,IAAI,wCAAkB,CAAC,8BAA8B,CAAC,CAAC;QAEvE,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC;YAC5D,MAAM,IAAI,kCAAe,CAAC,oBAAoB,CAAC,CAAC;QACpD,CAAC;QAED,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QAE7D,WAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAEzB,IAAI,EAAE,CAAC;IACX,CAAC;IAMO,kBAAkB,CAAC,CAAS,EAAE,CAAS;QAC3C,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;QACpC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;QACpC,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM;YAAE,OAAO,KAAK,CAAC;QAC9C,OAAO,MAAM,CAAC,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC9C,CAAC;CACJ,CAAA;AAhDY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;qCAQyB,0BAAW;QACP,kCAAe;GAR5C,kBAAkB,CAgD9B"}
+{"version":3,"file":"internal.middleware.js","sourceRoot":"","sources":["../../../src/auth/middlewares/internal.middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA4D;AAC5D,+CAAiC;AAEjC,+EAA2E;AAC3E,+FAAyF;AACzF,qFAAiF;AACjF,sDAAmD;AACnD,0EAAsE;AACtE,6EAAyE;AACzE,2DAAuD;AAShD,IAAM,kBAAkB,0BAAxB,MAAM,kBAAkB;IAc3B,YACqB,WAAwB,EACxB,eAAgC;QADhC,gBAAW,GAAX,WAAW,CAAa;QACxB,oBAAe,GAAf,eAAe,CAAiB;IAClD,CAAC;IAWJ,KAAK,CAAC,GAAG,CAAC,GAAQ,EAAE,GAAa,EAAE,IAAc;QAC7C,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;QACnD,IAAI,CAAC,UAAU;YAAE,MAAM,IAAI,gDAAqB,EAAE,CAAC;QAEnD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QACtC,IAAI,CAAC,GAAG;YAAE,MAAM,IAAI,wCAAkB,CAAC,8BAA8B,CAAC,CAAC;QAEvE,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC;YAC5D,MAAM,IAAI,kCAAe,CAAC,oBAAoB,CAAC,CAAC;QACpD,CAAC;QAED,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,8BAAa,CAAC,QAAQ,CAAC,CAAC;QAElF,WAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAEzB,IAAI,EAAE,CAAC;IACX,CAAC;IAYO,KAAK,CAAC,YAAY;QACtB,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC;QAC/C,IAAI,MAAM;YAAE,OAAO,MAAM,CAAC;QAU1B,IAAI,OAAO,CAAC,GAAG,CAAC,qCAAqC,KAAK,MAAM,EAAE,CAAC;YAC/D,IAAI,CAAC,oBAAkB,CAAC,gBAAgB,EAAE,CAAC;gBACvC,MAAM,CAAC,OAAO,CAAC,KAAK,CAChB,6EAA6E;oBACzE,wFAAwF;oBACxF,wFAAwF;oBACxF,yEAAyE,CAChF,CAAC;gBACF,oBAAkB,CAAC,gBAAgB,GAAG,IAAI,CAAC;YAC/C,CAAC;YACD,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,IAAI,CAAC,oBAAkB,CAAC,gBAAgB,EAAE,CAAC;YACvC,MAAM,CAAC,OAAO,CAAC,IAAI,CACf,6EAA6E;gBACzE,8EAA8E;gBAC9E,wCAAwC,CAC/C,CAAC;YACF,oBAAkB,CAAC,gBAAgB,GAAG,IAAI,CAAC;QAC/C,CAAC;QACD,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;IAC3D,CAAC;IAMO,kBAAkB,CAAC,CAAS,EAAE,CAAS;QAC3C,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;QACpC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;QACpC,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM;YAAE,OAAO,KAAK,CAAC;QAC9C,OAAO,MAAM,CAAC,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC9C,CAAC;;AArGQ,gDAAkB;AAOZ,mCAAgB,GAAG,KAAK,AAAR,CAAS;6BAP/B,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;qCAgByB,0BAAW;QACP,kCAAe;GAhB5C,kBAAkB,CAsG9B"}

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

@@ -11,6 +11,7 @@ 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 access_exception_1 = require("../../common/exceptions/access.exception");
 const operation_exception_1 = require("../../common/exceptions/operation.exception");
 const auth_1 = require("../../common/libraries/auth");
 const platform_utility_1 = require("../../common/libraries/platform.utility");
@@ -34,8 +35,12 @@ let JwtMiddleware = class JwtMiddleware {
             throw new operation_exception_1.OperationException('This user is blocked from the platform');
         const isAllowed = await this.authService.validateSession(auth);
         if (!isAllowed)
-            return next();
-        auth_1.Auth.login({ ...auth, ...accessObject, req: { ip } });
+            throw new access_exception_1.AccessException('This session has been revoked, please login again');
+        const JWT_AUTHORITY_KEYS = ['roles', 'role_identifiers', 'permissions', 'permission_identifiers', 'attributes', 'has_admin_access'];
+        const safeAuth = { ...auth };
+        for (const key of JWT_AUTHORITY_KEYS)
+            delete safeAuth[key];
+        auth_1.Auth.login({ ...safeAuth, ...accessObject, req: { ip } });
         next();
     }
     parseBearerToken(req) {

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;AAE5D,qFAAiF;AACjF,sDAAmD;AACnD,8EAA0E;AAC1E,2DAAuD;AAShD,IAAM,aAAa,GAAnB,MAAM,aAAa;IAMtB,YAA6B,WAAwB;QAAxB,gBAAW,GAAX,WAAW,CAAa;IAAG,CAAC;IAWzD,KAAK,CAAC,GAAG,CAAC,GAAY,EAAE,GAAa,EAAE,IAAc;QACjD,MAAM,EAAE,GAAG,kCAAe,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;QAGjD,IAAI,WAAI,CAAC,KAAK,EAAE;YAAE,OAAO,IAAI,EAAE,CAAC;QAEhC,MAAM,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;QAEzC,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,EAAE,CAAC;QAE1B,MAAM,IAAI,GAAQ,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;QAEvD,IAAI,CAAC,IAAI;YAAE,OAAO,IAAI,EAAE,CAAC;QAEzB,MAAM,YAAY,GAAQ,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAGxE,IAAI,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,YAAY,CAAC;YAAE,MAAM,IAAI,wCAAkB,CAAC,wCAAwC,CAAC,CAAC;QAEzH,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAC/D,IAAI,CAAC,SAAS;YAAE,OAAO,IAAI,EAAE,CAAC;QAM9B,WAAI,CAAC,KAAK,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,YAAY,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAEtD,IAAI,EAAE,CAAC;IACX,CAAC;IAQO,gBAAgB,CAAC,GAAY;QACjC,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC;QAC7C,IAAI,CAAC,UAAU,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;YAChD,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACpC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE,CAAC;YAC9C,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,OAAO,KAAK,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;IAC5B,CAAC;IAQD,KAAK,CAAC,kBAAkB,CAAC,KAAa;QAClC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAC7D,IAAI,CAAC,OAAO;YAAE,OAAO,KAAK,CAAC;QAE3B,MAAM,cAAc,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAEtC,cAAc,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC/B,OAAO,OAAO,CAAC,OAAO,CAAC,CAAC;QAC5B,CAAC,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC;IACnB,CAAC;CACJ,CAAA;AAtFY,sCAAa;wBAAb,aAAa;IADzB,IAAA,mBAAU,GAAE;qCAOiC,0BAAW;GAN5C,aAAa,CAsFzB"}
+{"version":3,"file":"jwt.middleware.js","sourceRoot":"","sources":["../../../src/auth/middlewares/jwt.middleware.ts"],"names":[],"mappings":"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"}

package/dist/auth/services/access.service.d.ts

@@ -3,8 +3,8 @@ import { RoleAssignmentDto } from '../dtos/role.assignment.dto';
 import { UserAccessDto } from '../dtos/user.access.dto';
 import { CommonService } from '../../common/libraries/common.service';
 export declare class AccessService extends CommonService {
-    protected publicExposed: boolean;
     getUser(): UserAccessDto;
+    private has;
     validateRoleId(roleId: number | number[]): boolean;
     validateRoleIdentifier(roleIdentifier: string | string[]): boolean;
     hasRoleId(roleId: number): boolean;

package/dist/auth/services/access.service.js

@@ -10,15 +10,16 @@ exports.AccessService = void 0;
 const common_1 = require("@nestjs/common");
 const access_exception_1 = require("../../common/exceptions/access.exception");
 const auth_1 = require("../../common/libraries/auth");
+const role_constants_1 = require("../../common/constants/role.constants");
 const common_service_1 = require("../../common/libraries/common.service");
+const public_exposed_decorator_1 = require("../../common/decorators/public.exposed.decorator");
 let AccessService = class AccessService extends common_service_1.CommonService {
-    constructor() {
-        super(...arguments);
-        this.publicExposed = true;
-    }
     getUser() {
         return auth_1.Auth.user();
     }
+    has(collection, value) {
+        return Array.isArray(collection) && collection.includes(value);
+    }
     validateRoleId(roleId) {
         const ids = Array.isArray(roleId) ? roleId : [roleId];
         for (const id of ids) {
@@ -38,66 +39,72 @@ let AccessService = class AccessService extends common_service_1.CommonService {
         throw new access_exception_1.AccessException();
     }
     hasRoleId(roleId) {
-        if (roleId === 2)
-            return true;
         const user = this.getUser();
-        if (!user?.roles)
+        if (!user)
+            return false;
+        if (roleId === role_constants_1.RoleConstants.PUBLIC)
+            return true;
+        if (!user.roles)
             return false;
-        if (user?.roles?.indexOf(1) !== -1)
+        if (user.roles.indexOf(role_constants_1.RoleConstants.SUPER_ADMIN) !== -1)
             return true;
-        if (user?.roles?.indexOf(roleId) !== -1)
+        if (user.roles.indexOf(roleId) !== -1)
             return true;
         return false;
     }
     hasRoleIds(roleIds) {
-        if (roleIds?.includes(2))
-            return true;
         const user = this.getUser();
-        if (!user?.roles)
+        if (!user)
+            return false;
+        if (roleIds?.includes(role_constants_1.RoleConstants.PUBLIC))
+            return true;
+        if (!user.roles)
             return false;
-        if (user.roles.includes(1))
+        if (user.roles.includes(role_constants_1.RoleConstants.SUPER_ADMIN))
             return true;
         return user.roles.some((item) => roleIds.includes(item));
     }
     hasRoleIdentifiers(roleIdentifiers) {
+        const user = this.getUser();
+        if (!user)
+            return false;
         if (roleIdentifiers?.includes('public'))
             return true;
-        const user = this.getUser();
-        if (!user?.roles)
+        if (!user.roles)
             return false;
-        if (user?.roles?.includes(1))
+        if (user.roles.includes(role_constants_1.RoleConstants.SUPER_ADMIN))
             return true;
-        return user?.role_identifiers?.some((item) => roleIdentifiers?.includes(item));
+        return Array.isArray(user.role_identifiers) && user.role_identifiers.some((item) => roleIdentifiers.includes(item));
     }
     hasRoleIdentifier(role) {
-        if (role === 'public')
-            return true;
         const user = this.getUser();
         if (!user)
             return false;
-        if (user?.roles?.indexOf(1) !== -1)
+        if (role === 'public')
+            return true;
+        if (this.has(user.roles, role_constants_1.RoleConstants.SUPER_ADMIN))
             return true;
-        if (user?.role_identifiers?.indexOf(role) !== -1)
+        if (this.has(user.role_identifiers, role))
             return true;
         return false;
     }
     hasAbsoluteRoleId(roleId) {
-        if (roleId === 2)
-            return true;
         const user = this.getUser();
         if (!user)
             return false;
-        if (user?.roles?.indexOf(roleId) !== -1)
+        if (roleId === role_constants_1.RoleConstants.PUBLIC)
+            return true;
+        if (this.has(user.roles, roleId))
             return true;
         return false;
     }
     hasAbsoluteRoleIdentifier(role) {
-        if (role === 'public')
-            return true;
         const user = this.getUser();
         if (!user)
             return false;
-        if (user?.role_identifiers?.indexOf(role) !== -1)
+        if (role === 'public')
+            return true;
+        if (this.has(user.role_identifiers, role))
             return true;
         return false;
     }
@@ -105,9 +112,9 @@ let AccessService = class AccessService extends common_service_1.CommonService {
         const user = this.getUser();
         if (!user)
             return false;
-        if (user?.roles?.indexOf(1) !== -1)
+        if (this.has(user.roles, role_constants_1.RoleConstants.SUPER_ADMIN))
             return true;
-        if (user?.permissions?.indexOf(permissionId) !== -1)
+        if (this.has(user.permissions, permissionId))
             return true;
         return false;
     }
@@ -115,9 +122,9 @@ let AccessService = class AccessService extends common_service_1.CommonService {
         const user = this.getUser();
         if (!user)
             return false;
-        if (user?.roles?.indexOf(1) !== -1)
+        if (this.has(user.roles, role_constants_1.RoleConstants.SUPER_ADMIN))
             return true;
-        if (user?.permission_identifiers?.indexOf(permission) !== -1)
+        if (this.has(user.permission_identifiers, permission))
             return true;
         return false;
     }
@@ -125,7 +132,7 @@ let AccessService = class AccessService extends common_service_1.CommonService {
         const user = this.getUser();
         if (!user)
             return false;
-        if (user?.permissions?.indexOf(permissionId) !== -1)
+        if (this.has(user.permissions, permissionId))
             return true;
         return false;
     }
@@ -133,7 +140,7 @@ let AccessService = class AccessService extends common_service_1.CommonService {
         const user = this.getUser();
         if (!user)
             return false;
-        if (user?.permission_identifiers?.indexOf(permission) !== -1)
+        if (this.has(user.permission_identifiers, permission))
             return true;
         return false;
     }
@@ -166,6 +173,7 @@ let AccessService = class AccessService extends common_service_1.CommonService {
 };
 exports.AccessService = AccessService;
 exports.AccessService = AccessService = __decorate([
+    (0, public_exposed_decorator_1.PublicExposed)(),
     (0, common_1.Injectable)()
 ], AccessService);
 //# sourceMappingURL=access.service.js.map

package/dist/auth/services/access.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"access.service.js","sourceRoot":"","sources":["../../../src/auth/services/access.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA4C;AAC5C,+EAA2E;AAC3E,sDAAmD;AAInD,0EAAsE;AAS/D,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,8BAAa;IAAzC;;QACO,kBAAa,GAAG,IAAI,CAAC;IAmQnC,CAAC;IA7PG,OAAO;QACH,OAAO,WAAI,CAAC,IAAI,EAAE,CAAC;IACvB,CAAC;IAQD,cAAc,CAAC,MAAyB;QACpC,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QACtD,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;YACnB,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;YACnC,IAAI,OAAO;gBAAE,OAAO,IAAI,CAAC;QAC7B,CAAC;QAED,MAAM,IAAI,kCAAe,EAAE,CAAC;IAChC,CAAC;IAOD,sBAAsB,CAAC,cAAiC;QACpD,MAAM,eAAe,GAAG,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC;QAE1F,KAAK,MAAM,UAAU,IAAI,eAAe,EAAE,CAAC;YACvC,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;YACnD,IAAI,OAAO;gBAAE,OAAO,IAAI,CAAC;QAC7B,CAAC;QAED,MAAM,IAAI,kCAAe,EAAE,CAAC;IAChC,CAAC;IAQD,SAAS,CAAC,MAAc;QAEpB,IAAI,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QAE9B,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAE5B,IAAI,CAAC,IAAI,EAAE,KAAK;YAAE,OAAO,KAAK,CAAC;QAE/B,IAAI,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YAAE,OAAO,IAAI,CAAC;QAChD,IAAI,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAAE,OAAO,IAAI,CAAC;QAErD,OAAO,KAAK,CAAC;IACjB,CAAC;IAQD,UAAU,CAAC,OAAiB;QAExB,IAAI,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC;YAAE,OAAO,IAAI,CAAC;QAEtC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAC5B,IAAI,CAAC,IAAI,EAAE,KAAK;YAAE,OAAO,KAAK,CAAC;QAE/B,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;YAAE,OAAO,IAAI,CAAC;QAExC,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IAC7D,CAAC;IAQD,kBAAkB,CAAC,eAAyB;QAExC,IAAI,eAAe,EAAE,QAAQ,CAAC,QAAQ,CAAC;YAAE,OAAO,IAAI,CAAC;QAErD,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAC5B,IAAI,CAAC,IAAI,EAAE,KAAK;YAAE,OAAO,KAAK,CAAC;QAE/B,IAAI,IAAI,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;YAAE,OAAO,IAAI,CAAC;QAE1C,OAAO,IAAI,EAAE,gBAAgB,EAAE,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,eAAe,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IACnF,CAAC;IAQD,iBAAiB,CAAC,IAAY;QAC1B,IAAI,IAAI,KAAK,QAAQ;YAAE,OAAO,IAAI,CAAC;QAEnC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAE5B,IAAI,CAAC,IAAI;YAAE,OAAO,KAAK,CAAC;QAGxB,IAAI,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YAAE,OAAO,IAAI,CAAC;QAChD,IAAI,IAAI,EAAE,gBAAgB,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAAE,OAAO,IAAI,CAAC;QAE9D,OAAO,KAAK,CAAC;IACjB,CAAC;IAQD,iBAAiB,CAAC,MAAc;QAE5B,IAAI,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QAG9B,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAC5B,IAAI,CAAC,IAAI;YAAE,OAAO,KAAK,CAAC;QAGxB,IAAI,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAAE,OAAO,IAAI,CAAC;QAErD,OAAO,KAAK,CAAC;IACjB,CAAC;IAQD,yBAAyB,CAAC,IAAY;QAElC,IAAI,IAAI,KAAK,QAAQ;YAAE,OAAO,IAAI,CAAC;QAEnC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAC5B,IAAI,CAAC,IAAI;YAAE,OAAO,KAAK,CAAC;QAGxB,IAAI,IAAI,EAAE,gBAAgB,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAAE,OAAO,IAAI,CAAC;QAE9D,OAAO,KAAK,CAAC;IACjB,CAAC;IAQD,eAAe,CAAC,YAAoB;QAChC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAE5B,IAAI,CAAC,IAAI;YAAE,OAAO,KAAK,CAAC;QAGxB,IAAI,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YAAE,OAAO,IAAI,CAAC;QAChD,IAAI,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;YAAE,OAAO,IAAI,CAAC;QAEjE,OAAO,KAAK,CAAC;IACjB,CAAC;IAQD,uBAAuB,CAAC,UAAkB;QACtC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAE5B,IAAI,CAAC,IAAI;YAAE,OAAO,KAAK,CAAC;QAExB,IAAI,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YAAE,OAAO,IAAI,CAAC;QAChD,IAAI,IAAI,EAAE,sBAAsB,EAAE,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;YAAE,OAAO,IAAI,CAAC;QAE1E,OAAO,KAAK,CAAC;IACjB,CAAC;IAQD,uBAAuB,CAAC,YAAoB;QACxC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAE5B,IAAI,CAAC,IAAI;YAAE,OAAO,KAAK,CAAC;QAExB,IAAI,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;YAAE,OAAO,IAAI,CAAC;QAEjE,OAAO,KAAK,CAAC;IACjB,CAAC;IAQD,+BAA+B,CAAC,UAAkB;QAC9C,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAE5B,IAAI,CAAC,IAAI;YAAE,OAAO,KAAK,CAAC;QAExB,IAAI,IAAI,EAAE,sBAAsB,EAAE,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;YAAE,OAAO,IAAI,CAAC;QAE1E,OAAO,KAAK,CAAC;IACjB,CAAC;IAQD,kBAAkB,CAAC,WAAgC,EAAE,SAAkB,KAAK;QACxE,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;YACnC,IAAI,MAAM,EAAE,CAAC;gBACT,IAAI,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,OAAO,CAAC;oBAAE,OAAO,IAAI,CAAC;YAChE,CAAC;iBAAM,CAAC;gBACJ,IAAI,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC;oBAAE,OAAO,IAAI,CAAC;YACxD,CAAC;QACL,CAAC;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;IAQD,wBAAwB,CAAC,WAAsC,EAAE,SAAkB,KAAK;QACpF,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;YACnC,IAAI,MAAM,EAAE,CAAC;gBACT,IAAI,IAAI,CAAC,uBAAuB,CAAC,UAAU,CAAC,aAAa,CAAC;oBAAE,OAAO,IAAI,CAAC;YAC5E,CAAC;iBAAM,CAAC;gBACJ,IAAI,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,aAAa,CAAC;oBAAE,OAAO,IAAI,CAAC;YACpE,CAAC;QACL,CAAC;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ,CAAA;AApQY,sCAAa;wBAAb,aAAa;IADzB,IAAA,mBAAU,GAAE;GACA,aAAa,CAoQzB"}
+{"version":3,"file":"access.service.js","sourceRoot":"","sources":["../../../src/auth/services/access.service.ts"],"names":[],"mappings":"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"}

package/dist/auth/services/auth.service.d.ts

@@ -9,10 +9,10 @@ export declare class AuthService extends CommonService {
     private readonly jwtService;
     private readonly refreshTokenService;
     private readonly userService;
-    protected publicExposed: boolean;
     constructor(jwtService: JwtService, refreshTokenService: RefreshTokenService, userService: UserService);
     getUserLoginInfo(auth: any, req: any, options?: any): Promise<any>;
     getUserInfo(auth: any, options?: any): Promise<any>;
+    issueSessionIdentifier(userId: number): Promise<string>;
     generateAuthJwtToken(auth: any, options?: any): Promise<string>;
     signJwtToken(payload: any, options?: any): Promise<string>;
     verifyJwtToken(token: any): Promise<any>;

package/dist/auth/services/auth.service.js

@@ -12,19 +12,29 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuthService = void 0;
 const common_1 = require("@nestjs/common");
 const jwt_1 = require("@nestjs/jwt");
+const crypto_1 = require("crypto");
 const auth_1 = require("../../common/libraries/auth");
 const session_identifier_entity_1 = require("../entities/session.identifier.entity");
 const user_entity_1 = require("../entities/user.entity");
 const refresh_token_service_1 = require("./refresh.token.service");
 const user_service_1 = require("./user.service");
 const common_service_1 = require("../../common/libraries/common.service");
+const public_exposed_decorator_1 = require("../../common/decorators/public.exposed.decorator");
+const JWT_VERIFY_OPTIONS = (() => {
+    const algorithm = process.env.JWT_ALGORITHM || 'HS256';
+    const options = { algorithms: [algorithm] };
+    if (process.env.JWT_ISSUER)
+        options.issuer = process.env.JWT_ISSUER;
+    if (process.env.JWT_AUDIENCE)
+        options.audience = process.env.JWT_AUDIENCE;
+    return options;
+})();
 let AuthService = class AuthService extends common_service_1.CommonService {
     constructor(jwtService, refreshTokenService, userService) {
         super();
         this.jwtService = jwtService;
         this.refreshTokenService = refreshTokenService;
         this.userService = userService;
-        this.publicExposed = true;
     }
     async getUserLoginInfo(auth, req, options) {
         const user = await this.getUserInfo(auth, options);
@@ -40,9 +50,17 @@ let AuthService = class AuthService extends common_service_1.CommonService {
     }
     async getUserInfo(auth, options) {
         const user = await this.getUserObject(auth.id);
-        user.access_token = await this.generateAuthJwtToken(auth, options);
+        const identifier = await this.issueSessionIdentifier(auth.id);
+        const payload = { ...auth, auth_attributes: { ...(auth?.auth_attributes || {}), session_identifier: identifier } };
+        user.access_token = await this.generateAuthJwtToken(payload, options);
         return { ...user, ...auth };
     }
+    async issueSessionIdentifier(userId) {
+        const identifier = (0, crypto_1.randomUUID)();
+        const record = session_identifier_entity_1.SessionIdentifierEntity.create({ user_id: userId, identifier });
+        await record.save();
+        return identifier;
+    }
     async generateAuthJwtToken(auth, options) {
         return this.signJwtToken(auth, options);
     }
@@ -51,7 +69,7 @@ let AuthService = class AuthService extends common_service_1.CommonService {
     }
     async verifyJwtToken(token) {
         try {
-            return await this.jwtService.verify(token);
+            return await this.jwtService.verify(token, JWT_VERIFY_OPTIONS);
         }
         catch {
             return false;
@@ -78,7 +96,9 @@ let AuthService = class AuthService extends common_service_1.CommonService {
         const identifier = auth?.auth_attributes?.session_identifier;
         if (!identifier)
             return true;
-        const r = await session_identifier_entity_1.SessionIdentifierEntity.firstOrCreate({ user_id: auth.id, identifier });
+        const r = await session_identifier_entity_1.SessionIdentifierEntity.findOne({ where: { user_id: auth.id, identifier } });
+        if (!r)
+            return true;
         if (r.revoked_at)
             return false;
         return true;
@@ -99,6 +119,7 @@ let AuthService = class AuthService extends common_service_1.CommonService {
 };
 exports.AuthService = AuthService;
 exports.AuthService = AuthService = __decorate([
+    (0, public_exposed_decorator_1.PublicExposed)(),
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [jwt_1.JwtService,
         refresh_token_service_1.RefreshTokenService,

package/dist/auth/services/auth.service.js.map

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

package/dist/auth/services/device.token.service.d.ts

@@ -1,6 +1,9 @@
 import { DeviceTokenEntity } from '../entities/device.token.entity';
 export declare class DeviceTokenService {
-    setDeviceToken(req: any, body: DeviceTokenEntity): any;
+    private static readonly MAX_SAVE_ATTEMPTS;
+    private static readonly SAVE_BACKOFF_BASE_MS;
+    setDeviceToken(req: any, body: DeviceTokenEntity): Promise<DeviceTokenEntity>;
+    private attemptDeviceTokenSave;
     private getDeviceIdentifier;
     attachUserDevice(headers: any): Promise<DeviceTokenEntity>;
 }

package/dist/auth/services/device.token.service.js

@@ -1,19 +1,81 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 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 __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var DeviceTokenService_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeviceTokenService = void 0;
 const common_1 = require("@nestjs/common");
+const Sentry = __importStar(require("@sentry/node"));
 const class_transformer_1 = require("class-transformer");
 const auth_1 = require("../../common/libraries/auth");
+const operation_exception_1 = require("../../common/exceptions/operation.exception");
 const date_util_1 = require("../../common/libraries/date.util");
+const platform_utility_1 = require("../../common/libraries/platform.utility");
 const device_token_entity_1 = require("../entities/device.token.entity");
-let DeviceTokenService = class DeviceTokenService {
+let DeviceTokenService = DeviceTokenService_1 = class DeviceTokenService {
     async setDeviceToken(req, body) {
+        let lastError;
+        for (let attempt = 0; attempt < DeviceTokenService_1.MAX_SAVE_ATTEMPTS; attempt++) {
+            try {
+                return await this.attemptDeviceTokenSave(req, body);
+            }
+            catch (error) {
+                lastError = error;
+                const isLast = attempt === DeviceTokenService_1.MAX_SAVE_ATTEMPTS - 1;
+                if (isLast)
+                    break;
+                const base = DeviceTokenService_1.SAVE_BACKOFF_BASE_MS * 2 ** attempt;
+                const jitter = Math.floor(Math.random() * base);
+                await platform_utility_1.PlatformUtility.sleep(base + jitter);
+            }
+        }
+        const message = lastError instanceof Error ? lastError.message : String(lastError);
+        global.console.error(`setDeviceToken failed after ${DeviceTokenService_1.MAX_SAVE_ATTEMPTS} attempts (token=${body?.token}): ${message}`);
+        Sentry.captureException(lastError, {
+            level: 'error',
+            tags: { service: 'DeviceTokenService' },
+            extra: { token: body?.token, attempts: DeviceTokenService_1.MAX_SAVE_ATTEMPTS },
+        });
+        throw new operation_exception_1.OperationException('unable to register device token');
+    }
+    async attemptDeviceTokenSave(req, body) {
         if (auth_1.Auth.check()) {
             const user = auth_1.Auth.user();
             body.user_id = !user ? null : user.id;
@@ -27,12 +89,7 @@ let DeviceTokenService = class DeviceTokenService {
         });
         record = (0, class_transformer_1.plainToClassFromExist)(record, body);
         record.identifier = this.getDeviceIdentifier(req);
-        try {
-            return await record.save();
-        }
-        catch {
-            return this.setDeviceToken(req, body);
-        }
+        return record.save();
     }
     getDeviceIdentifier(req) {
         return req.headers['user-agent'];
@@ -56,7 +113,9 @@ let DeviceTokenService = class DeviceTokenService {
     }
 };
 exports.DeviceTokenService = DeviceTokenService;
-exports.DeviceTokenService = DeviceTokenService = __decorate([
+DeviceTokenService.MAX_SAVE_ATTEMPTS = 3;
+DeviceTokenService.SAVE_BACKOFF_BASE_MS = 50;
+exports.DeviceTokenService = DeviceTokenService = DeviceTokenService_1 = __decorate([
     (0, common_1.Injectable)()
 ], DeviceTokenService);
 //# sourceMappingURL=device.token.service.js.map

package/dist/auth/services/device.token.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"device.token.service.js","sourceRoot":"","sources":["../../../src/auth/services/device.token.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA4C;AAC5C,yDAA0D;AAC1D,sDAAmD;AACnD,gEAA4D;AAC5D,yEAAoE;AAS7D,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAO3B,KAAK,CAAC,cAAc,CAAC,GAAQ,EAAE,IAAuB;QAClD,IAAI,WAAI,CAAC,KAAK,EAAE,EAAE,CAAC;YACf,MAAM,IAAI,GAAG,WAAI,CAAC,IAAI,EAAE,CAAC;YACzB,IAAI,CAAC,OAAO,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;QAC1C,CAAC;;YAAM,OAAO,IAAI,CAAC,OAAO,CAAC;QAE3B,IAAI,CAAC,oBAAoB,GAAG,oBAAQ,CAAC,WAAW,EAAE,CAAC;QACnD,IAAI,CAAC,SAAS,GAAG,GAAG,CAAC,EAAE,CAAC;QAExB,IAAI,MAAM,GAAG,MAAM,uCAAiB,CAAC,UAAU,CAAC;YAC5C,KAAK,EAAE,IAAI,CAAC,KAAK;SACpB,CAAC,CAAC;QAEH,MAAM,GAAG,IAAA,yCAAqB,EAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAE7C,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;QAElD,IAAI,CAAC;YACD,OAAO,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;QAC/B,CAAC;QAAC,MAAM,CAAC;YACL,OAAO,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAC1C,CAAC;IACL,CAAC;IAQO,mBAAmB,CAAC,GAAQ;QAChC,OAAO,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IACrC,CAAC;IAOD,KAAK,CAAC,gBAAgB,CAAC,OAAY;QAC/B,MAAM,IAAI,GAAG,WAAI,CAAC,IAAI,EAAE,CAAC;QAEzB,MAAM,gBAAgB,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;QACxD,IAAI,CAAC,gBAAgB;YAAE,OAAO;QAE9B,MAAM,aAAa,GAAQ,OAAO,CAAC,kBAAkB,CAAC,CAAC;QAGvD,MAAM,MAAM,GAAG,MAAM,uCAAiB,CAAC,OAAO,CAAC;YAC3C,KAAK,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE;SACpC,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM;YAAE,OAAO;QAEpB,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,EAAE,CAAC;QACzB,MAAM,CAAC,OAAO,GAAG,aAAa,IAAI,IAAI,CAAC;QACvC,MAAM,CAAC,oBAAoB,GAAG,oBAAQ,CAAC,WAAW,EAAE,CAAC;QAErD,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;QAEpB,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ,CAAA;AArEY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;GACA,kBAAkB,CAqE9B"}
+{"version":3,"file":"device.token.service.js","sourceRoot":"","sources":["../../../src/auth/services/device.token.service.ts"],"names":[],"mappings":"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"}

package/dist/auth/services/index.d.ts

@@ -2,5 +2,6 @@ export * from './access.service';
 export * from './auth.service';
 export * from './device.token.service';
 export * from './refresh.token.service';
+export * from './social.identity.service';
 export * from './social.service';
 export * from './user.service';

package/dist/auth/services/index.js

@@ -18,6 +18,7 @@ __exportStar(require("./access.service"), exports);
 __exportStar(require("./auth.service"), exports);
 __exportStar(require("./device.token.service"), exports);
 __exportStar(require("./refresh.token.service"), exports);
+__exportStar(require("./social.identity.service"), exports);
 __exportStar(require("./social.service"), exports);
 __exportStar(require("./user.service"), exports);
 //# sourceMappingURL=index.js.map

package/dist/auth/services/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/auth/services/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mDAAiC;AAAA,iDAA+B;AAAA,yDAAuC;AAAA,0DAAwC;AAAA,mDAAiC;AAAA,iDAA8B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/auth/services/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mDAAiC;AAAA,iDAA+B;AAAA,yDAAuC;AAAA,0DAAwC;AAAA,4DAA0C;AAAA,mDAAiC;AAAA,iDAA8B"}

package/dist/auth/services/refresh.token.service.d.ts

@@ -4,6 +4,21 @@ import { RefreshTokenEntity } from '../entities/refresh.token.entity';
 export declare class RefreshTokenService {
     private readonly jwtService;
     constructor(jwtService: JwtService);
-    setRefreshToken(user: UserAccessDto, deviceIdentifier?: string, options?: any): Promise<RefreshTokenEntity>;
+    issue(user: UserAccessDto, deviceIdentifier?: string, options?: any): Promise<{
+        entity: RefreshTokenEntity;
+        rawToken: string;
+    }>;
+    rotate(prior: RefreshTokenEntity, options?: any): Promise<{
+        entity: RefreshTokenEntity;
+        rawToken: string;
+    }>;
+    findByRawToken(rawToken: string): Promise<RefreshTokenEntity | null>;
+    revokeFamily(presented: RefreshTokenEntity): Promise<number>;
+    private recordReuseDetection;
+    setRefreshToken(user: UserAccessDto, deviceIdentifier?: string, options?: any): Promise<RefreshTokenEntity & {
+        token: string;
+    }>;
+    private persist;
+    private hash;
     private generateRefreshToken;
 }