Merge pull request #248 from andrechristikan/development

andrechristikan · web-flow · commit 54025353d5c2 · 2022-10-08T20:06:03.000+07:00
Development
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ack-nestjs-mongoose-kafka",
-  "version": "2.4.2",
+  "version": "2.4.3",
   "description": "Ack NestJs Mongoose Kafka",
   "repository": {
     "type": "git",
@@ -92,7 +92,7 @@
     "moment": "^2.29.4",
     "mongoose": "^6.6.5",
     "morgan": "^1.10.0",
-    "nest-winston": "^1.7.0",
+    "nest-winston": "^1.7.1",
     "nestjs-command": "^3.1.2",
     "nestjs-i18n": "^9.2.0",
     "passport": "^0.6.0",
@@ -137,7 +137,7 @@
     "@typescript-eslint/eslint-plugin": "^5.39.0",
     "@typescript-eslint/parser": "^5.39.0",
     "cspell": "^6.12.0",
-    "eslint": "^8.24.0",
+    "eslint": "^8.25.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-import": "^2.26.0",
     "husky": "^8.0.1",
diff --git a/src/common/auth/constants/auth.status-code.constant.ts b/src/common/auth/constants/auth.status-code.constant.ts
@@ -1,14 +1,10 @@
 export enum ENUM_AUTH_STATUS_CODE_ERROR {
-    AUTH_BASIC_TOKEN_NEEDED_ERROR = 5100,
-    AUTH_BASIC_TOKEN_INVALID_ERROR = 5101,
-    AUTH_JWT_ACCESS_TOKEN_ERROR = 5102,
-    AUTH_JWT_REFRESH_TOKEN_ERROR = 5103,
-    AUTH_INACTIVE_ERROR = 5104,
-    AUTH_ROLE_INACTIVE_ERROR = 5105,
-    AUTH_ROLE_ACCESS_FOR_INVALID_ERROR = 5106,
-    AUTH_PASSWORD_EXPIRED_ERROR = 5107,
-    AUTH_PERMISSION_INVALID_ERROR = 5108,
-    AUTH_ACCESS_FOR_INVALID_ERROR = 5109,
+    AUTH_JWT_ACCESS_TOKEN_ERROR = 5100,
+    AUTH_JWT_REFRESH_TOKEN_ERROR = 5101,
+    AUTH_ROLE_ACCESS_FOR_INVALID_ERROR = 5102,
+    AUTH_PASSWORD_EXPIRED_ERROR = 5103,
+    AUTH_PERMISSION_INVALID_ERROR = 5104,
+    AUTH_ACCESS_FOR_INVALID_ERROR = 5105,
 
     AUTH_API_KEY_NEEDED_ERROR = 5120,
     AUTH_API_KEY_PREFIX_INVALID_ERROR = 5121,
diff --git a/src/common/auth/decorators/auth.jwt.decorator.ts b/src/common/auth/decorators/auth.jwt.decorator.ts
@@ -15,7 +15,6 @@ import { ENUM_AUTH_STATUS_CODE_ERROR } from 'src/common/auth/constants/auth.stat
 import { JwtRefreshGuard } from 'src/common/auth/guards/jwt-refresh/auth.jwt-refresh.guard';
 import { JwtGuard } from 'src/common/auth/guards/jwt/auth.jwt.guard';
 import { AuthPayloadAccessForGuard } from 'src/common/auth/guards/payload/auth.payload.access-for.guard';
-import { AuthPayloadDefaultGuard } from 'src/common/auth/guards/payload/auth.payload.default.guard';
 import { AuthPayloadPasswordExpiredGuard } from 'src/common/auth/guards/payload/auth.payload.password-expired.guard';
 import { AuthPayloadPermissionGuard } from 'src/common/auth/guards/payload/auth.payload.permission.guard';
 import {
@@ -47,22 +46,9 @@ export function AuthJwtGuard(...permissions: ENUM_AUTH_PERMISSIONS[]): any {
                 statusCode:
                     ENUM_AUTH_STATUS_CODE_ERROR.AUTH_ACCESS_FOR_INVALID_ERROR,
                 messagePath: 'auth.error.accessForForbidden',
-            },
-            {
-                statusCode: ENUM_AUTH_STATUS_CODE_ERROR.AUTH_INACTIVE_ERROR,
-                messagePath: 'auth.error.blocked',
-            },
-            {
-                statusCode:
-                    ENUM_AUTH_STATUS_CODE_ERROR.AUTH_ROLE_INACTIVE_ERROR,
-                messagePath: 'auth.error.roleBlocked',
             }
         ),
-        UseGuards(
-            JwtGuard,
-            AuthPayloadDefaultGuard,
-            AuthPayloadPermissionGuard
-        ),
+        UseGuards(JwtGuard, AuthPayloadPermissionGuard),
         SetMetadata(AUTH_PERMISSION_META_KEY, permissions)
     );
 }
@@ -93,20 +79,10 @@ export function AuthPublicJwtGuard(
                 statusCode:
                     ENUM_AUTH_STATUS_CODE_ERROR.AUTH_ACCESS_FOR_INVALID_ERROR,
                 messagePath: 'auth.error.accessForForbidden',
-            },
-            {
-                statusCode: ENUM_AUTH_STATUS_CODE_ERROR.AUTH_INACTIVE_ERROR,
-                messagePath: 'auth.error.blocked',
-            },
-            {
-                statusCode:
-                    ENUM_AUTH_STATUS_CODE_ERROR.AUTH_ROLE_INACTIVE_ERROR,
-                messagePath: 'auth.error.roleBlocked',
             }
         ),
         UseGuards(
             JwtGuard,
-            AuthPayloadDefaultGuard,
             AuthPayloadPasswordExpiredGuard,
             AuthPayloadAccessForGuard,
             AuthPayloadPermissionGuard
@@ -140,20 +116,10 @@ export function AuthAdminJwtGuard(...permissions: ENUM_AUTH_PERMISSIONS[]) {
                 statusCode:
                     ENUM_AUTH_STATUS_CODE_ERROR.AUTH_ACCESS_FOR_INVALID_ERROR,
                 messagePath: 'auth.error.accessForForbidden',
-            },
-            {
-                statusCode: ENUM_AUTH_STATUS_CODE_ERROR.AUTH_INACTIVE_ERROR,
-                messagePath: 'auth.error.blocked',
-            },
-            {
-                statusCode:
-                    ENUM_AUTH_STATUS_CODE_ERROR.AUTH_ROLE_INACTIVE_ERROR,
-                messagePath: 'auth.error.roleBlocked',
             }
         ),
         UseGuards(
             JwtGuard,
-            AuthPayloadDefaultGuard,
             AuthPayloadPasswordExpiredGuard,
             AuthPayloadAccessForGuard,
             AuthPayloadPermissionGuard
diff --git a/src/common/auth/guards/payload/auth.payload.default.guard.ts b/src/common/auth/guards/payload/auth.payload.default.guard.ts
diff --git a/src/common/auth/guards/payload/auth.payload.permission.guard.ts b/src/common/auth/guards/payload/auth.payload.permission.guard.ts
@@ -9,7 +9,6 @@ import { AUTH_PERMISSION_META_KEY } from 'src/common/auth/constants/auth.constan
 import { ENUM_AUTH_ACCESS_FOR } from 'src/common/auth/constants/auth.enum.constant';
 import { ENUM_AUTH_PERMISSIONS } from 'src/common/auth/constants/auth.enum.permission.constant';
 import { ENUM_AUTH_STATUS_CODE_ERROR } from 'src/common/auth/constants/auth.status-code.constant';
-import { IAuthPermission } from 'src/common/auth/interfaces/auth.interface';
 
 @Injectable()
 export class AuthPayloadPermissionGuard implements CanActivate {
@@ -31,10 +30,7 @@ export class AuthPayloadPermissionGuard implements CanActivate {
             return true;
         }
 
-        const permissions: string[] = role.permissions
-            .filter((val: IAuthPermission) => val.isActive)
-            .map((val: IAuthPermission) => val.code);
-
+        const permissions: string[] = role.permissions;
         const hasPermission: boolean = requiredPermission.every((permission) =>
             permissions.includes(permission)
         );
diff --git a/src/modules/user/interfaces/user.interface.ts b/src/modules/user/interfaces/user.interface.ts
@@ -1,3 +1,4 @@
+import { ENUM_AUTH_ACCESS_FOR } from 'src/common/auth/constants/auth.enum.constant';
 import { IRoleDocument } from 'src/modules/role/interfaces/role.interface';
 import { UserCreateDto } from 'src/modules/user/dtos/user.create.dto';
 import { UserDocument } from 'src/modules/user/schemas/user.schema';
@@ -15,3 +16,9 @@ export interface IUserCheckExist {
     email: boolean;
     mobileNumber: boolean;
 }
+
+export interface IUserRolePayload {
+    name: string;
+    permissions: string[];
+    accessFor: ENUM_AUTH_ACCESS_FOR;
+}
diff --git a/src/modules/user/serializations/user.payload.serialization.ts b/src/modules/user/serializations/user.payload.serialization.ts
@@ -1,11 +1,26 @@
 import { OmitType } from '@nestjs/swagger';
-import { Exclude } from 'class-transformer';
+import { Exclude, Transform } from 'class-transformer';
 import { AwsS3Serialization } from 'src/common/aws/serializations/aws.s3.serialization';
+import { IUserRolePayload } from 'src/modules/user/interfaces/user.interface';
 import { UserGetSerialization } from './user.get.serialization';
 
 export class UserPayloadSerialization extends OmitType(UserGetSerialization, [
     'photo',
+    'role',
+    'isActive',
 ] as const) {
     @Exclude()
     readonly photo?: AwsS3Serialization;
+
+    @Transform(({ value }) => ({
+        name: value.name,
+        permissions: value.permissions.map(
+            (val: Record<string, any>) => val.code
+        ),
+        accessFor: value.accessFor,
+    }))
+    readonly role: IUserRolePayload;
+
+    @Exclude()
+    readonly isActive: boolean;
 }
diff --git a/yarn.lock b/yarn.lock
@@ -2329,10 +2329,10 @@
     enabled "2.0.x"
     kuler "^2.0.0"
 
-"@eslint/eslintrc@^1.3.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.2.tgz#58b69582f3b7271d8fa67fe5251767a5b38ea356"
-  integrity sha512-AXYd23w1S/bv3fTs3Lz0vjiYemS08jWkI3hYyS9I1ry+0f+Yjs1wm+sU0BS8qDOPrBIkp4qHYC16I8uVtpLajQ==
+"@eslint/eslintrc@^1.3.3":
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.3.tgz#2b044ab39fdfa75b4688184f9e573ce3c5b0ff95"
+  integrity sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
@@ -2659,11 +2659,6 @@
     debug "^4.1.1"
     minimatch "^3.0.4"
 
-"@humanwhocodes/gitignore-to-minimatch@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz#316b0a63b91c10e53f242efb4ace5c3b34e8728d"
-  integrity sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==
-
 "@humanwhocodes/module-importer@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
@@ -6301,14 +6296,13 @@ eslint-visitor-keys@^3.3.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
   integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
 
-eslint@^8.24.0:
-  version "8.24.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.24.0.tgz#489516c927a5da11b3979dbfb2679394523383c8"
-  integrity sha512-dWFaPhGhTAiPcCgm3f6LI2MBWbogMnTJzFBbhXVRQDJPkr9pGZvVjlVfXd+vyDcWPA2Ic9L2AXPIQM0+vk/cSQ==
+eslint@^8.25.0:
+  version "8.25.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.25.0.tgz#00eb962f50962165d0c4ee3327708315eaa8058b"
+  integrity sha512-DVlJOZ4Pn50zcKW5bYH7GQK/9MsoQG2d5eDH0ebEkE8PbgzTTmtt/VTH9GGJ4BfeZCpBLqFfvsjX35UacUL83A==
   dependencies:
-    "@eslint/eslintrc" "^1.3.2"
+    "@eslint/eslintrc" "^1.3.3"
     "@humanwhocodes/config-array" "^0.10.5"
-    "@humanwhocodes/gitignore-to-minimatch" "^1.0.2"
     "@humanwhocodes/module-importer" "^1.0.1"
     ajv "^6.10.0"
     chalk "^4.0.0"
@@ -8940,10 +8934,10 @@ neo-async@^2.6.2:
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
-nest-winston@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/nest-winston/-/nest-winston-1.7.0.tgz#92fd415d42c882e1d07201fb962140e5ba291c4c"
-  integrity sha512-FJ94dJ++8BEjQfK5TuqiY5g7pP48RLRss41Bm6bCCfzYgywymEI6m+HPHW9K/q2i7wO5TU6Sva51/Rvmmhxddw==
+nest-winston@^1.7.1:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/nest-winston/-/nest-winston-1.7.1.tgz#e6f8866cf7ab17f7c866f59e74de948463274cdd"
+  integrity sha512-wtBxG9/jCDgBV4AV+0l31W/Uc2tx8CiBEhPqK5cNN7u181AaurMdwe2pTNVxwSOtwp2g2mRvhMTLDswma+FQhA==
   dependencies:
     fast-safe-stringify "^2.1.1"
 
