@ackplus/nest-auth 1.1.69-beta.9 → 2.0.0-beta.2

package/dist/lib/core/services/jwt.service.js

@@ -57,12 +57,16 @@ let JwtService = class JwtService {
     }
     async generateAccessToken(payload) {
         return new Promise((resolve, reject) => {
+            const jwtSecret = this.options.session?.jwt?.secret;
+            if (!jwtSecret) {
+                return reject(new Error('Missing session.jwt.secret'));
+            }
             jwt.sign({
                 ...payload,
                 type: 'access',
-                exp: Math.floor(Date.now() / 1000) + (0, ms_1.default)(this.options.session.sessionExpiry),
-                iat: Math.floor(Date.now() / 1000),
-            }, this.options.jwt.secret, (err, token) => {
+            }, jwtSecret, {
+                expiresIn: this.options.session.accessTokenValidity,
+            }, (err, token) => {
                 if (err)
                     reject(err);
                 else
@@ -72,12 +76,16 @@ let JwtService = class JwtService {
     }
     async generateRefreshToken(payload) {
         return new Promise((resolve, reject) => {
+            const jwtSecret = this.options.session?.jwt?.secret;
+            if (!jwtSecret) {
+                return reject(new Error('Missing session.jwt.secret'));
+            }
             jwt.sign({
                 ...payload,
                 type: 'refresh',
-                exp: Math.floor(Date.now() / 1000) + (0, ms_1.default)(this.options.session.refreshTokenExpiry),
-                iat: Math.floor(Date.now() / 1000),
-            }, this.options.jwt.secret, (err, token) => {
+            }, jwtSecret, {
+                expiresIn: this.options.session.refreshTokenValidity,
+            }, (err, token) => {
                 if (err)
                     reject(err);
                 else
@@ -87,7 +95,11 @@ let JwtService = class JwtService {
     }
     async verifyToken(token) {
         return new Promise((resolve, reject) => {
-            jwt.verify(token, this.options.jwt.secret, (err, decoded) => {
+            const jwtSecret = this.options.session?.jwt?.secret;
+            if (!jwtSecret) {
+                return reject(new Error('Missing session.jwt.secret'));
+            }
+            jwt.verify(token, jwtSecret, (err, decoded) => {
                 if (err)
                     reject(err);
                 else
@@ -111,7 +123,11 @@ let JwtService = class JwtService {
             if (!decoded)
                 reject(new Error('Invalid token'));
             else {
-                jwt.sign({ ...decoded, ...payload }, this.options.jwt.secret, { expiresIn: this.options.session.sessionExpiry }, (err, token) => {
+                const jwtSecret = this.options.session?.jwt?.secret;
+                if (!jwtSecret) {
+                    return reject(new Error('Missing session.jwt.secret'));
+                }
+                jwt.sign({ ...decoded, ...payload }, jwtSecret, { expiresIn: this.options.session.accessTokenValidity }, (err, token) => {
                     if (err)
                         reject(err);
                     else
@@ -133,12 +149,16 @@ let JwtService = class JwtService {
     }
     async generatePasswordResetToken(payload) {
         return new Promise((resolve, reject) => {
-            const expiresIn = this.options.passwordResetTokenExpiresIn || '1h';
+            const expiresIn = this.options.password?.passwordResetTokenExpiresIn || '1h';
+            const jwtSecret = this.options.session?.jwt?.secret;
+            if (!jwtSecret) {
+                return reject(new Error('Missing session.jwt.secret'));
+            }
             jwt.sign({
                 ...payload,
                 exp: Math.floor(Date.now() / 1000) + (0, ms_1.default)(expiresIn),
                 iat: Math.floor(Date.now() / 1000),
-            }, this.options.jwt.secret, (err, token) => {
+            }, jwtSecret, (err, token) => {
                 if (err)
                     reject(err);
                 else
@@ -148,7 +168,11 @@ let JwtService = class JwtService {
     }
     async verifyPasswordResetToken(token) {
         return new Promise((resolve, reject) => {
-            jwt.verify(token, this.options.jwt.secret, (err, decoded) => {
+            const jwtSecret = this.options.session?.jwt?.secret;
+            if (!jwtSecret) {
+                return reject(new Error('Missing session.jwt.secret'));
+            }
+            jwt.verify(token, jwtSecret, (err, decoded) => {
                 if (err)
                     reject(err);
                 else

package/dist/lib/core/services/jwt.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"jwt.service.js","sourceRoot":"","sources":["../../../../src/lib/core/services/jwt.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"jwt.service.js","sourceRoot":"","sources":["../../../../src/lib/core/services/jwt.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,kDAAoC;AAGpC,4CAAoB;AACpB,+DAA0D;AAInD,IAAM,UAAU,GAAhB,MAAM,UAAU;IAEX,OAAO,CAAqB;IAEpC;QACI,IAAI,CAAC,OAAO,GAAG,uCAAiB,CAAC,UAAU,EAAE,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,OAAiC;QACvD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC;YACpD,IAAI,CAAC,SAAS,EAAE,CAAC;gBACb,OAAO,MAAM,CAAC,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC,CAAC;YAC3D,CAAC;YACD,GAAG,CAAC,IAAI,CACJ;gBACI,GAAG,OAAO;gBACV,IAAI,EAAE,QAAQ;aACjB,EACD,SAAS,EACT;gBACI,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,mBAAmB;aACtD,EACD,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;gBACX,IAAI,GAAG;oBAAE,MAAM,CAAC,GAAG,CAAC,CAAC;;oBAChB,OAAO,CAAC,KAAK,CAAC,CAAC;YACxB,CAAC,CACJ,CAAC;QACN,CAAC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,OAAiC;QACxD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC;YACpD,IAAI,CAAC,SAAS,EAAE,CAAC;gBACb,OAAO,MAAM,CAAC,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC,CAAC;YAC3D,CAAC;YACD,GAAG,CAAC,IAAI,CACJ;gBACI,GAAG,OAAO;gBACV,IAAI,EAAE,SAAS;aAClB,EACD,SAAS,EACT;gBACI,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,oBAAoB;aACvD,EACD,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;gBACX,IAAI,GAAG;oBAAE,MAAM,CAAC,GAAG,CAAC,CAAC;;oBAChB,OAAO,CAAC,KAAK,CAAC,CAAC;YACxB,CAAC,CACJ,CAAC;QACN,CAAC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,KAAa;QAC3B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC;YACpD,IAAI,CAAC,SAAS,EAAE,CAAC;gBACb,OAAO,MAAM,CAAC,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC,CAAC;YAC3D,CAAC;YACD,GAAG,CAAC,MAAM,CACN,KAAK,EACL,SAAS,EACT,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE;gBACb,IAAI,GAAG;oBAAE,MAAM,CAAC,GAAG,CAAC,CAAC;;oBAChB,OAAO,CAAC,OAA0B,CAAC,CAAC;YAC7C,CAAC,CACJ,CAAC;QACN,CAAC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,OAAiC;QAIlD,MAAM,CAAC,WAAW,EAAE,YAAY,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAClD,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC;YACjC,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC;SACrC,CAAC,CAAC;QAEH,OAAO;YACH,WAAW;YACX,YAAY;SACf,CAAC;IACN,CAAC;IAED,WAAW,CAAC,KAAa,EAAE,OAAiC;QACxD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YACxC,IAAI,CAAC,OAAO;gBAAE,MAAM,CAAC,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC;iBAC5C,CAAC;gBACF,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC;gBACpD,IAAI,CAAC,SAAS,EAAE,CAAC;oBACb,OAAO,MAAM,CAAC,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC,CAAC;gBAC3D,CAAC;gBACD,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,OAAO,EAAE,GAAG,OAAO,EAAE,EAAE,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,mBAAmB,EAAE,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;oBACpH,IAAI,GAAG;wBAAE,MAAM,CAAC,GAAG,CAAC,CAAC;;wBAChB,OAAO,CAAC,KAAK,CAAC,CAAC;gBACxB,CAAC,CAAC,CAAC;YACP,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAED,WAAW,CAAC,KAAa;QACrB,IAAI,CAAC;YACD,OAAO,GAAG,CAAC,MAAM,CAAC,KAAK,CAAoB,CAAC;QAChD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;IAED,SAAS;QACL,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,0BAA0B,CAAC,OAAwF;QACrH,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,2BAA2B,IAAI,IAAI,CAAC;YAC7E,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC;YACpD,IAAI,CAAC,SAAS,EAAE,CAAC;gBACb,OAAO,MAAM,CAAC,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC,CAAC;YAC3D,CAAC;YACD,GAAG,CAAC,IAAI,CACJ;gBACI,GAAG,OAAO;gBACV,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,IAAA,YAAE,EAAC,SAAS,CAAC;gBAClD,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;aACrC,EACD,SAAS,EACT,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;gBACX,IAAI,GAAG;oBAAE,MAAM,CAAC,GAAG,CAAC,CAAC;;oBAChB,OAAO,CAAC,KAAK,CAAC,CAAC;YACxB,CAAC,CACJ,CAAC;QACN,CAAC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,wBAAwB,CAAC,KAAa;QACxC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC;YACpD,IAAI,CAAC,SAAS,EAAE,CAAC;gBACb,OAAO,MAAM,CAAC,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC,CAAC;YAC3D,CAAC;YACD,GAAG,CAAC,MAAM,CACN,KAAK,EACL,SAAS,EACT,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE;gBACb,IAAI,GAAG;oBAAE,MAAM,CAAC,GAAG,CAAC,CAAC;;oBAChB,OAAO,CAAC,OAAO,CAAC,CAAC;YAC1B,CAAC,CACJ,CAAC;QACN,CAAC,CAAC,CAAC;IACP,CAAC;CACJ,CAAA;AAzJY,gCAAU;qBAAV,UAAU;IADtB,IAAA,mBAAU,GAAE;;GACA,UAAU,CAyJtB"}

package/dist/lib/role/entities/role.entity.d.ts

@@ -1,6 +1,5 @@
 import { BaseEntity } from "typeorm";
 import { NestAuthTenant } from "../../tenant/entities/tenant.entity";
-import { NestAuthUser } from "../../user/entities/user.entity";
 import { NestAuthUserAccess } from "../../tenant/entities/user-access.entity";
 import { NestAuthRolePermission } from "./role-permission.entity";
 export declare class NestAuthRole extends BaseEntity {
@@ -14,7 +13,6 @@ export declare class NestAuthRole extends BaseEntity {
     rolePermissions: NestAuthRolePermission[];
     createdAt: Date;
     updatedAt: Date;
-    users: NestAuthUser[];
     userAccesses: NestAuthUserAccess[];
 }
 //# sourceMappingURL=role.entity.d.ts.map

package/dist/lib/role/entities/role.entity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"role.entity.d.ts","sourceRoot":"","sources":["../../../../src/lib/role/entities/role.entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAMH,UAAU,EAOb,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAC9E,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAElE,qBAEa,YAAa,SAAQ,UAAU;IAExC,EAAE,EAAE,MAAM,CAAC;IAGX,IAAI,EAAE,MAAM,CAAC;IAGb,KAAK,EAAE,MAAM,CAAC;IAId,QAAQ,EAAE,MAAM,CAAC;IAGjB,MAAM,EAAE,cAAc,CAAC;IAGvB,QAAQ,EAAE,OAAO,CAAC;IAGlB,QAAQ,EAAE,OAAO,CAAC;IAGlB,eAAe,EAAE,sBAAsB,EAAE,CAAC;IAG1C,SAAS,EAAE,IAAI,CAAC;IAGhB,SAAS,EAAE,IAAI,CAAC;IAiBhB,KAAK,EAAE,YAAY,EAAE,CAAC;IAGtB,YAAY,EAAE,kBAAkB,EAAE,CAAC;CACtC"}
+{"version":3,"file":"role.entity.d.ts","sourceRoot":"","sources":["../../../../src/lib/role/entities/role.entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAMH,UAAU,EAOb,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AAErE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAC9E,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAElE,qBAEa,YAAa,SAAQ,UAAU;IAExC,EAAE,EAAE,MAAM,CAAC;IAGX,IAAI,EAAE,MAAM,CAAC;IAGb,KAAK,EAAE,MAAM,CAAC;IAId,QAAQ,EAAE,MAAM,CAAC;IAGjB,MAAM,EAAE,cAAc,CAAC;IAGvB,QAAQ,EAAE,OAAO,CAAC;IAGlB,QAAQ,EAAE,OAAO,CAAC;IAGlB,eAAe,EAAE,sBAAsB,EAAE,CAAC;IAG1C,SAAS,EAAE,IAAI,CAAC;IAGhB,SAAS,EAAE,IAAI,CAAC;IAGhB,YAAY,EAAE,kBAAkB,EAAE,CAAC;CACtC"}

package/dist/lib/role/entities/role.entity.js

@@ -13,7 +13,6 @@ exports.NestAuthRole = void 0;
 const typeorm_1 = require("typeorm");
 const auth_constants_1 = require("../../auth.constants");
 const tenant_entity_1 = require("../../tenant/entities/tenant.entity");
-const user_entity_1 = require("../../user/entities/user.entity");
 const user_access_entity_1 = require("../../tenant/entities/user-access.entity");
 const role_permission_entity_1 = require("./role-permission.entity");
 let NestAuthRole = class NestAuthRole extends typeorm_1.BaseEntity {
@@ -27,7 +26,6 @@ let NestAuthRole = class NestAuthRole extends typeorm_1.BaseEntity {
     rolePermissions;
     createdAt;
     updatedAt;
-    users;
     userAccesses;
 };
 exports.NestAuthRole = NestAuthRole;
@@ -72,21 +70,6 @@ __decorate([
     (0, typeorm_1.UpdateDateColumn)(),
     __metadata("design:type", Date)
 ], NestAuthRole.prototype, "updatedAt", void 0);
-__decorate([
-    (0, typeorm_1.ManyToMany)(() => user_entity_1.NestAuthUser, user => user.roles, { onDelete: 'CASCADE' }),
-    (0, typeorm_1.JoinTable)({
-        name: 'nest_auth_role_nest_auth_users',
-        joinColumn: {
-            name: 'nestAuthRolesId',
-            referencedColumnName: 'id',
-        },
-        inverseJoinColumn: {
-            name: 'nestAuthUsersId',
-            referencedColumnName: 'id',
-        },
-    }),
-    __metadata("design:type", Array)
-], NestAuthRole.prototype, "users", void 0);
 __decorate([
     (0, typeorm_1.ManyToMany)(() => user_access_entity_1.NestAuthUserAccess, access => access.roles, { onDelete: 'CASCADE' }),
     __metadata("design:type", Array)

package/dist/lib/role/entities/role.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"role.entity.js","sourceRoot":"","sources":["../../../../src/lib/role/entities/role.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAaiB;AACjB,yDAA0D;AAC1D,uEAAqE;AACrE,iEAA+D;AAC/D,iFAA8E;AAC9E,qEAAkE;AAI3D,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,oBAAU;IAExC,EAAE,CAAS;IAGX,IAAI,CAAS;IAGb,KAAK,CAAS;IAId,QAAQ,CAAS;IAGjB,MAAM,CAAiB;IAGvB,QAAQ,CAAU;IAGlB,QAAQ,CAAU;IAGlB,eAAe,CAA2B;IAG1C,SAAS,CAAO;IAGhB,SAAS,CAAO;IAiBhB,KAAK,CAAiB;IAGtB,YAAY,CAAuB;CACtC,CAAA;AAnDY,oCAAY;AAErB;IADC,IAAA,gCAAsB,EAAC,MAAM,CAAC;;wCACpB;AAGX;IADC,IAAA,gBAAM,GAAE;;0CACI;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,mCAAkB,EAAE,CAAC;;2CAC1C;AAId;IAFC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC1B,IAAA,oBAAU,EAAC,CAAC,IAAkB,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC;;8CAC/B;AAGjB;IADC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,8BAAc,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;8BACjD,8BAAc;4CAAC;AAGvB;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;;8CACT;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;8CACR;AAGlB;IADC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,+CAAsB,EAAE,cAAc,CAAC,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC;;qDACrC;AAG1C;IADC,IAAA,0BAAgB,GAAE;8BACR,IAAI;+CAAC;AAGhB;IADC,IAAA,0BAAgB,GAAE;8BACR,IAAI;+CAAC;AAiBhB;IAZC,IAAA,oBAAU,EAAC,GAAG,EAAE,CAAC,0BAAY,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;IAC3E,IAAA,mBAAS,EAAC;QACP,IAAI,EAAE,gCAAgC;QACtC,UAAU,EAAE;YACR,IAAI,EAAE,iBAAiB;YACvB,oBAAoB,EAAE,IAAI;SAC7B;QACD,iBAAiB,EAAE;YACf,IAAI,EAAE,iBAAiB;YACvB,oBAAoB,EAAE,IAAI;SAC7B;KACJ,CAAC;;2CACoB;AAGtB;IADC,IAAA,oBAAU,EAAC,GAAG,EAAE,CAAC,uCAAkB,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;;kDACnD;uBAlD1B,YAAY;IAFxB,IAAA,gBAAM,EAAC,iBAAiB,CAAC;IACzB,IAAA,gBAAM,EAAC,CAAC,MAAM,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;GACzB,YAAY,CAmDxB"}
+{"version":3,"file":"role.entity.js","sourceRoot":"","sources":["../../../../src/lib/role/entities/role.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAaiB;AACjB,yDAA0D;AAC1D,uEAAqE;AAErE,iFAA8E;AAC9E,qEAAkE;AAI3D,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,oBAAU;IAExC,EAAE,CAAS;IAGX,IAAI,CAAS;IAGb,KAAK,CAAS;IAId,QAAQ,CAAS;IAGjB,MAAM,CAAiB;IAGvB,QAAQ,CAAU;IAGlB,QAAQ,CAAU;IAGlB,eAAe,CAA2B;IAG1C,SAAS,CAAO;IAGhB,SAAS,CAAO;IAGhB,YAAY,CAAuB;CACtC,CAAA;AAlCY,oCAAY;AAErB;IADC,IAAA,gCAAsB,EAAC,MAAM,CAAC;;wCACpB;AAGX;IADC,IAAA,gBAAM,GAAE;;0CACI;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,mCAAkB,EAAE,CAAC;;2CAC1C;AAId;IAFC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC1B,IAAA,oBAAU,EAAC,CAAC,IAAkB,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC;;8CAC/B;AAGjB;IADC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,8BAAc,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;8BACjD,8BAAc;4CAAC;AAGvB;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;;8CACT;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;8CACR;AAGlB;IADC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,+CAAsB,EAAE,cAAc,CAAC,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC;;qDACrC;AAG1C;IADC,IAAA,0BAAgB,GAAE;8BACR,IAAI;+CAAC;AAGhB;IADC,IAAA,0BAAgB,GAAE;8BACR,IAAI;+CAAC;AAGhB;IADC,IAAA,oBAAU,EAAC,GAAG,EAAE,CAAC,uCAAkB,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;;kDACnD;uBAjC1B,YAAY;IAFxB,IAAA,gBAAM,EAAC,iBAAiB,CAAC;IACzB,IAAA,gBAAM,EAAC,CAAC,MAAM,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;GACzB,YAAY,CAkCxB"}

package/dist/lib/session/services/session-manager.service.d.ts

@@ -17,7 +17,8 @@ export declare class SessionManagerService {
         deviceName?: string;
         ipAddress?: string;
     }): Promise<NestAuthSession>;
-    getSession(sessionId: string, refreshSession?: boolean): Promise<NestAuthSession>;
+    private shouldTouchSession;
+    getSession(sessionId: string): Promise<NestAuthSession>;
     getUserSessions(userId: string): Promise<NestAuthSession[]>;
     getActiveSessions(userId: string): Promise<NestAuthSession[]>;
     updateSession(sessionId: string, updates: Partial<NestAuthSession>): Promise<NestAuthSession>;
@@ -26,8 +27,7 @@ export declare class SessionManagerService {
     revokeAllUserSessions(userId: string): Promise<void>;
     revokeOtherSessions(userId: string, currentSessionId: string): Promise<void>;
     cleanupExpiredSessions(): Promise<number>;
-    extendSession(sessionId: string, duration?: string | number): Promise<NestAuthSession>;
-    touchSession(sessionId: string, duration?: string | number): Promise<NestAuthSession>;
+    touchSession(sessionId: string): Promise<NestAuthSession>;
     rotateSession(sessionId: string): Promise<NestAuthSession>;
     validateSession(sessionId: string): Promise<NestAuthSession | null>;
     hasReachedMaxSessions(userId: string): Promise<boolean>;

package/dist/lib/session/services/session-manager.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-manager.service.d.ts","sourceRoot":"","sources":["../../../../src/lib/session/services/session-manager.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAK7D,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAK/D,eAAO,MAAM,aAAa,kBAAkB,CAAC;AAC7C,eAAO,MAAM,kBAAkB,uBAAuB,CAAC;AAMvD,qBACa,qBAAqB;IAG1B,OAAO,CAAC,QAAQ,CAAC,KAAK;gBAAL,KAAK,EAAE,YAAY;IAGxC,OAAO,KAAK,OAAO,GAElB;IAED,OAAO,KAAK,kBAAkB,GAE7B;IAED,OAAO,KAAK,iBAAiB,GAE5B;IAKK,aAAa,CAAC,OAAO,EAAE;QACzB,MAAM,EAAE,MAAM,CAAC;QACf,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,IAAI,CAAC,EAAE,GAAG,CAAC;QACX,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,SAAS,CAAC,EAAE,MAAM,CAAC;KACtB,GAAG,OAAO,CAAC,eAAe,CAAC;IAkCtB,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,cAAc,UAAO,GAAG,OAAO,CAAC,eAAe,CAAC;IAwB9E,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAO3D,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAO7D,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC;IAO7F,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkB/C,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAO/C,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOpD,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAa5E,sBAAsB,IAAI,OAAO,CAAC,MAAM,CAAC;IAOzC,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IAQtF,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IAWrF,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IA+B1D,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC;IAWnE,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;YAQ/C,kBAAkB;IAsBhC,OAAO,CAAC,mBAAmB;IAyB3B,OAAO,CAAC,SAAS;IASX,qBAAqB,CACvB,IAAI,EAAE,YAAY,EAClB,SAAS,GAAE;QAAE,aAAa,CAAC,EAAE,OAAO,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAO,GACtE,OAAO,CAAC,eAAe,CAAC;IAuCrB,cAAc,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;IAqBlE,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;CAGvE"}
+{"version":3,"file":"session-manager.service.d.ts","sourceRoot":"","sources":["../../../../src/lib/session/services/session-manager.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAK7D,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAK/D,eAAO,MAAM,aAAa,kBAAkB,CAAC;AAC7C,eAAO,MAAM,kBAAkB,uBAAuB,CAAC;AAMvD,qBACa,qBAAqB;IAG1B,OAAO,CAAC,QAAQ,CAAC,KAAK;gBAAL,KAAK,EAAE,YAAY;IAGxC,OAAO,KAAK,OAAO,GAElB;IAED,OAAO,KAAK,kBAAkB,GAE7B;IAED,OAAO,KAAK,iBAAiB,GAE5B;IAKK,aAAa,CAAC,OAAO,EAAE;QACzB,MAAM,EAAE,MAAM,CAAC;QACf,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,IAAI,CAAC,EAAE,GAAG,CAAC;QACX,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,SAAS,CAAC,EAAE,MAAM,CAAC;KACtB,GAAG,OAAO,CAAC,eAAe,CAAC;IA+B5B,OAAO,CAAC,kBAAkB;IAapB,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IAyBvD,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAO3D,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAO7D,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC;IAO7F,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkB/C,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAO/C,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOpD,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAa5E,sBAAsB,IAAI,OAAO,CAAC,MAAM,CAAC;IAQzC,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IAWzD,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IA+B1D,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC;IAWnE,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;YAQ/C,kBAAkB;IAsBhC,OAAO,CAAC,mBAAmB;IAW3B,OAAO,CAAC,SAAS;IASX,qBAAqB,CACvB,IAAI,EAAE,YAAY,EAClB,SAAS,GAAE;QAAE,aAAa,CAAC,EAAE,OAAO,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAO,GACtE,OAAO,CAAC,eAAe,CAAC;IAuCrB,cAAc,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;IAqBlE,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;CAGvE"}

package/dist/lib/session/services/session-manager.service.js

@@ -36,7 +36,7 @@ let SessionManagerService = class SessionManagerService {
         return this.options.session?.maxSessionsPerUser || 10;
     }
     get slidingExpiration() {
-        return this.options.session?.slidingExpiration ?? true;
+        return this.options.session?.slidingExpiration ?? false;
     }
     async createSession(payload) {
         const { userId, refreshToken, data, userAgent, deviceName, ipAddress } = payload;
@@ -59,17 +59,22 @@ let SessionManagerService = class SessionManagerService {
         }
         return session;
     }
-    async getSession(sessionId, refreshSession = true) {
+    shouldTouchSession(session) {
+        const now = Date.now();
+        const lastActive = session.lastActive ? new Date(session.lastActive).getTime() : 0;
+        const expiresAt = session.expiresAt ? new Date(session.expiresAt).getTime() : 0;
+        const touchedRecently = now - lastActive < 5 * 60 * 1000;
+        return !touchedRecently;
+    }
+    async getSession(sessionId) {
+        console.log('getSession called', sessionId);
         const session = await this.store.findById(sessionId);
         if (!session) {
             throw new common_1.UnauthorizedException('Session not found');
         }
-        if (this.isExpired(session)) {
-            await this.store.delete(sessionId);
-            throw new common_1.UnauthorizedException('Session expired');
-        }
-        if (refreshSession && this.slidingExpiration) {
-            await this.touchSession(sessionId);
+        if (this.slidingExpiration && this.shouldTouchSession(session)) {
+            const updatedSession = await this.touchSession(sessionId);
+            return updatedSession;
         }
         return session;
     }
@@ -109,12 +114,8 @@ let SessionManagerService = class SessionManagerService {
     async cleanupExpiredSessions() {
         return await this.store.deleteExpired();
     }
-    async extendSession(sessionId, duration) {
-        const expiresAt = this.calculateExpiration(duration);
-        return await this.store.update(sessionId, { expiresAt });
-    }
-    async touchSession(sessionId, duration) {
-        const expiresAt = this.calculateExpiration(duration);
+    async touchSession(sessionId) {
+        const expiresAt = this.calculateExpiration();
         return await this.store.update(sessionId, {
             lastActive: new Date(),
             expiresAt,
@@ -145,7 +146,7 @@ let SessionManagerService = class SessionManagerService {
     }
     async validateSession(sessionId) {
         try {
-            return await this.getSession(sessionId, true);
+            return await this.getSession(sessionId);
         }
         catch {
             return null;
@@ -169,24 +170,9 @@ let SessionManagerService = class SessionManagerService {
             }
         }
     }
-    calculateExpiration(duration) {
-        const expiryDuration = duration || this.options.session?.sessionExpiry || '7d';
-        let milliseconds;
-        if (typeof expiryDuration === 'string') {
-            const parsed = (0, ms_1.default)(expiryDuration);
-            if (parsed === undefined || !Number.isFinite(parsed) || parsed <= 0) {
-                milliseconds = (0, ms_1.default)('7d') || 7 * 24 * 60 * 60 * 1000;
-            }
-            else {
-                milliseconds = parsed;
-            }
-        }
-        else {
-            milliseconds = expiryDuration * 1000;
-            if (!Number.isFinite(milliseconds) || milliseconds <= 0) {
-                throw new Error(`Invalid session expiry duration: ${expiryDuration} seconds`);
-            }
-        }
+    calculateExpiration() {
+        const expiryDuration = this.options.session?.refreshTokenValidity;
+        const milliseconds = (0, ms_1.default)(expiryDuration);
         return new Date(Date.now() + milliseconds);
     }
     isExpired(session) {

package/dist/lib/session/services/session-manager.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"session-manager.service.js","sourceRoot":"","sources":["../../../../src/lib/session/services/session-manager.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,2CAA2E;AAK3E,iFAA4E;AAC5E,2EAAuE;AAEvE,+BAAoC;AACpC,4CAAoB;AACpB,wEAA6E;AAEhE,QAAA,aAAa,GAAG,eAAe,CAAC;AAChC,QAAA,kBAAkB,GAAG,oBAAoB,CAAC;AAOhD,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAGT;IAFrB,YAEqB,KAAmB;QAAnB,UAAK,GAAL,KAAK,CAAc;IACpC,CAAC;IAEL,IAAY,OAAO;QACf,OAAO,uCAAiB,CAAC,UAAU,EAAE,CAAC;IAC1C,CAAC;IAED,IAAY,kBAAkB;QAC1B,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,kBAAkB,IAAI,EAAE,CAAC;IAC1D,CAAC;IAED,IAAY,iBAAiB;QACzB,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,iBAAiB,IAAI,IAAI,CAAC;IAC3D,CAAC;IAKD,KAAK,CAAC,aAAa,CAAC,OAOnB;QACG,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;QAGjF,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAEtC,MAAM,cAAc,GAAmB;YACnC,EAAE,EAAE,IAAA,SAAM,GAAE;YACZ,MAAM;YACN,YAAY,EAAE,YAAY,IAAI,EAAE;YAChC,IAAI,EAAE,IAAI,IAAI,EAAE;YAChB,SAAS,EAAE,IAAI,CAAC,mBAAmB,EAAE;YACrC,SAAS,EAAE,SAAS,IAAI,gCAAc,CAAC,cAAc,EAAE,EAAE,OAAO,CAAC,YAAY,CAAC,IAAI,SAAS;YAC3F,UAAU,EAAE,UAAU,IAAI,gCAAc,CAAC,aAAa,EAAE,CAAC,UAAU;YACnE,SAAS,EAAE,SAAS,IAAI,gCAAc,CAAC,aAAa,EAAE,CAAC,SAAS;YAChE,UAAU,EAAE,IAAI,IAAI,EAAE;SACzB,CAAC;QAEF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QAGxD,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,EAAE,CAAC;YAGlC,MAAM,IAAI,GAAG,IAAI,EAAE,IAAI,CAAC;YACxB,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACxD,CAAC;QAED,OAAO,OAAO,CAAC;IACnB,CAAC;IAKD,KAAK,CAAC,UAAU,CAAC,SAAiB,EAAE,cAAc,GAAG,IAAI;QACrD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAErD,IAAI,CAAC,OAAO,EAAE,CAAC;YACX,MAAM,IAAI,8BAAqB,CAAC,mBAAmB,CAAC,CAAC;QACzD,CAAC;QAGD,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;YAC1B,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACnC,MAAM,IAAI,8BAAqB,CAAC,iBAAiB,CAAC,CAAC;QACvD,CAAC;QAGD,IAAI,cAAc,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC3C,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QACvC,CAAC;QAED,OAAO,OAAO,CAAC;IACnB,CAAC;IAKD,KAAK,CAAC,eAAe,CAAC,MAAc;QAChC,OAAO,MAAM,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IACjD,CAAC;IAKD,KAAK,CAAC,iBAAiB,CAAC,MAAc;QAClC,OAAO,MAAM,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;IACvD,CAAC;IAKD,KAAK,CAAC,aAAa,CAAC,SAAiB,EAAE,OAAiC;QACpE,OAAO,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACvD,CAAC;IAKD,KAAK,CAAC,aAAa,CAAC,SAAiB;QAEjC,IAAI,OAAO,GAA2B,IAAI,CAAC;QAC3C,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,EAAE,CAAC;YAClC,OAAO,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACnD,CAAC;QAED,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAGnC,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,IAAI,OAAO,EAAE,CAAC;YAC7C,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC3D,CAAC;IACL,CAAC;IAKD,KAAK,CAAC,aAAa,CAAC,SAAiB;QACjC,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IACxC,CAAC;IAKD,KAAK,CAAC,qBAAqB,CAAC,MAAc;QACtC,MAAM,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC;IAKD,KAAK,CAAC,mBAAmB,CAAC,MAAc,EAAE,gBAAwB;QAC9D,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QAEvD,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC7B,IAAI,OAAO,CAAC,EAAE,KAAK,gBAAgB,EAAE,CAAC;gBAClC,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YACxC,CAAC;QACL,CAAC;IACL,CAAC;IAKD,KAAK,CAAC,sBAAsB;QACxB,OAAO,MAAM,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC;IAC5C,CAAC;IAKD,KAAK,CAAC,aAAa,CAAC,SAAiB,EAAE,QAA0B;QAC7D,MAAM,SAAS,GAAG,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QACrD,OAAO,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,SAAS,EAAS,CAAC,CAAC;IACpE,CAAC;IAKD,KAAK,CAAC,YAAY,CAAC,SAAiB,EAAE,QAA0B;QAC5D,MAAM,SAAS,GAAG,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QACrD,OAAO,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE;YACtC,UAAU,EAAE,IAAI,IAAI,EAAE;YACtB,SAAS;SACL,CAAC,CAAC;IACd,CAAC;IAKD,KAAK,CAAC,aAAa,CAAC,SAAiB;QACjC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACrD,IAAI,CAAC,OAAO,EAAE,CAAC;YACX,MAAM,IAAI,8BAAqB,CAAC,mBAAmB,CAAC,CAAC;QACzD,CAAC;QAED,MAAM,iBAAiB,GAAmB;YACtC,EAAE,EAAE,IAAA,SAAM,GAAE;YACZ,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,YAAY,EAAE,OAAO,CAAC,YAAY;YAClC,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,SAAS,EAAE,IAAI,CAAC,mBAAmB,EAAE;YACrC,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,UAAU,EAAE,IAAI,IAAI,EAAE;SACzB,CAAC;QAEF,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;QAC9D,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAEnC,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,EAAE,CAAC;YAClC,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,OAAc,EAAE,UAAU,CAAC,CAAC;QACrE,CAAC;QAED,OAAO,UAAU,CAAC;IACtB,CAAC;IAKD,KAAK,CAAC,eAAe,CAAC,SAAiB;QACnC,IAAI,CAAC;YACD,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAClD,CAAC;QAAC,MAAM,CAAC;YACL,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;IAKD,KAAK,CAAC,qBAAqB,CAAC,MAAc;QACtC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;QAC3D,OAAO,KAAK,IAAI,IAAI,CAAC,kBAAkB,CAAC;IAC5C,CAAC;IAKO,KAAK,CAAC,kBAAkB,CAAC,MAAc;QAC3C,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAEnE,IAAI,cAAc,CAAC,MAAM,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAEnD,MAAM,MAAM,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBACxC,MAAM,KAAK,GAAG,CAAC,CAAC,UAAU,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;gBAC3C,MAAM,KAAK,GAAG,CAAC,CAAC,UAAU,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;gBAC3C,OAAO,KAAK,GAAG,KAAK,CAAC;YACzB,CAAC,CAAC,CAAC;YAGH,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,cAAc,CAAC,MAAM,GAAG,IAAI,CAAC,kBAAkB,GAAG,CAAC,CAAC,CAAC;YACtF,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;gBAC7B,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YACxC,CAAC;QACL,CAAC;IACL,CAAC;IAKO,mBAAmB,CAAC,QAA0B;QAClD,MAAM,cAAc,GAAG,QAAQ,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,aAAa,IAAI,IAAI,CAAC;QAC/E,IAAI,YAAoB,CAAC;QAEzB,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE,CAAC;YACrC,MAAM,MAAM,GAAG,IAAA,YAAE,EAAC,cAAc,CAAC,CAAC;YAClC,IAAI,MAAM,KAAK,SAAS,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,MAAM,IAAI,CAAC,EAAE,CAAC;gBAElE,YAAY,GAAG,IAAA,YAAE,EAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;YACvD,CAAC;iBAAM,CAAC;gBACJ,YAAY,GAAG,MAAM,CAAC;YAC1B,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,YAAY,GAAG,cAAc,GAAG,IAAI,CAAC;YACrC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,YAAY,IAAI,CAAC,EAAE,CAAC;gBACtD,MAAM,IAAI,KAAK,CAAC,oCAAoC,cAAc,UAAU,CAAC,CAAC;YAClF,CAAC;QACL,CAAC;QAED,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,YAAY,CAAC,CAAC;IAC/C,CAAC;IAKO,SAAS,CAAC,OAAwB;QACtC,IAAI,CAAC,OAAO,CAAC,SAAS;YAAE,OAAO,KAAK,CAAC;QACrC,OAAO,IAAI,IAAI,EAAE,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACpD,CAAC;IAMD,KAAK,CAAC,qBAAqB,CACvB,IAAkB,EAClB,YAAmE,EAAE;QAErE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,gCAAc,CAAC,aAAa,EAAE,CAAC;QAC1E,MAAM,EAAE,aAAa,GAAG,KAAK,EAAE,QAAQ,GAAG,IAAI,EAAE,GAAG,SAAS,CAAC;QAE7D,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,MAAM,IAAI,8BAAqB,CAAC,gBAAgB,CAAC,CAAC;QACtD,CAAC;QAED,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC5C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QAGxD,IAAI,WAAW,GAAuB;YAClC,IAAI;YACJ,aAAa;YACb,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,2CAAwB,EAAC,IAAI,CAAC,CAAC;YAC1D,WAAW;YACX,QAAQ;SACX,CAAC;QAGF,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,oBAAoB,EAAE,CAAC;YAC7C,WAAW,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,oBAAoB,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QACrF,CAAC;QAGD,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC;YAC5B,MAAM,EAAE,IAAI,CAAC,EAAE;YACf,IAAI,EAAE,WAAW;YACjB,SAAS,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;YAC5C,SAAS;YACT,UAAU;SACb,CAAC,CAAC;IACP,CAAC;IAMD,KAAK,CAAC,cAAc,CAAC,OAAwB;QACzC,MAAM,OAAO,GAA6B;YACtC,SAAS,EAAE,IAAI,CAAC,mBAAmB,EAAE;YACrC,UAAU,EAAE,IAAI,IAAI,EAAE;SACzB,CAAC;QAGF,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,WAAW,EAAE,CAAC;YAGpC,MAAM,UAAU,GAAG,EAAE,GAAG,OAAO,EAAE,GAAG,OAAO,EAAqB,CAAC;YACjE,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAChE,CAAC;QAED,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;IACzD,CAAC;IAMD,KAAK,CAAC,kBAAkB,CAAC,MAAc;QACnC,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;IAChD,CAAC;CACJ,CAAA;AA9VY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,mBAAU,GAAE;IAGJ,WAAA,IAAA,eAAM,EAAC,qBAAa,CAAC,CAAA;;GAFjB,qBAAqB,CA8VjC"}
+{"version":3,"file":"session-manager.service.js","sourceRoot":"","sources":["../../../../src/lib/session/services/session-manager.service.ts"],"names":[],"mappings":"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"}

package/dist/lib/session/session.module.js

@@ -71,7 +71,7 @@ let SessionModule = SessionModule_1 = class SessionModule {
         return redis;
     }
     static resolveDefaultTtlSeconds(session) {
-        const expiry = session?.sessionExpiry;
+        const expiry = session?.accessTokenValidity;
         if (typeof expiry === 'string') {
             const msValue = (0, ms_1.default)(expiry);
             if (typeof msValue === 'number' && msValue > 0) {

package/dist/lib/session/session.module.js.map

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

package/dist/lib/tenant/entities/user-access.entity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user-access.entity.d.ts","sourceRoot":"","sources":["../../../../src/lib/tenant/entities/user-access.entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAYH,UAAU,EACb,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,qBASa,kBAAmB,SAAQ,UAAU;IAE9C,EAAE,EAAE,MAAM,CAAC;IAKX,MAAM,EAAE,MAAM,CAAC;IAKf,QAAQ,EAAE,MAAM,CAAC;IAGjB,IAAI,EAAE,YAAY,CAAC;IAGnB,MAAM,EAAE,cAAc,CAAC;IASvB,KAAK,EAAE,YAAY,EAAE,CAAC;IAGtB,QAAQ,EAAE,OAAO,CAAC;IAGlB,SAAS,EAAE,OAAO,CAAC;IAGnB,MAAM,EAAE,MAAM,CAAC;IAGf,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAG/B,SAAS,EAAE,IAAI,CAAC;IAGhB,SAAS,EAAE,IAAI,CAAC;CACnB"}
+{"version":3,"file":"user-access.entity.d.ts","sourceRoot":"","sources":["../../../../src/lib/tenant/entities/user-access.entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAWH,UAAU,EACb,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,qBASa,kBAAmB,SAAQ,UAAU;IAE9C,EAAE,EAAE,MAAM,CAAC;IAKX,MAAM,EAAE,MAAM,CAAC;IAKf,QAAQ,EAAE,MAAM,CAAC;IAGjB,IAAI,EAAE,YAAY,CAAC;IAGnB,MAAM,EAAE,cAAc,CAAC;IASvB,KAAK,EAAE,YAAY,EAAE,CAAC;IAGtB,QAAQ,EAAE,OAAO,CAAC;IAGlB,SAAS,EAAE,OAAO,CAAC;IAGnB,MAAM,EAAE,MAAM,CAAC;IAGf,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAG/B,SAAS,EAAE,IAAI,CAAC;IAGhB,SAAS,EAAE,IAAI,CAAC;CACnB"}

package/dist/lib/tenant/entities/user-access.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"user-access.entity.js","sourceRoot":"","sources":["../../../../src/lib/tenant/entities/user-access.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAaiB;AACjB,mDAAiD;AACjD,iEAA+D;AAC/D,iEAA+D;AAWxD,IAAM,kBAAkB,GAAxB,MAAM,kBAAmB,SAAQ,oBAAU;IAE9C,EAAE,CAAS;IAKX,MAAM,CAAS;IAKf,QAAQ,CAAS;IAGjB,IAAI,CAAe;IAGnB,MAAM,CAAiB;IASvB,KAAK,CAAiB;IAGtB,QAAQ,CAAU;IAGlB,SAAS,CAAU;IAGnB,MAAM,CAAS;IAGf,QAAQ,CAAuB;IAG/B,SAAS,CAAO;IAGhB,SAAS,CAAO;CACnB,CAAA;AA9CY,gDAAkB;AAE3B;IADC,IAAA,gCAAsB,EAAC,MAAM,CAAC;;8CACpB;AAKX;IAHC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;IAC3B,IAAA,eAAK,GAAE;IACP,IAAA,oBAAU,EAAC,CAAC,MAA0B,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC;;kDACzC;AAKf;IAHC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC1B,IAAA,eAAK,GAAE;IACP,IAAA,oBAAU,EAAC,CAAC,MAA0B,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC;;oDACzC;AAGjB;IADC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,0BAAY,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;8BACjD,0BAAY;gDAAC;AAGnB;IADC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,8BAAc,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACjE,8BAAc;kDAAC;AASvB;IANC,IAAA,oBAAU,EAAC,GAAG,EAAE,CAAC,0BAAY,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;IAClF,IAAA,mBAAS,EAAC;QACP,IAAI,EAAE,6BAA6B;QACnC,UAAU,EAAE,EAAE,IAAI,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,IAAI,EAAE;QACxE,iBAAiB,EAAE,EAAE,IAAI,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,IAAI,EAAE;KAC7E,CAAC;;iDACoB;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;oDACR;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;;qDACR;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;;kDACf;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;oDAChC;AAG/B;IADC,IAAA,0BAAgB,GAAE;8BACR,IAAI;qDAAC;AAGhB;IADC,IAAA,0BAAgB,GAAE;8BACR,IAAI;qDAAC;6BA7CP,kBAAkB;IAT9B,IAAA,gBAAM,EAAC,yBAAyB,CAAC;IACjC,IAAA,eAAK,EAAC,yBAAyB,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC,EAAE;QACtD,MAAM,EAAE,IAAI;QACZ,KAAK,EAAE,wBAAwB;KAClC,CAAC;IACD,IAAA,eAAK,EAAC,qBAAqB,EAAE,CAAC,QAAQ,CAAC,EAAE;QACtC,MAAM,EAAE,IAAI;QACZ,KAAK,EAAE,oBAAoB;KAC9B,CAAC;GACW,kBAAkB,CA8C9B"}
+{"version":3,"file":"user-access.entity.js","sourceRoot":"","sources":["../../../../src/lib/tenant/entities/user-access.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAYiB;AACjB,mDAAiD;AACjD,iEAA+D;AAC/D,iEAA+D;AAWxD,IAAM,kBAAkB,GAAxB,MAAM,kBAAmB,SAAQ,oBAAU;IAE9C,EAAE,CAAS;IAKX,MAAM,CAAS;IAKf,QAAQ,CAAS;IAGjB,IAAI,CAAe;IAGnB,MAAM,CAAiB;IASvB,KAAK,CAAiB;IAGtB,QAAQ,CAAU;IAGlB,SAAS,CAAU;IAGnB,MAAM,CAAS;IAGf,QAAQ,CAAuB;IAG/B,SAAS,CAAO;IAGhB,SAAS,CAAO;CACnB,CAAA;AA9CY,gDAAkB;AAE3B;IADC,IAAA,gCAAsB,EAAC,MAAM,CAAC;;8CACpB;AAKX;IAHC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;IAC3B,IAAA,eAAK,GAAE;IACP,IAAA,oBAAU,EAAC,CAAC,MAA0B,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC;;kDACzC;AAKf;IAHC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC1B,IAAA,eAAK,GAAE;IACP,IAAA,oBAAU,EAAC,CAAC,MAA0B,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC;;oDACzC;AAGjB;IADC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,0BAAY,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;8BACjD,0BAAY;gDAAC;AAGnB;IADC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,8BAAc,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACjE,8BAAc;kDAAC;AASvB;IANC,IAAA,oBAAU,EAAC,GAAG,EAAE,CAAC,0BAAY,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;IAClF,IAAA,mBAAS,EAAC;QACP,IAAI,EAAE,6BAA6B;QACnC,UAAU,EAAE,EAAE,IAAI,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,IAAI,EAAE;QACxE,iBAAiB,EAAE,EAAE,IAAI,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,IAAI,EAAE;KAC7E,CAAC;;iDACoB;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;oDACR;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;;qDACR;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;;kDACf;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;oDAChC;AAG/B;IADC,IAAA,0BAAgB,GAAE;8BACR,IAAI;qDAAC;AAGhB;IADC,IAAA,0BAAgB,GAAE;8BACR,IAAI;qDAAC;6BA7CP,kBAAkB;IAT9B,IAAA,gBAAM,EAAC,yBAAyB,CAAC;IACjC,IAAA,eAAK,EAAC,yBAAyB,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC,EAAE;QACtD,MAAM,EAAE,IAAI;QACZ,KAAK,EAAE,wBAAwB;KAClC,CAAC;IACD,IAAA,eAAK,EAAC,qBAAqB,EAAE,CAAC,QAAQ,CAAC,EAAE;QACtC,MAAM,EAAE,IAAI;QACZ,KAAK,EAAE,oBAAoB;KAC9B,CAAC;GACW,kBAAkB,CA8C9B"}

package/dist/lib/tenant/services/tenant.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tenant.service.d.ts","sourceRoot":"","sources":["../../../../src/lib/tenant/services/tenant.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAKtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAE9E,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAE5E,qBACa,aAAa;IAIlB,OAAO,CAAC,gBAAgB;IACxB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;gBAH1B,gBAAgB,EAAE,UAAU,CAAC,cAAc,CAAC,EAC5C,YAAY,EAAE,aAAa,EAC3B,WAAW,EAAE,kBAAkB,EACtB,iBAAiB,EAAE,iBAAiB;IAGnD,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC;IAwCpE,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,cAAc,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC;IAmB5F,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,cAAc,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC;IAahG,UAAU,CAAC,OAAO,CAAC,EAAE,eAAe,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAIhF,YAAY,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC;IA6ChF,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBvC,kBAAkB,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,cAAc,CAAC;IAe1E,oBAAoB,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC;IAoBxF,eAAe,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;CAuB/E"}
+{"version":3,"file":"tenant.service.d.ts","sourceRoot":"","sources":["../../../../src/lib/tenant/services/tenant.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAKtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAE9E,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAG5E,qBACa,aAAa;IAIlB,OAAO,CAAC,gBAAgB;IACxB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;gBAH1B,gBAAgB,EAAE,UAAU,CAAC,cAAc,CAAC,EAC5C,YAAY,EAAE,aAAa,EAC3B,WAAW,EAAE,kBAAkB,EACtB,iBAAiB,EAAE,iBAAiB;IAGnD,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC;IAwCpE,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,cAAc,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC;IAmB5F,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,cAAc,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC;IAahG,UAAU,CAAC,OAAO,CAAC,EAAE,eAAe,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAIhF,YAAY,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC;IA6ChF,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBvC,kBAAkB,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,cAAc,CAAC;IAe1E,oBAAoB,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC;IAoBxF,eAAe,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;CA6B/E"}

package/dist/lib/tenant/services/tenant.service.js

@@ -25,6 +25,7 @@ const auth_constants_1 = require("../../auth.constants");
 const debug_logger_service_1 = require("../../core/services/debug-logger.service");
 const slug_util_1 = require("../../utils/slug.util");
 const auth_config_service_1 = require("../../core/services/auth-config.service");
+const nest_auth_contracts_1 = require("@ackplus/nest-auth-contracts");
 let TenantService = class TenantService {
     tenantRepository;
     eventEmitter;
@@ -161,6 +162,7 @@ let TenantService = class TenantService {
     async resolveTenantId(inputTenantId) {
         const config = this.authConfigService.getConfig();
         if (config.tenant?.enabled) {
+            const mode = config.tenant?.mode ?? nest_auth_contracts_1.TenantModeEnum.ISOLATED;
             if (inputTenantId) {
                 const tenant = await this.getTenantById(inputTenantId);
                 if (!tenant) {
@@ -170,12 +172,15 @@ let TenantService = class TenantService {
                     });
                 }
             }
-            else {
+            else if (mode === nest_auth_contracts_1.TenantModeEnum.ISOLATED) {
                 throw new common_1.BadRequestException({
                     message: 'Tenant ID is required',
                     code: auth_constants_1.ERROR_CODES.TENANT_ID_REQUIRED,
                 });
             }
+            else {
+                return inputTenantId;
+            }
         }
         return inputTenantId;
     }

package/dist/lib/tenant/services/tenant.service.js.map

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

package/dist/lib/user/entities/user.entity.d.ts

@@ -21,13 +21,12 @@ export declare class NestAuthUser extends BaseEntity {
     mfaSecrets: NestAuthMFASecret[];
     sessions: NestAuthSession[];
     otps: NestAuthOTP[];
-    roles: NestAuthRole[];
     userAccesses: NestAuthUserAccess[];
     createdAt: Date;
     updatedAt: Date;
     updateTenantFields(): void;
     getPermissions(tenantId: string): Promise<string[]>;
-    getRoles(tenantId?: string | null): Promise<NestAuthRole[]>;
+    getRoles(tenantId?: string | null, withPermissions?: boolean): Promise<NestAuthRole[]>;
     assignRoles(roleIds: string | string[], tenantId?: string | null): Promise<void>;
     private getOrCreateUserAccess;
     findOrCreateIdentity(provider: string, providerId: string): Promise<NestAuthIdentity>;

package/dist/lib/user/entities/user.entity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user.entity.d.ts","sourceRoot":"","sources":["../../../../src/lib/user/entities/user.entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAQH,UAAU,EAMb,MAAM,SAAS,CAAC;AAKjB,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAExE,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAK9E,qBACa,YAAa,SAAQ,UAAU;IAExC,EAAE,EAAE,MAAM,CAAC;IAIX,KAAK,EAAE,MAAM,CAAC;IAId,eAAe,EAAE,IAAI,CAAC;IAItB,KAAK,EAAE,MAAM,CAAC;IAId,eAAe,EAAE,IAAI,CAAC;IAGtB,YAAY,EAAE,MAAM,CAAC;IAGrB,UAAU,EAAE,OAAO,CAAC;IAGpB,QAAQ,EAAE,OAAO,CAAC;IAGlB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAG/B,YAAY,EAAE,OAAO,CAAC;IAGtB,eAAe,CAAC,EAAE,MAAM,CAAC;IAGzB,UAAU,EAAE,gBAAgB,EAAE,CAAC;IAG/B,UAAU,EAAE,iBAAiB,EAAE,CAAC;IAGhC,QAAQ,EAAE,eAAe,EAAE,CAAC;IAG5B,IAAI,EAAE,WAAW,EAAE,CAAC;IAMpB,KAAK,EAAE,YAAY,EAAE,CAAC;IAGtB,YAAY,EAAE,kBAAkB,EAAE,CAAC;IAGnC,SAAS,EAAE,IAAI,CAAC;IAGhB,SAAS,EAAE,IAAI,CAAC;IAIhB,kBAAkB;IAMZ,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IASnD,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAY3D,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;YASxE,qBAAqB;IAa7B,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAiBzD,sBAAsB,CACxB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,OAAO,CAAC,gBAAgB,CAAC,GAChC,OAAO,CAAC,gBAAgB,CAAC;IAwBtB,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAuB5C,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAoB/D,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAiBpD,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAyBrD"}
+{"version":3,"file":"user.entity.d.ts","sourceRoot":"","sources":["../../../../src/lib/user/entities/user.entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAOH,UAAU,EAMb,MAAM,SAAS,CAAC;AAIjB,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAExE,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAK9E,qBACa,YAAa,SAAQ,UAAU;IAExC,EAAE,EAAE,MAAM,CAAC;IAIX,KAAK,EAAE,MAAM,CAAC;IAId,eAAe,EAAE,IAAI,CAAC;IAItB,KAAK,EAAE,MAAM,CAAC;IAId,eAAe,EAAE,IAAI,CAAC;IAGtB,YAAY,EAAE,MAAM,CAAC;IAGrB,UAAU,EAAE,OAAO,CAAC;IAGpB,QAAQ,EAAE,OAAO,CAAC;IAGlB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAG/B,YAAY,EAAE,OAAO,CAAC;IAGtB,eAAe,CAAC,EAAE,MAAM,CAAC;IAGzB,UAAU,EAAE,gBAAgB,EAAE,CAAC;IAG/B,UAAU,EAAE,iBAAiB,EAAE,CAAC;IAGhC,QAAQ,EAAE,eAAe,EAAE,CAAC;IAG5B,IAAI,EAAE,WAAW,EAAE,CAAC;IAGpB,YAAY,EAAE,kBAAkB,EAAE,CAAC;IAGnC,SAAS,EAAE,IAAI,CAAC;IAGhB,SAAS,EAAE,IAAI,CAAC;IAIhB,kBAAkB;IAMZ,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IASnD,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,eAAe,UAAQ,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAYpF,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;YASxE,qBAAqB;IAc7B,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAiBzD,sBAAsB,CACxB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,OAAO,CAAC,gBAAgB,CAAC,GAChC,OAAO,CAAC,gBAAgB,CAAC;IAwBtB,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAuB5C,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAoB/D,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAiBpD,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAWrD"}

package/dist/lib/user/entities/user.entity.js

@@ -40,7 +40,6 @@ let NestAuthUser = class NestAuthUser extends typeorm_1.BaseEntity {
     mfaSecrets;
     sessions;
     otps;
-    roles;
     userAccesses;
     createdAt;
     updatedAt;
@@ -50,17 +49,17 @@ let NestAuthUser = class NestAuthUser extends typeorm_1.BaseEntity {
         }
     }
     async getPermissions(tenantId) {
-        const roles = await this.getRoles(tenantId);
+        const roles = await this.getRoles(tenantId, true);
         return (0, lodash_1.chain)(roles)
             .map((role) => (0, role_mapper_util_1.getRolePermissionNames)(role))
             .flatten()
             .uniq()
             .value();
     }
-    async getRoles(tenantId) {
+    async getRoles(tenantId, withPermissions = false) {
         const access = await user_access_entity_1.NestAuthUserAccess.findOne({
             where: { userId: this.id, tenantId: tenantId || (0, typeorm_1.IsNull)() },
-            relations: ['roles', 'roles.rolePermissions', 'roles.rolePermissions.permission'],
+            relations: ['roles', ...(withPermissions ? ['roles.rolePermissions', 'roles.rolePermissions.permission'] : [])],
         });
         if (access?.roles?.length) {
             return access.roles;
@@ -80,6 +79,7 @@ let NestAuthUser = class NestAuthUser extends typeorm_1.BaseEntity {
             where: { userId: this.id, tenantId: tenantId || (0, typeorm_1.IsNull)() },
             relations: ['roles'],
         });
+        console.log('access', access);
         if (!access) {
             access = user_access_entity_1.NestAuthUserAccess.create({ userId: this.id, tenantId });
             await access.save();
@@ -171,16 +171,6 @@ let NestAuthUser = class NestAuthUser extends typeorm_1.BaseEntity {
     }
     async setPassword(password) {
         const options = auth_config_service_1.AuthConfigService.getOptions();
-        if (options.password?.validate) {
-            const isValid = await options.password.validate(password);
-            if (!isValid) {
-                throw new Error('Password does not meet requirements');
-            }
-        }
-        if (options.password?.hash) {
-            this.passwordHash = await options.password.hash(password);
-            return;
-        }
         this.passwordHash = await (0, argon2_1.hash)(password, {
             algorithm: 2,
             memoryCost: 65536,
@@ -254,10 +244,6 @@ __decorate([
     (0, typeorm_1.OneToMany)(() => otp_entity_1.NestAuthOTP, otp => otp.user),
     __metadata("design:type", Array)
 ], NestAuthUser.prototype, "otps", void 0);
-__decorate([
-    (0, typeorm_1.ManyToMany)(() => role_entity_1.NestAuthRole, role => role.users, { onDelete: 'CASCADE' }),
-    __metadata("design:type", Array)
-], NestAuthUser.prototype, "roles", void 0);
 __decorate([
     (0, typeorm_1.OneToMany)(() => user_access_entity_1.NestAuthUserAccess, access => access.user),
     __metadata("design:type", Array)

package/dist/lib/user/entities/user.entity.js.map

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