permissions-contractx 1.0.1 → 1.0.2

package/dist/services/user-context.service.d.ts

@@ -3,13 +3,24 @@ import { JwtPayload } from '../interfaces';
  * Request-scoped service to manage current user context
  * Provides convenient methods to access user information and check permissions
  */
+interface RequestWithUser {
+    user?: any;
+    tenant?: any;
+}
 export declare class UserContextService {
+    private readonly request;
     private user;
+    private autoInitialized;
+    constructor(request: RequestWithUser);
     /**
      * Set the current user context
      * This is typically called by the authentication guard
      */
     setUser(user: JwtPayload): void;
+    /**
+     * Auto-initialize user from request if not manually set
+     */
+    private tryAutoInitialize;
     /**
      * Get the current authenticated user
      */
@@ -30,6 +41,11 @@ export declare class UserContextService {
      * Get the current user's client ID
      */
     getClientId(): string | null;
+    /**
+     * Get the tenant key (key_client) for multi-tenant operations
+     * Tries multiple sources: user.key_client, user.clientId, tenant.key_client
+     */
+    getTenantKey(): string | null;
     /**
      * Get the current user's session ID
      */
@@ -111,4 +127,5 @@ export declare class UserContextService {
         clientId: string | null;
     };
 }
+export {};
 //# sourceMappingURL=user-context.service.d.ts.map

package/dist/services/user-context.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user-context.service.d.ts","sourceRoot":"","sources":["../../src/services/user-context.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAG3C;;;GAGG;AACH,qBACa,kBAAkB;IAC7B,OAAO,CAAC,IAAI,CAA2B;IAEvC;;;OAGG;IACH,OAAO,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI;IAI/B;;OAEG;IACH,OAAO,IAAI,UAAU,GAAG,IAAI;IAI5B;;OAEG;IACH,SAAS,IAAI,MAAM,GAAG,IAAI;IAK1B;;OAEG;IACH,eAAe,IAAI,MAAM,GAAG,IAAI;IAKhC;;OAEG;IACH,YAAY,IAAI,MAAM,GAAG,IAAI;IAK7B;;OAEG;IACH,WAAW,IAAI,MAAM,GAAG,IAAI;IAK5B;;OAEG;IACH,YAAY,IAAI,MAAM,GAAG,IAAI;IAK7B;;OAEG;IACH,YAAY,IAAI,MAAM,EAAE;IAIxB;;OAEG;IACH,kBAAkB,IAAI,MAAM,EAAE;IAI9B;;OAEG;IACH,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAI9B;;OAEG;IACH,UAAU,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,OAAO;IAKxD;;OAEG;IACH,WAAW,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,OAAO;IAKzD;;OAEG;IACH,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAI1C;;OAEG;IACH,gBAAgB,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,OAAO;IAKhD;;OAEG;IACH,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,OAAO;IAKjD;;OAEG;IACH,eAAe,IAAI,OAAO;IAI1B;;OAEG;IACH,YAAY,IAAI,OAAO;IAIvB;;OAEG;IACH,OAAO,IAAI,OAAO;IAIlB;;OAEG;IACH,YAAY,IAAI,OAAO;IAIvB;;OAEG;IACH,cAAc,IAAI,OAAO;IAIzB;;OAEG;IACH,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAOxC;;OAEG;IACH,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE;IAM9C;;OAEG;IACH,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAIzD;;OAEG;IACH,cAAc,IAAI;QAChB,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;QAClB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;QACpB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;QACrB,KAAK,EAAE,MAAM,EAAE,CAAC;QAChB,eAAe,EAAE,MAAM,CAAC;QACxB,OAAO,EAAE,OAAO,CAAC;QACjB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;KACzB;CAWF"}
+{"version":3,"file":"user-context.service.d.ts","sourceRoot":"","sources":["../../src/services/user-context.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAG3C;;;GAGG;AACH,UAAU,eAAe;IACvB,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,MAAM,CAAC,EAAE,GAAG,CAAC;CACd;AAED,qBACa,kBAAkB;IAKV,OAAO,CAAC,QAAQ,CAAC,OAAO;IAJ3C,OAAO,CAAC,IAAI,CAA2B;IACvC,OAAO,CAAC,eAAe,CAAS;gBAGI,OAAO,EAAE,eAAe;IAG5D;;;OAGG;IACH,OAAO,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI;IAI/B;;OAEG;IACH,OAAO,CAAC,iBAAiB;IA4EzB;;OAEG;IACH,OAAO,IAAI,UAAU,GAAG,IAAI;IAK5B;;OAEG;IACH,SAAS,IAAI,MAAM,GAAG,IAAI;IAM1B;;OAEG;IACH,eAAe,IAAI,MAAM,GAAG,IAAI;IAMhC;;OAEG;IACH,YAAY,IAAI,MAAM,GAAG,IAAI;IAM7B;;OAEG;IACH,WAAW,IAAI,MAAM,GAAG,IAAI;IAM5B;;;OAGG;IACH,YAAY,IAAI,MAAM,GAAG,IAAI;IAsC7B;;OAEG;IACH,YAAY,IAAI,MAAM,GAAG,IAAI;IAM7B;;OAEG;IACH,YAAY,IAAI,MAAM,EAAE;IAKxB;;OAEG;IACH,kBAAkB,IAAI,MAAM,EAAE;IAK9B;;OAEG;IACH,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAI9B;;OAEG;IACH,UAAU,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,OAAO;IAKxD;;OAEG;IACH,WAAW,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,OAAO;IAKzD;;OAEG;IACH,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAI1C;;OAEG;IACH,gBAAgB,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,OAAO;IAKhD;;OAEG;IACH,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,OAAO;IAKjD;;OAEG;IACH,eAAe,IAAI,OAAO;IAK1B;;OAEG;IACH,YAAY,IAAI,OAAO;IAIvB;;OAEG;IACH,OAAO,IAAI,OAAO;IAIlB;;OAEG;IACH,YAAY,IAAI,OAAO;IAIvB;;OAEG;IACH,cAAc,IAAI,OAAO;IAIzB;;OAEG;IACH,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAOxC;;OAEG;IACH,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE;IAM9C;;OAEG;IACH,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAIzD;;OAEG;IACH,cAAc,IAAI;QAChB,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;QAClB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;QACpB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;QACrB,KAAK,EAAE,MAAM,EAAE,CAAC;QAChB,eAAe,EAAE,MAAM,CAAC;QACxB,OAAO,EAAE,OAAO,CAAC;QACjB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;KACzB;CAWF"}

package/dist/services/user-context.service.js

@@ -5,17 +5,22 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserContextService = void 0;
 const common_1 = require("@nestjs/common");
+const core_1 = require("@nestjs/core");
 const contractx_roles_constants_1 = require("../constants/contractx-roles.constants");
-/**
- * Request-scoped service to manage current user context
- * Provides convenient methods to access user information and check permissions
- */
 let UserContextService = class UserContextService {
-    constructor() {
+    constructor(request) {
+        this.request = request;
         this.user = null;
+        this.autoInitialized = false;
     }
     /**
      * Set the current user context
@@ -24,16 +29,89 @@ let UserContextService = class UserContextService {
     setUser(user) {
         this.user = user;
     }
+    /**
+     * Auto-initialize user from request if not manually set
+     */
+    tryAutoInitialize() {
+        if (this.autoInitialized || this.user !== null) {
+            return;
+        }
+        this.autoInitialized = true;
+        // Try to get user from request.user (populated by JWT middleware)
+        if (this.request?.user) {
+            try {
+                // Handle different user object formats
+                const requestUser = this.request.user;
+                // Convert to JwtPayload format
+                const payload = {
+                    sub: requestUser.sub || requestUser.id || requestUser.user_id,
+                    role: requestUser.role || requestUser.roles || [],
+                    permissions: requestUser.permissions || [],
+                    fullName: requestUser.fullName || requestUser.full_name || requestUser.username || '',
+                    email: requestUser.email,
+                    clientId: Array.isArray(requestUser.clientId)
+                        ? requestUser.clientId[0]
+                        : (requestUser.clientId || requestUser.client_id),
+                    sessionId: requestUser.sessionId || requestUser.session_id,
+                    iat: requestUser.iat,
+                    exp: requestUser.exp,
+                    iss: requestUser.iss,
+                    aud: requestUser.aud,
+                };
+                // Copy any additional properties
+                Object.keys(requestUser).forEach(key => {
+                    if (!(key in payload)) {
+                        payload[key] = requestUser[key];
+                    }
+                });
+                this.user = payload;
+                return;
+            }
+            catch (error) {
+                // If parsing fails, continue to try request.tenant
+            }
+        }
+        // Fallback: try to get user from request.tenant (if populated by custom middleware)
+        if (this.request?.tenant) {
+            try {
+                const tenant = this.request.tenant;
+                const payload = {
+                    sub: tenant.user_id || tenant.sub || tenant.id,
+                    role: tenant.roles || [tenant.role].filter(Boolean),
+                    permissions: tenant.permissions || [],
+                    fullName: tenant.fullName || tenant.full_name || tenant.username || '',
+                    email: tenant.email,
+                    clientId: Array.isArray(tenant.clientId)
+                        ? tenant.clientId[0]
+                        : (tenant.clientId || tenant.client_id),
+                    sessionId: tenant.sessionId || tenant.session_id,
+                };
+                // Copy additional properties
+                Object.keys(tenant).forEach(key => {
+                    if (!(key in payload)) {
+                        payload[key] = tenant[key];
+                    }
+                });
+                this.user = payload;
+                return;
+            }
+            catch (error) {
+                // If parsing fails, user remains null
+            }
+        }
+    }
     /**
      * Get the current authenticated user
      */
     getUser() {
+        this.tryAutoInitialize();
         return this.user;
     }
     /**
      * Get the current user's ID
      */
     getUserId() {
+        this.tryAutoInitialize();
         if (this.user?.sub === undefined || this.user?.sub === null)
             return null;
         return String(this.user.sub);
@@ -42,6 +120,7 @@ let UserContextService = class UserContextService {
      * Get the current user's full name
      */
     getUserFullName() {
+        this.tryAutoInitialize();
         if (this.user?.fullName === undefined || this.user?.fullName === null)
             return null;
         return this.user.fullName;
@@ -50,6 +129,7 @@ let UserContextService = class UserContextService {
      * Get the current user's email
      */
     getUserEmail() {
+        this.tryAutoInitialize();
         if (this.user?.email === undefined || this.user?.email === null)
             return null;
         return this.user.email;
@@ -58,14 +138,51 @@ let UserContextService = class UserContextService {
      * Get the current user's client ID
      */
     getClientId() {
+        this.tryAutoInitialize();
         if (this.user?.clientId === undefined || this.user?.clientId === null)
             return null;
-        return this.user.clientId;
+        return Array.isArray(this.user.clientId) ? this.user.clientId[0] : this.user.clientId;
+    }
+    /**
+     * Get the tenant key (key_client) for multi-tenant operations
+     * Tries multiple sources: user.key_client, user.clientId, tenant.key_client
+     */
+    getTenantKey() {
+        this.tryAutoInitialize();
+        // Try to get from user object first
+        if (this.user) {
+            // Check for key_client property
+            const keyClient = this.user.key_client;
+            if (keyClient) {
+                return Array.isArray(keyClient) ? keyClient[0] : keyClient;
+            }
+            // Fallback to clientId
+            if (this.user.clientId) {
+                return Array.isArray(this.user.clientId) ? this.user.clientId[0] : this.user.clientId;
+            }
+        }
+        // Try to get from request.tenant directly
+        if (this.request?.tenant?.key_client) {
+            const tenantKeyClient = this.request.tenant.key_client;
+            return Array.isArray(tenantKeyClient) ? tenantKeyClient[0] : tenantKeyClient;
+        }
+        // Try to get from request.user directly (in case of format differences)
+        if (this.request?.user?.key_client) {
+            const userKeyClient = this.request.user.key_client;
+            return Array.isArray(userKeyClient) ? userKeyClient[0] : userKeyClient;
+        }
+        // Try to get clientId from request.user directly
+        if (this.request?.user?.clientId) {
+            const userClientId = this.request.user.clientId;
+            return Array.isArray(userClientId) ? userClientId[0] : userClientId;
+        }
+        return null;
     }
     /**
      * Get the current user's session ID
      */
     getSessionId() {
+        this.tryAutoInitialize();
         if (this.user?.sessionId === undefined || this.user?.sessionId === null)
             return null;
         return this.user.sessionId;
@@ -74,12 +191,14 @@ let UserContextService = class UserContextService {
      * Get all user roles
      */
     getUserRoles() {
+        this.tryAutoInitialize();
         return this.user?.role || [];
     }
     /**
      * Get all user permissions
      */
     getUserPermissions() {
+        this.tryAutoInitialize();
         return this.user?.permissions || [];
     }
     /**
@@ -126,6 +245,7 @@ let UserContextService = class UserContextService {
      * Check if user is authenticated
      */
     isAuthenticated() {
+        this.tryAutoInitialize();
         return this.user !== null;
     }
     /**
@@ -188,5 +308,7 @@ let UserContextService = class UserContextService {
 };
 exports.UserContextService = UserContextService;
 exports.UserContextService = UserContextService = __decorate([
-    (0, common_1.Injectable)({ scope: common_1.Scope.REQUEST })
+    (0, common_1.Injectable)({ scope: common_1.Scope.REQUEST }),
+    __param(0, (0, common_1.Inject)(core_1.REQUEST)),
+    __metadata("design:paramtypes", [Object])
 ], UserContextService);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "permissions-contractx",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Enterprise-grade authentication and authorization package for NestJS microservices with role-based and permission-based access control",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",