@flusys/nestjs-auth 5.0.3 → 5.1.0

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

@@ -9,9 +9,9 @@ Object.defineProperty(exports, "UserPermissionController", {
     }
 });
 const _nestjsshared = require("@flusys/nestjs-shared");
-const _config = require("../config");
 const _common = require("@nestjs/common");
 const _swagger = require("@nestjs/swagger");
+const _config = require("../config");
 const _userpermissiondto = require("../dtos/user-permission.dto");
 const _usercompanypermissionentity = require("../entities/user-company-permission.entity");
 const _userpermissionservice = require("../services/user-permission.service");
@@ -214,7 +214,7 @@ UserPermissionController = _ts_decorate([
     (0, _swagger.ApiTags)('User Permissions'),
     (0, _swagger.ApiBearerAuth)(),
     (0, _common.Controller)('administration/permissions'),
-    (0, _common.UseGuards)(_nestjsshared.JwtAuthGuard),
+    (0, _common.UseGuards)(_nestjsshared.JwtAuthGuard, _nestjsshared.PermissionGuard),
     _ts_param(0, (0, _common.Inject)(_userpermissionservice.UserPermissionService)),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [

package/cjs/controllers/user.controller.js

@@ -9,12 +9,12 @@ Object.defineProperty(exports, "UserController", {
     }
 });
 const _classes = require("@flusys/nestjs-shared/classes");
-const _config = require("../config");
 const _decorators = require("@flusys/nestjs-shared/decorators");
 const _guards = require("@flusys/nestjs-shared/guards");
 const _interfaces = require("@flusys/nestjs-shared/interfaces");
 const _common = require("@nestjs/common");
 const _swagger = require("@nestjs/swagger");
+const _config = require("../config");
 const _userdto = require("../dtos/user.dto");
 const _userservice = require("../services/user.service");
 function _define_property(obj, key, value) {
@@ -176,7 +176,7 @@ let UserController = class UserController extends (0, _classes.createApiControll
 };
 _ts_decorate([
     (0, _common.Post)(':id/profile-extras'),
-    (0, _common.UseGuards)(_guards.JwtAuthGuard),
+    (0, _common.UseGuards)(_guards.JwtAuthGuard, _guards.PermissionGuard),
     (0, _swagger.ApiBearerAuth)(),
     (0, _decorators.RequirePermission)(_classes.USER_PERMISSIONS.READ),
     (0, _swagger.ApiOperation)({
@@ -198,7 +198,7 @@ _ts_decorate([
 ], UserController.prototype, "getProfileWithExtras", null);
 _ts_decorate([
     (0, _common.Post)(':id/verify-email'),
-    (0, _common.UseGuards)(_guards.JwtAuthGuard),
+    (0, _common.UseGuards)(_guards.JwtAuthGuard, _guards.PermissionGuard),
     (0, _swagger.ApiBearerAuth)(),
     (0, _decorators.RequirePermission)(_classes.USER_PERMISSIONS.UPDATE),
     (0, _swagger.ApiOperation)({
@@ -217,7 +217,7 @@ _ts_decorate([
 ], UserController.prototype, "verifyEmail", null);
 _ts_decorate([
     (0, _common.Post)(':id/verify-phone'),
-    (0, _common.UseGuards)(_guards.JwtAuthGuard),
+    (0, _common.UseGuards)(_guards.JwtAuthGuard, _guards.PermissionGuard),
     (0, _swagger.ApiBearerAuth)(),
     (0, _decorators.RequirePermission)(_classes.USER_PERMISSIONS.UPDATE),
     (0, _swagger.ApiOperation)({
@@ -236,7 +236,7 @@ _ts_decorate([
 ], UserController.prototype, "verifyPhone", null);
 _ts_decorate([
     (0, _common.Post)(':id/status'),
-    (0, _common.UseGuards)(_guards.JwtAuthGuard),
+    (0, _common.UseGuards)(_guards.JwtAuthGuard, _guards.PermissionGuard),
     (0, _swagger.ApiBearerAuth)(),
     (0, _decorators.RequirePermission)(_classes.USER_PERMISSIONS.UPDATE),
     (0, _swagger.ApiOperation)({
@@ -301,7 +301,6 @@ _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.'
@@ -329,7 +328,6 @@ _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.'
@@ -359,7 +357,6 @@ _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/fesm/controllers/user-permission.controller.js

@@ -25,10 +25,10 @@ function _ts_param(paramIndex, decorator) {
         decorator(target, key, paramIndex);
     };
 }
-import { JwtAuthGuard, RequirePermission, USER_PERMISSIONS } from '@flusys/nestjs-shared';
-import { USER_PERMISSION_MESSAGES } from '../config';
+import { JwtAuthGuard, PermissionGuard, RequirePermission, USER_PERMISSIONS } from '@flusys/nestjs-shared';
 import { Body, Controller, Inject, Post, UseGuards } from '@nestjs/common';
 import { ApiBearerAuth, ApiBody, ApiOperation, ApiResponse, ApiTags } from '@nestjs/swagger';
+import { USER_PERMISSION_MESSAGES } from '../config';
 import { AssignUserBranchDto, AssignUserCompanyDto, UserBranchesResponseDto, UserCompaniesResponseDto } from '../dtos/user-permission.dto';
 import { PermissionType } from '../entities/user-company-permission.entity';
 import { UserPermissionService } from '../services/user-permission.service';
@@ -204,7 +204,7 @@ UserPermissionController = _ts_decorate([
     ApiTags('User Permissions'),
     ApiBearerAuth(),
     Controller('administration/permissions'),
-    UseGuards(JwtAuthGuard),
+    UseGuards(JwtAuthGuard, PermissionGuard),
     _ts_param(0, Inject(UserPermissionService)),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [

package/fesm/controllers/user.controller.js

@@ -26,12 +26,12 @@ function _ts_param(paramIndex, decorator) {
     };
 }
 import { createApiController, USER_PERMISSIONS } from '@flusys/nestjs-shared/classes';
-import { USER_MESSAGES } from '../config';
 import { CurrentUser, RequirePermission } from '@flusys/nestjs-shared/decorators';
-import { JwtAuthGuard } from '@flusys/nestjs-shared/guards';
+import { JwtAuthGuard, PermissionGuard } from '@flusys/nestjs-shared/guards';
 import { ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
 import { Body, Controller, Inject, Param, Post, UseGuards } from '@nestjs/common';
 import { ApiBearerAuth, ApiBody, ApiOperation, ApiParam, ApiTags } from '@nestjs/swagger';
+import { USER_MESSAGES } from '../config';
 import { CreateUserDto, UpdateUserDto, UserResponseDto } from '../dtos/user.dto';
 import { UserService } from '../services/user.service';
 export class UserController extends createApiController(CreateUserDto, UpdateUserDto, UserResponseDto, {
@@ -166,7 +166,7 @@ export class UserController extends createApiController(CreateUserDto, UpdateUse
 }
 _ts_decorate([
     Post(':id/profile-extras'),
-    UseGuards(JwtAuthGuard),
+    UseGuards(JwtAuthGuard, PermissionGuard),
     ApiBearerAuth(),
     RequirePermission(USER_PERMISSIONS.READ),
     ApiOperation({
@@ -188,7 +188,7 @@ _ts_decorate([
 ], UserController.prototype, "getProfileWithExtras", null);
 _ts_decorate([
     Post(':id/verify-email'),
-    UseGuards(JwtAuthGuard),
+    UseGuards(JwtAuthGuard, PermissionGuard),
     ApiBearerAuth(),
     RequirePermission(USER_PERMISSIONS.UPDATE),
     ApiOperation({
@@ -207,7 +207,7 @@ _ts_decorate([
 ], UserController.prototype, "verifyEmail", null);
 _ts_decorate([
     Post(':id/verify-phone'),
-    UseGuards(JwtAuthGuard),
+    UseGuards(JwtAuthGuard, PermissionGuard),
     ApiBearerAuth(),
     RequirePermission(USER_PERMISSIONS.UPDATE),
     ApiOperation({
@@ -226,7 +226,7 @@ _ts_decorate([
 ], UserController.prototype, "verifyPhone", null);
 _ts_decorate([
     Post(':id/status'),
-    UseGuards(JwtAuthGuard),
+    UseGuards(JwtAuthGuard, PermissionGuard),
     ApiBearerAuth(),
     RequirePermission(USER_PERMISSIONS.UPDATE),
     ApiOperation({
@@ -291,7 +291,6 @@ _ts_decorate([
     Post(':id/profile-section/:sectionId'),
     UseGuards(JwtAuthGuard),
     ApiBearerAuth(),
-    RequirePermission(USER_PERMISSIONS.READ),
     ApiOperation({
         summary: 'Get profile section data',
         description: 'Returns data for a specific profile section.'
@@ -319,7 +318,6 @@ _ts_decorate([
     Post(':id/profile-section/:sectionId/update'),
     UseGuards(JwtAuthGuard),
     ApiBearerAuth(),
-    RequirePermission(USER_PERMISSIONS.UPDATE),
     ApiOperation({
         summary: 'Update profile section',
         description: 'Updates a specific profile section data.'
@@ -349,7 +347,6 @@ _ts_decorate([
     Post(':id/profile-completion'),
     UseGuards(JwtAuthGuard),
     ApiBearerAuth(),
-    RequirePermission(USER_PERMISSIONS.READ),
     ApiOperation({
         summary: 'Get profile completion percentage',
         description: 'Returns overall profile completion percentage.'

package/fesm/services/branch.service.js

@@ -25,7 +25,7 @@ function _ts_param(paramIndex, decorator) {
         decorator(target, key, paramIndex);
     };
 }
-import { RequestScopedApiService, HybridCache } from '@flusys/nestjs-shared/classes';
+import { HybridCache, RequestScopedApiService } from '@flusys/nestjs-shared/classes';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
 import { applyCompanyFilter } from '@flusys/nestjs-shared/utils';
 import { Inject, Injectable, Scope } from '@nestjs/common';

package/fesm/services/company.service.js

@@ -25,7 +25,7 @@ function _ts_param(paramIndex, decorator) {
         decorator(target, key, paramIndex);
     };
 }
-import { RequestScopedApiService, HybridCache } from '@flusys/nestjs-shared/classes';
+import { HybridCache, RequestScopedApiService } from '@flusys/nestjs-shared/classes';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
 import { Inject, Injectable, Scope } from '@nestjs/common';
 import { Company } from '../entities/company.entity';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flusys/nestjs-auth",
-  "version": "5.0.3",
+  "version": "5.1.0",
   "description": "Authentication and authorization infrastructure for NestJS applications",
   "main": "cjs/index.js",
   "module": "fesm/index.js",
@@ -93,7 +93,7 @@
     "rxjs": "^7.8.0"
   },
   "dependencies": {
-    "@flusys/nestjs-core": "5.0.3",
-    "@flusys/nestjs-shared": "5.0.3"
+    "@flusys/nestjs-core": "5.1.0",
+    "@flusys/nestjs-shared": "5.1.0"
   }
 }

package/services/branch.service.d.ts

@@ -1,14 +1,14 @@
-import { RequestScopedApiService, HybridCache } from '@flusys/nestjs-shared/classes';
+import { HybridCache, RequestScopedApiService } from '@flusys/nestjs-shared/classes';
 import { FilterAndPaginationDto } from '@flusys/nestjs-shared/dtos';
 import { ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
-import { EntityTarget, Repository, SelectQueryBuilder } from 'typeorm';
+import { EntityTarget, SelectQueryBuilder } from 'typeorm';
 import { CreateCompanyBranchDto, UpdateCompanyBranchDto } from '../dtos/company-branch.dto';
-import { ICompanyBranch } from '../interfaces/company-branch.interface';
 import { CompanyBranch } from '../entities/company-branch.entity';
+import { ICompanyBranch } from '../interfaces/company-branch.interface';
 import { AuthConfigService } from './auth-config.service';
 import { AuthDataSourceProvider } from './auth-datasource.provider';
-export declare class BranchService extends RequestScopedApiService<CreateCompanyBranchDto, UpdateCompanyBranchDto, ICompanyBranch, CompanyBranch, Repository<CompanyBranch>> {
+export declare class BranchService extends RequestScopedApiService<CreateCompanyBranchDto, UpdateCompanyBranchDto, ICompanyBranch, CompanyBranch> {
     protected cacheManager: HybridCache;
     protected utilsService: UtilsService;
     private readonly dataSourceProvider;

package/services/company.service.d.ts

@@ -1,12 +1,12 @@
-import { RequestScopedApiService, HybridCache } from '@flusys/nestjs-shared/classes';
+import { HybridCache, RequestScopedApiService } from '@flusys/nestjs-shared/classes';
 import { ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
-import { EntityTarget, Repository, SelectQueryBuilder } from 'typeorm';
+import { EntityTarget, SelectQueryBuilder } from 'typeorm';
 import { CreateCompanyDto, UpdateCompanyDto } from '../dtos/company.dto';
 import { Company } from '../entities/company.entity';
 import { ICompany } from '../interfaces/company.interface';
 import { AuthDataSourceProvider } from './auth-datasource.provider';
-export declare class CompanyService extends RequestScopedApiService<CreateCompanyDto, UpdateCompanyDto, ICompany, Company, Repository<Company>> {
+export declare class CompanyService extends RequestScopedApiService<CreateCompanyDto, UpdateCompanyDto, ICompany, Company> {
     protected cacheManager: HybridCache;
     protected utilsService: UtilsService;
     private readonly dataSourceProvider;

package/services/user.service.d.ts

@@ -2,14 +2,14 @@ import { HybridCache, RequestScopedApiService } from '@flusys/nestjs-shared/clas
 import { FilterAndPaginationDto } from '@flusys/nestjs-shared/dtos';
 import { ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
-import { EntityTarget, Repository, SelectQueryBuilder } from 'typeorm';
+import { EntityTarget, SelectQueryBuilder } from 'typeorm';
 import { CreateUserDto, UpdateUserDto } from '../dtos/user.dto';
 import { AppUser } from '../entities/app-user.entity';
 import { IEnrichedUser, IProfileExtras, IProfileSection, IProfileSectionData, IUserEnricher } from '../interfaces/user-enricher.interface';
 import { IUser } from '../interfaces/user.interface';
 import { AuthConfigService } from './auth-config.service';
 import { AuthDataSourceProvider } from './auth-datasource.provider';
-export declare class UserService extends RequestScopedApiService<CreateUserDto, UpdateUserDto, IUser, AppUser, Repository<AppUser>> {
+export declare class UserService extends RequestScopedApiService<CreateUserDto, UpdateUserDto, IUser, AppUser> {
     protected cacheManager: HybridCache;
     protected utilsService: UtilsService;
     private readonly dataSourceProvider;