891 be sso implement blocked user status functionality (#1042)

* implementing blocked user status functionallity * changelog and version updated * updated config dev service version * fixing conflict * fixing prettier error * dni of the blockedUser test fixed * Update login.test.ts * Update login.test.ts * added middleware functionality * Update validate.test.ts * update users/getMe and dashboard/users/list * fixing minor tests issues * console log deleted --------- Co-authored-by: roche-tan <rochelyn.rallestan@gmail.com>
IT-Academy-BCN · Mar 14, 2024 · 571c712 · 571c712
1 parent c2023f6
commit 571c712
Show file tree

Hide file tree

Showing 18 changed files with 327 additions and 208 deletions.
diff --git a/services/sso/CHANGELOG.md b/services/sso/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.16.0] - 2024-03-12
+
+### Added
+
+- User `Blocked` status functionality
+
 ## [1.15.1] - 2024-03-07
 
 ### Fixed

diff --git a/services/sso/db/init.sql b/services/sso/db/init.sql
@@ -4,7 +4,7 @@ BEGIN
         CREATE TYPE USER_ROLE AS ENUM ('ADMIN', 'REGISTERED', 'MENTOR');
     END IF;
     IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'user_status') THEN
-        CREATE TYPE USER_STATUS AS ENUM ('ACTIVE', 'INACTIVE');
+        CREATE TYPE USER_STATUS AS ENUM ('ACTIVE', 'INACTIVE', 'BLOCKED');
     END IF;
 END
 $$;

diff --git a/services/sso/openapi.yaml b/services/sso/openapi.yaml
@@ -449,6 +449,7 @@ paths:
                   enum:
                     - ACTIVE
                     - INACTIVE
+                    - BLOCKED
                 itineraryId:
                   type: string
               required:
@@ -635,6 +636,7 @@ paths:
             enum:
               - ACTIVE
               - INACTIVE
+              - BLOCKED
           required: false
           description: Status to filter by
           example: ACTIVE
@@ -685,6 +687,7 @@ paths:
                       enum:
                         - ACTIVE
                         - INACTIVE
+                        - BLOCKED
                     createdAt:
                       type: string
                       example: 21/02/2024

diff --git a/services/sso/package-lock.json b/services/sso/package-lock.json
diff --git a/services/sso/package.json b/services/sso/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sso-service",
-  "version": "1.15.1",
+  "version": "1.16.0",
   "description": "",
   "directories": {
     "test": "test"

diff --git a/services/sso/src/__tests__/auth/login.test.ts b/services/sso/src/__tests__/auth/login.test.ts
@@ -4,70 +4,69 @@ import { server, testUserData } from '../globalSetup'
 import { pathRoot } from '../../routes/routes'
 import { tokenSchema } from '../../schemas/tokens/tokenSchema'
 
+const route = `${pathRoot.v1.auth}/login`
+
 describe('Testing authentication endpoint', () => {
   it('should succeed with correct credentials', async () => {
-    const response = await supertest(server)
-      .post(`${pathRoot.v1.auth}/login`)
-      .send({
-        dni: testUserData.admin.dni,
-        password: testUserData.admin.password,
-      })
+    const response = await supertest(server).post(route).send({
+      dni: testUserData.admin.dni,
+      password: testUserData.admin.password,
+    })
     expect(response.status).toBe(200)
     expect(tokenSchema.safeParse(response.body).success).toBeTruthy()
   })
 
   it('should succeed with correct credentials and uppercase DNI', async () => {
-    const response = await supertest(server)
-      .post(`${pathRoot.v1.auth}/login`)
-      .send({
-        dni: testUserData.admin.dni.toUpperCase(),
-        password: testUserData.admin.password,
-      })
+    const response = await supertest(server).post(route).send({
+      dni: testUserData.admin.dni.toUpperCase(),
+      password: testUserData.admin.password,
+    })
     expect(response.status).toBe(200)
     expect(tokenSchema.safeParse(response.body).success).toBeTruthy()
   })
 
   it('should succeed with correct credentials and lowercase DNI', async () => {
-    const response = await supertest(server)
-      .post(`${pathRoot.v1.auth}/login`)
-      .send({
-        dni: testUserData.admin.dni.toLowerCase(),
-        password: testUserData.admin.password,
-      })
+    const response = await supertest(server).post(route).send({
+      dni: testUserData.admin.dni.toLowerCase(),
+      password: testUserData.admin.password,
+    })
     expect(response.status).toBe(200)
     expect(tokenSchema.safeParse(response.body).success).toBeTruthy()
   })
 
   it('should fail with incorrect password', async () => {
-    const response = await supertest(server)
-      .post(`${pathRoot.v1.auth}/login`)
-      .send({
-        dni: testUserData.admin.dni,
-        password: 'wrong password',
-      })
+    const response = await supertest(server).post(route).send({
+      dni: testUserData.admin.dni,
+      password: 'wrong password',
+    })
     expect(response.status).toBe(401)
     expect(response.body.message).toBe('Invalid Credentials')
   })
 
   it('should fail with user not found', async () => {
-    const response = await supertest(server)
-      .post(`${pathRoot.v1.auth}/login`)
-      .send({
-        dni: '92149467J',
-        password: 'password1',
-      })
+    const response = await supertest(server).post(route).send({
+      dni: '92149467J',
+      password: 'password1',
+    })
     expect(response.status).toBe(401)
     expect(response.body.message).toBe('Invalid Credentials')
   })
 })
 
 it('should fail if user not active', async () => {
-  const response = await supertest(server)
-    .post(`${pathRoot.v1.auth}/login`)
-    .send({
-      dni: testUserData.inactiveUser.dni,
-      password: testUserData.inactiveUser.password,
-    })
+  const response = await supertest(server).post(route).send({
+    dni: testUserData.inactiveUser.dni,
+    password: testUserData.inactiveUser.password,
+  })
   expect(response.status).toBe(403)
   expect(response.body.message).toBe('Only active users can login')
 })
+
+it('should fail if user is blocked', async () => {
+  const response = await supertest(server).post(route).send({
+    dni: testUserData.blockedUser.dni,
+    password: testUserData.blockedUser.password,
+  })
+  expect(response.status).toBe(403)
+  expect(response.body.message).toBe('The user is Blocked')
+})