@flusys/nestjs-auth 1.1.0-beta → 2.0.0

package/cjs/controllers/user-permission.controller.js

@@ -8,10 +8,11 @@ Object.defineProperty(exports, "UserPermissionController", {
         return UserPermissionController;
     }
 });
+const _nestjsshared = require("@flusys/nestjs-shared");
 const _common = require("@nestjs/common");
 const _swagger = require("@nestjs/swagger");
-const _guards = require("@flusys/nestjs-shared/guards");
 const _userpermissiondto = require("../dtos/user-permission.dto");
+const _usercompanypermissionentity = require("../entities/user-company-permission.entity");
 const _userpermissionservice = require("../services/user-permission.service");
 function _define_property(obj, key, value) {
     if (key in obj) {
@@ -41,123 +42,67 @@ function _ts_param(paramIndex, decorator) {
     };
 }
 let UserPermissionController = class UserPermissionController {
-    // User-Company Permissions
-    /** Batch assign/revoke user-company permissions */ async assignUserCompany(dto) {
-        let addedCount = 0;
-        let removedCount = 0;
-        for (const item of dto.items){
-            if (item.isAdd) {
-                await this.userPermissionService.assignUserToCompany({
-                    userId: dto.userId,
-                    companyId: item.targetId
-                });
-                addedCount++;
-            } else {
-                await this.userPermissionService.revokeCompanyAccess(dto.userId, item.targetId);
-                removedCount++;
-            }
-        }
+    async assignUserCompany(dto) {
+        return this.processBatchPermissions(dto.userId, dto.items, _usercompanypermissionentity.PermissionType.COMPANY);
+    }
+    async getUserCompanies(userId) {
+        const permissions = await this.permissionService.findUserCompanies(userId);
         return {
             success: true,
-            message: `Processed ${addedCount} additions and ${removedCount} removals`
+            message: 'User companies retrieved successfully',
+            data: permissions.map((p)=>({
+                    id: p.id,
+                    userId: p.userId,
+                    companyId: p.company?.id || p.targetId,
+                    companyName: p.company?.name || '',
+                    companySlug: p.company?.slug || ''
+                }))
         };
     }
-    /** Get user's companies */ async getUserCompanies(userId) {
-        const permissions = await this.userPermissionService.findUserCompanies(userId);
-        // Map to DTO format with populated company details
-        const data = permissions.map((permission)=>({
-                id: permission.id,
-                userId: permission.userId,
-                companyId: permission.company?.id || permission.targetId,
-                companyName: permission.company?.name || '',
-                companySlug: permission.company?.slug || ''
-            }));
+    async assignUserBranch(dto) {
+        return this.processBatchPermissions(dto.userId, dto.items, _usercompanypermissionentity.PermissionType.BRANCH);
+    }
+    async getUserBranches(userId, companyId) {
+        const permissions = await this.permissionService.findUserBranches(userId, companyId);
         return {
-            data
+            success: true,
+            message: 'User branches retrieved successfully',
+            data: permissions.map((p)=>({
+                    id: p.id,
+                    userId: p.userId,
+                    branchId: p.branch?.id || p.targetId,
+                    branchName: p.branch?.name || '',
+                    branchSlug: p.branch?.slug || '',
+                    companyId: p.branch?.companyId || ''
+                }))
         };
     }
-    // User-Branch Permissions
-    /** Batch assign/revoke user-branch permissions */ async assignUserBranch(dto) {
-        let addedCount = 0;
-        let removedCount = 0;
-        for (const item of dto.items){
+    /** Process batch permission assignments/revocations */ async processBatchPermissions(userId, items, type) {
+        let added = 0, removed = 0;
+        for (const item of items){
             if (item.isAdd) {
-                await this.userPermissionService.assignUserToBranch({
-                    userId: dto.userId,
-                    branchId: item.targetId
-                });
-                addedCount++;
+                await this.permissionService.assignPermission(userId, item.targetId, type);
+                added++;
             } else {
-                await this.userPermissionService.revokeBranchAccess(dto.userId, item.targetId);
-                removedCount++;
+                await this.permissionService.revokePermission(userId, item.targetId, type);
+                removed++;
             }
         }
         return {
             success: true,
-            message: `Processed ${addedCount} additions and ${removedCount} removals`
-        };
-    }
-    /** Get user's branches */ async getUserBranches(userId) {
-        const permissions = await this.userPermissionService.findUserBranches(userId);
-        // Map to DTO format with populated branch details
-        const data = permissions.map((permission)=>({
-                id: permission.id,
-                userId: permission.userId,
-                branchId: permission.branch?.id || permission.targetId,
-                branchName: permission.branch?.name || '',
-                branchSlug: permission.branch?.slug || '',
-                companyId: permission.branch?.companyId || ''
-            }));
-        return {
-            data
+            message: `Processed ${added} additions and ${removed} removals`
         };
     }
-    // NOTE: @Inject() required for bundled code - type metadata may be lost during esbuild
-    constructor(userPermissionService){
-        _define_property(this, "userPermissionService", void 0);
-        this.userPermissionService = userPermissionService;
+    constructor(permissionService){
+        _define_property(this, "permissionService", void 0);
+        this.permissionService = permissionService;
     }
 };
 _ts_decorate([
     (0, _common.Post)('user-company/assign'),
+    (0, _nestjsshared.RequirePermission)(_nestjsshared.USER_PERMISSIONS.UPDATE),
     (0, _swagger.ApiOperation)({
-        summary: 'Batch assign/revoke user-company permissions',
-        description: `
-Batch operation to assign or revoke user permissions to companies.
-
-**Example: Add company permissions**
-\`\`\`json
-{
-  "userId": "user-id",
-  "items": [
-    { "targetId": "company-id-1", "isAdd": true },
-    { "targetId": "company-id-2", "isAdd": true }
-  ]
-}
-\`\`\`
-
-**Example: Remove company permissions**
-\`\`\`json
-{
-  "userId": "user-id",
-  "items": [
-    { "targetId": "company-id-1", "isAdd": false },
-    { "targetId": "company-id-2", "isAdd": false }
-  ]
-}
-\`\`\`
-
-**Example: Mix add and remove**
-\`\`\`json
-{
-  "userId": "user-id",
-  "items": [
-    { "targetId": "company-id-1", "isAdd": true },
-    { "targetId": "company-id-2", "isAdd": false }
-  ]
-}
-\`\`\`
-    `
+        summary: 'Batch assign/revoke user-company permissions'
     }),
     (0, _swagger.ApiResponse)({
         status: 200,
@@ -174,22 +119,28 @@ Batch operation to assign or revoke user permissions to companies.
     _ts_metadata("design:returntype", Promise)
 ], UserPermissionController.prototype, "assignUserCompany", null);
 _ts_decorate([
-    (0, _common.Get)('user-company'),
+    (0, _common.Post)('get-user-company'),
+    (0, _nestjsshared.RequirePermission)(_nestjsshared.USER_PERMISSIONS.READ),
     (0, _swagger.ApiOperation)({
-        summary: 'Get user companies',
-        description: 'Returns all companies the user has access to.'
+        summary: 'Get user companies'
     }),
-    (0, _swagger.ApiQuery)({
-        name: 'userId',
-        required: true,
-        description: 'User ID to get companies for',
-        example: '550e8400-e29b-41d4-a716-446655440000'
+    (0, _swagger.ApiBody)({
+        schema: {
+            properties: {
+                userId: {
+                    type: 'string'
+                }
+            },
+            required: [
+                'userId'
+            ]
+        }
     }),
     (0, _swagger.ApiResponse)({
         status: 200,
         type: _userpermissiondto.UserCompaniesResponseDto
     }),
-    _ts_param(0, (0, _common.Query)('userId')),
+    _ts_param(0, (0, _common.Body)('userId')),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [
         String
@@ -198,44 +149,9 @@ _ts_decorate([
 ], UserPermissionController.prototype, "getUserCompanies", null);
 _ts_decorate([
     (0, _common.Post)('user-branch/assign'),
+    (0, _nestjsshared.RequirePermission)(_nestjsshared.USER_PERMISSIONS.UPDATE),
     (0, _swagger.ApiOperation)({
-        summary: 'Batch assign/revoke user-branch permissions',
-        description: `
-Batch operation to assign or revoke user permissions to branches.
-
-**Example: Add branch permissions**
-\`\`\`json
-{
-  "userId": "user-id",
-  "items": [
-    { "targetId": "branch-id-1", "isAdd": true },
-    { "targetId": "branch-id-2", "isAdd": true }
-  ]
-}
-\`\`\`
-
-**Example: Remove branch permissions**
-\`\`\`json
-{
-  "userId": "user-id",
-  "items": [
-    { "targetId": "branch-id-1", "isAdd": false },
-    { "targetId": "branch-id-2", "isAdd": false }
-  ]
-}
-\`\`\`
-
-**Example: Mix add and remove**
-\`\`\`json
-{
-  "userId": "user-id",
-  "items": [
-    { "targetId": "branch-id-1", "isAdd": true },
-    { "targetId": "branch-id-2", "isAdd": false }
-  ]
-}
-\`\`\`
-    `
+        summary: 'Batch assign/revoke user-branch permissions'
     }),
     (0, _swagger.ApiResponse)({
         status: 200,
@@ -252,24 +168,36 @@ Batch operation to assign or revoke user permissions to branches.
     _ts_metadata("design:returntype", Promise)
 ], UserPermissionController.prototype, "assignUserBranch", null);
 _ts_decorate([
-    (0, _common.Get)('user-branch'),
+    (0, _common.Post)('get-user-branch'),
+    (0, _nestjsshared.RequirePermission)(_nestjsshared.USER_PERMISSIONS.READ),
     (0, _swagger.ApiOperation)({
-        summary: 'Get user branches',
-        description: 'Returns all branches the user has access to.'
+        summary: 'Get user branches'
     }),
-    (0, _swagger.ApiQuery)({
-        name: 'userId',
-        required: true,
-        description: 'User ID to get branches for',
-        example: '550e8400-e29b-41d4-a716-446655440000'
+    (0, _swagger.ApiBody)({
+        schema: {
+            properties: {
+                userId: {
+                    type: 'string'
+                },
+                companyId: {
+                    type: 'string',
+                    description: 'Optional company ID to filter branches'
+                }
+            },
+            required: [
+                'userId'
+            ]
+        }
     }),
     (0, _swagger.ApiResponse)({
         status: 200,
         type: _userpermissiondto.UserBranchesResponseDto
     }),
-    _ts_param(0, (0, _common.Query)('userId')),
+    _ts_param(0, (0, _common.Body)('userId')),
+    _ts_param(1, (0, _common.Body)('companyId')),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [
+        String,
         String
     ]),
     _ts_metadata("design:returntype", Promise)
@@ -278,7 +206,7 @@ UserPermissionController = _ts_decorate([
     (0, _swagger.ApiTags)('User Permissions'),
     (0, _swagger.ApiBearerAuth)(),
     (0, _common.Controller)('administration/permissions'),
-    (0, _common.UseGuards)(_guards.JwtAuthGuard),
+    (0, _common.UseGuards)(_nestjsshared.JwtAuthGuard),
     _ts_param(0, (0, _common.Inject)(_userpermissionservice.UserPermissionService)),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [

package/cjs/controllers/user.controller.js

@@ -44,35 +44,80 @@ function _ts_param(paramIndex, decorator) {
     };
 }
 let UserController = class UserController extends (0, _classes.createApiController)(_userdto.CreateUserDto, _userdto.UpdateUserDto, _userdto.UserResponseDto, {
-    security: 'jwt'
+    security: {
+        insert: {
+            level: 'permission',
+            permissions: [
+                _classes.USER_PERMISSIONS.CREATE
+            ]
+        },
+        insertMany: {
+            level: 'permission',
+            permissions: [
+                _classes.USER_PERMISSIONS.CREATE
+            ]
+        },
+        getById: {
+            level: 'permission',
+            permissions: [
+                _classes.USER_PERMISSIONS.READ
+            ]
+        },
+        getAll: {
+            level: 'permission',
+            permissions: [
+                _classes.USER_PERMISSIONS.READ
+            ]
+        },
+        update: {
+            level: 'permission',
+            permissions: [
+                _classes.USER_PERMISSIONS.UPDATE
+            ]
+        },
+        updateMany: {
+            level: 'permission',
+            permissions: [
+                _classes.USER_PERMISSIONS.UPDATE
+            ]
+        },
+        delete: {
+            level: 'permission',
+            permissions: [
+                _classes.USER_PERMISSIONS.DELETE
+            ]
+        }
+    }
 }) {
-    // Custom Endpoints
-    /** Get user profile with extras (roles, permissions, etc.) from enricher */ async getProfileWithExtras(id, user) {
+    async getProfileWithExtras(id, user) {
         const data = await this.service.getProfileWithExtras(id, user);
         return {
             success: true,
             data
         };
     }
-    /** Verify user email */ async verifyEmail(id) {
+    async verifyEmail(id) {
         await this.service.verifyEmail(id);
         return {
+            success: true,
             message: 'Email verified successfully'
         };
     }
-    /** Verify user phone */ async verifyPhone(id) {
+    async verifyPhone(id) {
         await this.service.verifyPhone(id);
         return {
+            success: true,
             message: 'Phone verified successfully'
         };
     }
-    /** Update user active status. When company feature enabled, updates permission isActive for logged user's company. */ async updateStatus(id, isActive, user) {
+    async updateStatus(id, isActive, user) {
         await this.service.updateStatus(id, isActive, user);
         return {
+            success: true,
             message: 'Status updated successfully'
         };
     }
-    /** Update user profile */ async profile(dto, user) {
+    async profile(dto, user) {
         const data = await this.service.profile(dto, user);
         return {
             success: true,
@@ -80,34 +125,34 @@ let UserController = class UserController extends (0, _classes.createApiControll
             data
         };
     }
-    // ============================================
-    // Multi-Step Profile Endpoints (via Enricher)
-    // ============================================
-    /** Get profile section definitions */ async getProfileSections() {
+    async getProfileSections() {
         const sections = await this.service.getProfileSections();
         return {
             success: true,
+            message: 'Profile sections retrieved successfully',
             data: sections
         };
     }
-    /** Get specific profile section data */ async getProfileSectionData(id, sectionId, user) {
+    async getProfileSectionData(id, sectionId, user) {
         const data = await this.service.getProfileSectionData(id, sectionId, user);
         return {
             success: true,
+            message: 'Profile section data retrieved successfully',
             data
         };
     }
-    /** Update specific profile section */ async updateProfileSection(id, sectionId, data, user) {
+    async updateProfileSection(id, sectionId, data, user) {
         await this.service.updateProfileSection(id, sectionId, data, user);
         return {
             success: true,
             message: 'Section updated successfully'
         };
     }
-    /** Get profile completion percentage */ async getProfileCompletion(id, user) {
+    async getProfileCompletion(id, user) {
         const percentage = await this.service.getProfileCompletion(id, user);
         return {
             success: true,
+            message: 'Profile completion retrieved successfully',
             data: {
                 completionPercentage: percentage
             }
@@ -121,6 +166,7 @@ _ts_decorate([
     (0, _common.Post)(':id/profile-extras'),
     (0, _common.UseGuards)(_guards.JwtAuthGuard),
     (0, _swagger.ApiBearerAuth)(),
+    (0, _decorators.RequirePermission)(_classes.USER_PERMISSIONS.READ),
     (0, _swagger.ApiOperation)({
         summary: 'Get user profile with extras',
         description: 'Returns user profile along with extra data (roles, permissions, etc.) if UserEnricher is provided.'
@@ -142,6 +188,7 @@ _ts_decorate([
     (0, _common.Post)(':id/verify-email'),
     (0, _common.UseGuards)(_guards.JwtAuthGuard),
     (0, _swagger.ApiBearerAuth)(),
+    (0, _decorators.RequirePermission)(_classes.USER_PERMISSIONS.UPDATE),
     (0, _swagger.ApiOperation)({
         summary: 'Verify user email'
     }),
@@ -160,6 +207,7 @@ _ts_decorate([
     (0, _common.Post)(':id/verify-phone'),
     (0, _common.UseGuards)(_guards.JwtAuthGuard),
     (0, _swagger.ApiBearerAuth)(),
+    (0, _decorators.RequirePermission)(_classes.USER_PERMISSIONS.UPDATE),
     (0, _swagger.ApiOperation)({
         summary: 'Verify user phone'
     }),
@@ -175,9 +223,10 @@ _ts_decorate([
     _ts_metadata("design:returntype", Promise)
 ], UserController.prototype, "verifyPhone", null);
 _ts_decorate([
-    (0, _common.Put)(':id/status'),
+    (0, _common.Post)(':id/status'),
     (0, _common.UseGuards)(_guards.JwtAuthGuard),
     (0, _swagger.ApiBearerAuth)(),
+    (0, _decorators.RequirePermission)(_classes.USER_PERMISSIONS.UPDATE),
     (0, _swagger.ApiOperation)({
         summary: 'Update user active status',
         description: 'Updates user active status. When company feature is enabled, updates the status for the current company context.'
@@ -227,6 +276,7 @@ _ts_decorate([
     (0, _common.Post)('profile-sections'),
     (0, _common.UseGuards)(_guards.JwtAuthGuard),
     (0, _swagger.ApiBearerAuth)(),
+    (0, _decorators.RequirePermission)(_classes.USER_PERMISSIONS.READ),
     (0, _swagger.ApiOperation)({
         summary: 'Get profile section definitions',
         description: 'Returns available profile sections for multi-step profile (if enricher configured).'
@@ -239,6 +289,7 @@ _ts_decorate([
     (0, _common.Post)(':id/profile-section/:sectionId'),
     (0, _common.UseGuards)(_guards.JwtAuthGuard),
     (0, _swagger.ApiBearerAuth)(),
+    (0, _decorators.RequirePermission)(_classes.USER_PERMISSIONS.READ),
     (0, _swagger.ApiOperation)({
         summary: 'Get profile section data',
         description: 'Returns data for a specific profile section.'
@@ -266,6 +317,7 @@ _ts_decorate([
     (0, _common.Post)(':id/profile-section/:sectionId/update'),
     (0, _common.UseGuards)(_guards.JwtAuthGuard),
     (0, _swagger.ApiBearerAuth)(),
+    (0, _decorators.RequirePermission)(_classes.USER_PERMISSIONS.UPDATE),
     (0, _swagger.ApiOperation)({
         summary: 'Update profile section',
         description: 'Updates a specific profile section data.'
@@ -295,6 +347,7 @@ _ts_decorate([
     (0, _common.Post)(':id/profile-completion'),
     (0, _common.UseGuards)(_guards.JwtAuthGuard),
     (0, _swagger.ApiBearerAuth)(),
+    (0, _decorators.RequirePermission)(_classes.USER_PERMISSIONS.READ),
     (0, _swagger.ApiOperation)({
         summary: 'Get profile completion percentage',
         description: 'Returns overall profile completion percentage.'

package/cjs/docs/auth-swagger.config.js

@@ -14,6 +14,16 @@ Object.defineProperty(exports, "authSwaggerConfig", {
     'User Permissions',
     'Company Selection'
 ];
+/** Examples to exclude when company feature is disabled */ const COMPANY_EXAMPLE_EXCLUSIONS = [
+    {
+        pathPattern: '/auth/login',
+        method: 'post',
+        examples: [
+            'loginSuccessWithCompany',
+            'companySelection'
+        ]
+    }
+];
 /**
  * Schema properties to exclude when company feature is disabled
  *
@@ -58,16 +68,14 @@ Object.defineProperty(exports, "authSwaggerConfig", {
         schemaName: 'RegistrationResponseDto',
         properties: [
             'company',
-            'branch',
-            'companyFeatureEnabled'
+            'branch'
         ]
     },
     {
         schemaName: 'LoginResponseDto',
         properties: [
             'company',
-            'branch',
-            'companyFeatureEnabled'
+            'branch'
         ]
     },
     {
@@ -102,7 +110,6 @@ Object.defineProperty(exports, "authSwaggerConfig", {
             'id',
             'name',
             'slug',
-            'isActive',
             'logoId'
         ]
     },
@@ -112,7 +119,6 @@ Object.defineProperty(exports, "authSwaggerConfig", {
             'id',
             'name',
             'slug',
-            'isActive',
             'logoId',
             'branches'
         ]
@@ -404,6 +410,7 @@ POST /auth/login → { accessToken, refreshToken, user }
         path: 'api/docs/auth',
         bearerAuth: true,
         excludeTags,
-        excludeSchemaProperties: enableCompanyFeature ? undefined : COMPANY_SCHEMA_EXCLUSIONS
+        excludeSchemaProperties: enableCompanyFeature ? undefined : COMPANY_SCHEMA_EXCLUSIONS,
+        excludeExamples: enableCompanyFeature ? undefined : COMPANY_EXAMPLE_EXCLUSIONS
     };
 }