Merge pull request #381 from andrechristikan/development

andrechristikan · web-flow · commit ebcaec826bde · 2023-02-07T11:20:28.000+07:00
Development
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -7,7 +7,7 @@ updates:
       interval: "monthly"
       day: tuesday
       time: "01:00"
-    open-pull-requests-limit: 5
+    open-pull-requests-limit: 3
     target-branch: "development"
     commit-message:
       prefix: "npm"
@@ -19,9 +19,9 @@ updates:
       interval: "monthly"
       day: tuesday
       time: "00:00"
-    open-pull-requests-limit: 5
+    open-pull-requests-limit: 3
     target-branch: "development"
     commit-message:
       prefix: "github-action"
     labels:
-      - dependabot
+      - dependabot
diff --git a/README.md b/README.md
@@ -66,7 +66,7 @@
 
 Next development
 
-* Validation guard change to pipe
+* [ ] Validation guard change to pipe
 * [ ] SSO
     * [ ] Google
     * [ ] Apple
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ack-nestjs-boilerplate",
-  "version": "4.2.6",
+  "version": "4.3.0",
   "description": "Ack NestJs Boilerplate",
   "repository": {
     "type": "git",
@@ -52,19 +52,19 @@
     "rollback": "yarn rollback:setting && yarn rollback:apikey && yarn rollback:user && yarn rollback:role && yarn rollback:permission"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.264.0",
+    "@aws-sdk/client-s3": "^3.266.0",
     "@faker-js/faker": "^7.6.0",
     "@joi/date": "^2.1.0",
     "@nestjs/axios": "^2.0.0",
-    "@nestjs/common": "^9.2.1",
+    "@nestjs/common": "^9.3.3",
     "@nestjs/config": "^2.3.0",
-    "@nestjs/core": "^9.2.1",
+    "@nestjs/core": "^9.3.3",
     "@nestjs/jwt": "^10.0.1",
     "@nestjs/mongoose": "^9.2.1",
     "@nestjs/passport": "^9.0.1",
-    "@nestjs/platform-express": "^9.2.1",
+    "@nestjs/platform-express": "^9.3.3",
     "@nestjs/schedule": "^2.2.0",
-    "@nestjs/swagger": "^6.1.4",
+    "@nestjs/swagger": "^6.2.1",
     "@nestjs/terminus": "^9.2.0",
     "@types/response-time": "^2.3.5",
     "bcryptjs": "^2.4.3",
@@ -76,7 +76,7 @@
     "helmet": "^6.0.1",
     "joi": "^17.7.0",
     "moment": "^2.29.4",
-    "mongoose": "^6.9.0",
+    "mongoose": "^6.9.1",
     "morgan": "^1.10.0",
     "nest-winston": "^1.8.0",
     "nestjs-command": "^3.1.3",
@@ -99,27 +99,27 @@
   "devDependencies": {
     "@nestjs/cli": "^9.2.0",
     "@nestjs/schematics": "^9.0.4",
-    "@nestjs/testing": "^9.2.1",
+    "@nestjs/testing": "^9.3.3",
     "@types/bcryptjs": "^2.4.2",
     "@types/bytes": "^3.1.1",
     "@types/cors": "^2.8.13",
     "@types/cron": "^2.0.0",
     "@types/crypto-js": "^4.1.1",
-    "@types/express": "^4.17.16",
+    "@types/express": "^4.17.17",
     "@types/express-rate-limit": "^6.0.0",
     "@types/jest": "^29.4.0",
     "@types/lodash": "^4.14.191",
     "@types/morgan": "^1.9.4",
     "@types/ms": "^0.7.31",
     "@types/multer": "^1.4.7",
-    "@types/node": "^18.11.18",
+    "@types/node": "^18.11.19",
     "@types/passport-jwt": "^3.0.8",
     "@types/supertest": "^2.0.12",
     "@types/ua-parser-js": "^0.7.36",
     "@types/uuid": "^9.0.0",
-    "@typescript-eslint/eslint-plugin": "^5.50.0",
-    "@typescript-eslint/parser": "^5.50.0",
-    "cspell": "^6.21.0",
+    "@typescript-eslint/eslint-plugin": "^5.51.0",
+    "@typescript-eslint/parser": "^5.51.0",
+    "cspell": "^6.22.0",
     "eslint": "^8.33.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-import": "^2.27.5",
diff --git a/src/modules/role/controllers/role.admin.controller.ts b/src/modules/role/controllers/role.admin.controller.ts
@@ -387,7 +387,6 @@ export class RoleAdminController {
 
     @RoleAccessForDoc()
     @Response('role.accessFor', { serialization: RoleAccessForSerialization })
-    @RequestParamGuard(RoleRequestDto)
     @AuthPermissionProtected(ENUM_AUTH_PERMISSIONS.ROLE_READ)
     @AuthJwtAdminAccessProtected()
     @Get('/access-for')
diff --git a/src/modules/user/controllers/user.public.controller.ts b/src/modules/user/controllers/user.public.controller.ts
@@ -8,8 +8,8 @@ import {
 } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
 import {
-    AuthJwtAccessProtected,
     AuthJwtPayload,
+    AuthJwtPublicAccessProtected,
 } from 'src/common/auth/decorators/auth.jwt.decorator';
 import { AuthService } from 'src/common/auth/services/auth.service';
 import { ENUM_ERROR_STATUS_CODE_ERROR } from 'src/common/error/constants/error.status-code.constant';
@@ -100,7 +100,7 @@ export class UserPublicController {
 
     @UserDeleteSelfDoc()
     @Response('user.deleteSelf')
-    @AuthJwtAccessProtected()
+    @AuthJwtPublicAccessProtected()
     @Delete('/delete')
     async deleteSelf(@AuthJwtPayload('_id') _id: string): Promise<void> {
         try {
diff --git a/src/modules/user/interfaces/user.service.interface.ts b/src/modules/user/interfaces/user.service.interface.ts
@@ -95,6 +95,8 @@ export interface IUserService {
 
     blocked(_id: string, options?: IDatabaseOptions): Promise<UserEntity>;
 
+    unblocked(_id: string, options?: IDatabaseOptions): Promise<UserEntity>;
+
     maxPasswordAttempt(
         _id: string,
         options?: IDatabaseOptions
diff --git a/src/modules/user/services/user.service.ts b/src/modules/user/services/user.service.ts
@@ -248,6 +248,21 @@ export class UserService implements IUserService {
         );
     }
 
+    async unblocked(
+        _id: string,
+        options?: IDatabaseOptions
+    ): Promise<UserEntity> {
+        const dto: UserBlockedDto = new UserBlockedDto();
+        dto.blocked = false;
+        dto.blockedDate = undefined;
+
+        return this.userRepository.updateOneById<UserBlockedDto>(
+            _id,
+            dto,
+            options
+        );
+    }
+
     async maxPasswordAttempt(
         _id: string,
         options?: IDatabaseOptions
diff --git a/test/e2e/role/role.admin.e2e-spec.ts b/test/e2e/role/role.admin.e2e-spec.ts
@@ -2,6 +2,7 @@ import { HttpStatus, INestApplication } from '@nestjs/common';
 import { Test } from '@nestjs/testing';
 import request from 'supertest';
 import {
+    E2E_ROLE_ACCESS_FOR_URL,
     E2E_ROLE_ADMIN_ACTIVE_URL,
     E2E_ROLE_ADMIN_CREATE_URL,
     E2E_ROLE_ADMIN_DELETE_URL,
@@ -484,4 +485,14 @@ describe('E2E Role Admin', () => {
         expect(response.status).toEqual(HttpStatus.OK);
         expect(response.body.statusCode).toEqual(HttpStatus.OK);
     });
+
+    it(`GET ${E2E_ROLE_ACCESS_FOR_URL} Access For Success`, async () => {
+        const response = await request(app.getHttpServer())
+            .get(E2E_ROLE_ACCESS_FOR_URL)
+            .set('Authorization', `Bearer ${accessToken}`)
+            .set('x-permission-token', permissionToken);
+
+        expect(response.status).toEqual(HttpStatus.OK);
+        expect(response.body.statusCode).toEqual(HttpStatus.OK);
+    });
 });
diff --git a/test/e2e/role/role.constant.ts b/test/e2e/role/role.constant.ts
@@ -7,3 +7,4 @@ export const E2E_ROLE_ADMIN_UPDATE_PERMISSION_URL =
 export const E2E_ROLE_ADMIN_DELETE_URL = '/admin/role/delete/:_id';
 export const E2E_ROLE_ADMIN_INACTIVE_URL = '/admin/role/update/:_id/inactive';
 export const E2E_ROLE_ADMIN_ACTIVE_URL = '/admin/role/update/:_id/active';
+export const E2E_ROLE_ACCESS_FOR_URL = '/admin/role/access-for';
diff --git a/test/e2e/user/user.admin.e2e-spec.ts b/test/e2e/user/user.admin.e2e-spec.ts
@@ -4,6 +4,7 @@ import request from 'supertest';
 import { faker } from '@faker-js/faker';
 import {
     E2E_USER_ADMIN_ACTIVE_URL,
+    E2E_USER_ADMIN_BLOCKED_URL,
     E2E_USER_ADMIN_CREATE_URL,
     E2E_USER_ADMIN_DELETE_URL,
     E2E_USER_ADMIN_EXPORT_URL,
@@ -398,6 +399,33 @@ describe('E2E User Admin', () => {
         );
     });
 
+    it(`PATCH ${E2E_USER_ADMIN_BLOCKED_URL} Blocked, Not Found`, async () => {
+        const response = await request(app.getHttpServer())
+            .patch(
+                E2E_USER_ADMIN_BLOCKED_URL.replace(
+                    ':_id',
+                    `${DatabaseDefaultUUID()}`
+                )
+            )
+            .set('Authorization', `Bearer ${accessToken}`)
+            .set('x-permission-token', permissionToken);
+
+        expect(response.status).toEqual(HttpStatus.NOT_FOUND);
+        expect(response.body.statusCode).toEqual(
+            ENUM_USER_STATUS_CODE_ERROR.USER_NOT_FOUND_ERROR
+        );
+    });
+
+    it(`PATCH ${E2E_USER_ADMIN_BLOCKED_URL} Blocked, success`, async () => {
+        const response = await request(app.getHttpServer())
+            .patch(E2E_USER_ADMIN_BLOCKED_URL.replace(':_id', userData._id))
+            .set('Authorization', `Bearer ${accessToken}`)
+            .set('x-permission-token', permissionToken);
+
+        expect(response.status).toEqual(HttpStatus.OK);
+        expect(response.body.statusCode).toEqual(HttpStatus.OK);
+    });
+
     it(`DELETE ${E2E_USER_ADMIN_DELETE_URL} Delete, Not Found`, async () => {
         const response = await request(app.getHttpServer())
             .delete(
diff --git a/test/e2e/user/user.constant.ts b/test/e2e/user/user.constant.ts
@@ -9,6 +9,7 @@ export const E2E_USER_ADMIN_UPDATE_URL = '/admin/user/update/:_id';
 export const E2E_USER_ADMIN_DELETE_URL = '/admin/user/delete/:_id';
 export const E2E_USER_ADMIN_IMPORT_URL = '/admin/user/import';
 export const E2E_USER_ADMIN_EXPORT_URL = '/admin/user/export';
+export const E2E_USER_ADMIN_BLOCKED_URL = '/admin/user/update/:_id/blocked';
 
 export const E2E_USER_PROFILE_URL = '/user/profile';
 export const E2E_USER_PROFILE_UPLOAD_URL = '/user/profile/upload';
@@ -19,6 +20,7 @@ export const E2E_USER_INFO = '/user/info';
 export const E2E_USER_GRANT_PERMISSION = '/user/grant-permission';
 
 export const E2E_USER_PUBLIC_SIGN_UP_URL = '/public/user/sign-up';
+export const E2E_USER_PUBLIC_DELETE_URL = '/public/user/delete';
 
 export const E2E_USER_ACCESS_TOKEN_PAYLOAD_TEST = {
     role: '613ee8e5b2fdd012b94484cb',
diff --git a/test/e2e/user/user.login.e2e-spec.ts b/test/e2e/user/user.login.e2e-spec.ts
@@ -170,6 +170,26 @@ describe('E2E User Login', () => {
         await userService.resetPasswordAttempt(user._id);
     });
 
+    it(`POST ${E2E_USER_LOGIN_URL} Blocked`, async () => {
+        await userService.blocked(user._id);
+
+        const response = await request(app.getHttpServer())
+            .post(E2E_USER_LOGIN_URL)
+            .set('Content-Type', 'application/json')
+            .send({
+                username: user.username,
+                password,
+                rememberMe: false,
+            });
+
+        await userService.unblocked(user._id);
+
+        expect(response.status).toEqual(HttpStatus.FORBIDDEN);
+        expect(response.body.statusCode).toEqual(
+            ENUM_USER_STATUS_CODE_ERROR.USER_BLOCKED_ERROR
+        );
+    });
+
     it(`POST ${E2E_USER_LOGIN_URL} Inactive`, async () => {
         await userService.inactive(user._id);
 
diff --git a/test/e2e/user/user.public.e2e-spec.ts b/test/e2e/user/user.public.e2e-spec.ts
@@ -7,13 +7,22 @@ import { useContainer } from 'class-validator';
 import { UserService } from 'src/modules/user/services/user.service';
 import { CommonModule } from 'src/common/common.module';
 import { RoutesPublicModule } from 'src/router/routes/routes.public.module';
-import { E2E_USER_PUBLIC_SIGN_UP_URL } from './user.constant';
+import {
+    E2E_USER_PUBLIC_DELETE_URL,
+    E2E_USER_PUBLIC_SIGN_UP_URL,
+} from './user.constant';
 import { ENUM_REQUEST_STATUS_CODE_ERROR } from 'src/common/request/constants/request.status-code.constant';
 import { ENUM_USER_STATUS_CODE_ERROR } from 'src/modules/user/constants/user.status-code.constant';
+import { IUserEntity } from 'src/modules/user/interfaces/user.interface';
+import { plainToInstance } from 'class-transformer';
+import { UserPayloadSerialization } from 'src/modules/user/serializations/user.payload.serialization';
+import { AuthModule } from 'src/common/auth/auth.module';
+import { AuthService } from 'src/common/auth/services/auth.service';
 
 describe('E2E User Public', () => {
     let app: INestApplication;
     let userService: UserService;
+    let authService: AuthService;
 
     const password = `@!aaAA@123`;
     let userData: Record<string, any>;
@@ -25,6 +34,7 @@ describe('E2E User Public', () => {
             imports: [
                 CommonModule,
                 RoutesPublicModule,
+                AuthModule,
                 RouterModule.register([
                     {
                         path: '/public',
@@ -37,6 +47,7 @@ describe('E2E User Public', () => {
         app = modRef.createNestApplication();
         useContainer(app.select(CommonModule), { fallbackOnErrors: true });
         userService = app.get(UserService);
+        authService = app.get(AuthService);
 
         userData = {
             firstName: faker.name.firstName(),
@@ -139,4 +150,24 @@ describe('E2E User Public', () => {
             ENUM_USER_STATUS_CODE_ERROR.USER_MOBILE_NUMBER_EXIST_ERROR
         );
     });
+
+    it(`DELETE ${E2E_USER_PUBLIC_DELETE_URL} Success`, async () => {
+        const user = await userService.findOneByUsername<IUserEntity>(
+            userData.username,
+            {
+                join: true,
+            }
+        );
+        const map = plainToInstance(UserPayloadSerialization, user);
+        const payload = await authService.createPayloadAccessToken(map, false);
+        const accessToken = await authService.createAccessToken(payload);
+
+        const response = await request(app.getHttpServer())
+            .delete(E2E_USER_PUBLIC_DELETE_URL)
+            .set('Content-Type', 'application/json')
+            .set('Authorization', `Bearer ${accessToken}`);
+
+        expect(response.status).toEqual(HttpStatus.OK);
+        expect(response.body.statusCode).toEqual(HttpStatus.OK);
+    });
 });
diff --git a/test/e2e/user/user.refresh.e2e-spec.ts b/test/e2e/user/user.refresh.e2e-spec.ts
@@ -141,6 +141,21 @@ describe('E2E User Refresh', () => {
         );
     });
 
+    it(`POST ${E2E_USER_REFRESH_URL} Blocked`, async () => {
+        await userService.blocked(user._id);
+
+        const response = await request(app.getHttpServer())
+            .post(E2E_USER_REFRESH_URL)
+            .set('Authorization', `Bearer ${refreshToken}`);
+
+        await userService.unblocked(user._id);
+
+        expect(response.status).toEqual(HttpStatus.FORBIDDEN);
+        expect(response.body.statusCode).toEqual(
+            ENUM_USER_STATUS_CODE_ERROR.USER_BLOCKED_ERROR
+        );
+    });
+
     it(`POST ${E2E_USER_REFRESH_URL} Inactive`, async () => {
         await userService.inactive(user._id);
 
diff --git a/yarn.lock b/yarn.lock
