add createGroups, retrieveAllGroups and assignGroups logics | modify …

…retrieveFiles with shared groups functio | testing HTML and SPECT b00tc4mp#361
abelpriem · Mar 24, 2024 · bff8570 · bff8570
1 parent 6b87f5a
commit bff8570
Show file tree

Hide file tree

Showing 33 changed files with 579 additions and 46 deletions.
diff --git a/staff/abel-prieto/PROYECT/API/README.md b/staff/abel-prieto/PROYECT/API/README.md
@@ -63,20 +63,40 @@
 
 `Register Admin` ✅
 - Request: POST /admin Authorization: Bearer ${session.token}
-- Response: 201
+- Response: 201 "Content-Type": application/json { username, email, password }
 - Response (error) : 500|409|406|401 "Content-Type": application/json { error, message } 
 
+`Retrieve All User` ✅
+- Request: GET /admin/users/all Authorization: Bearer ${session.token}
+- Response: 200 
+- Response (error) : 500|404|406 "Content-Type": application/json { error, message }
+
+`Retrieve All Groups` ✅
+- Request: GET /admin/groups/all Authorization: Bearer ${session.token}
+- Response: 200 
+- Response (error) : 500|404|406 "Content-Type": application/json { error, message }
+
 `Delete User` ✅
-- Request: DELETE /users/:userId Authorization: Bearer ${session.token}
+- Request: DELETE /admin/users/:userId Authorization: Bearer ${session.token}
 - Response: 200 
 - Response (error): 500|404|406|401 "Content-Type": application/json { error, message }
 
-`Create Commands` ✅
+`Create Commands` ✅ (PENDING v1.0)
 - Request: POST /admin/commands Authorization: Bearer ${session.token}
-- Response: 201
+- Response: 201 "Content-Type": application/json { command_name }
 - Response (error) : 500|409|406|401 "Content-Type": application/json { error, message } 
 
 `Create Groups` ✅
 - Request: POST /admin/groups Authorization: Bearer ${session.token}
-- Response: 201
-- Response (error) : 500|409|406|401 "Content-Type": application/json { error, message } 
+- Response: 201 "Content-Type": application/json { group_name }
+- Response (error) : 500|409|406|401 "Content-Type": application/json { error, message } 
+
+`Assign Groups` ✅
+- Request: PATCH /admin/groups/edit Authorization: Bearer ${session.token}
+- Response: 200
+- Response (error) : 500|409|406|401 "Content-Type": application/json { error, message } 
+
+`Delete Groups` 
+- Request: DELETE /admin/groups/delete/:groupId Authorization: Bearer ${session.token}
+- Response: 200
+- Response (error) : 500|409|406|401 "Content-Type": application/json { error, message }
diff --git a/staff/abel-prieto/PROYECT/API/handlers/assignGroupsHandler.js b/staff/abel-prieto/PROYECT/API/handlers/assignGroupsHandler.js
@@ -0,0 +1,42 @@
+import jwt from 'jsonwebtoken'
+import assignGroups from '../logic/assignGroups.js'
+import { errors } from 'com'
+const { JsonWebTokenError } = jwt
+const { NotFoundError, AuthorizationError, ContentError, TokenError, DuplicityError } = errors
+
+export default async (req, res) => {
+    const token = req.headers.authorization.substring(7)
+    const { sub: userId } = jwt.verify(token, process.env.JWT_SECRET)
+
+    const { selectedGroupId, selectedUserId } = req.body
+
+    try {
+        await assignGroups(userId, selectedUserId, selectedGroupId)
+        res.status(200).send()
+    } catch (error) {
+        let status = 500
+
+        if (error instanceof AuthorizationError) {
+            status = 401
+        }
+
+        if (error instanceof NotFoundError) {
+            status = 404
+        }
+
+        if (error instanceof DuplicityError) {
+            status = 406
+        }
+
+        if (error instanceof TypeError || error instanceof ContentError) {
+            status = 409
+        }
+
+        if (error instanceof JsonWebTokenError) {
+            status = 401
+            error = new TokenError(error.message)
+        }
+
+        res.status(status).json({ error: error.constructor.name, message: error.message })
+    }
+}
diff --git a/staff/abel-prieto/PROYECT/API/handlers/authenticateUserHandler.js b/staff/abel-prieto/PROYECT/API/handlers/authenticateUserHandler.js
@@ -22,7 +22,7 @@ export default (req, res) => {
                 }
 
                 if (error instanceof CredentialsError) {
-                    status = 401
+                    status = 406
                 }
 
                 res.status(status).json({ error: error.constructor.name, message: error.message })
@@ -31,7 +31,8 @@ export default (req, res) => {
         let status = 500
 
         if (error instanceof ContentError || error instanceof TypeError) {
-            status = 406
+            status = 409
+
         } else if (error instanceof JsonWebTokenError) {
             status = 401
             error = new TokenError(error.message)

diff --git a/staff/abel-prieto/PROYECT/API/handlers/changeUserPasswordHandler.js b/staff/abel-prieto/PROYECT/API/handlers/changeUserPasswordHandler.js
@@ -30,7 +30,8 @@ export default (req, res) => {
         let status = 500
 
         if (error instanceof TypeError || error instanceof ContentError) {
-            status = 409
+            statusss = 409
+            s
         } else if (error instanceof JsonWebTokenError) {
             status = 401
             error = new TokenError(error.message)

diff --git a/staff/abel-prieto/PROYECT/API/handlers/createGroupHandler.js b/staff/abel-prieto/PROYECT/API/handlers/createGroupHandler.js
@@ -0,0 +1,39 @@
+import jwt from 'jsonwebtoken'
+import createGroup from "../logic/createGroup.js"
+import { errors } from 'com'
+const { NotFoundError, ContentError, AuthorizationError, TokenError } = errors
+const { JsonWebTokenError } = jwt
+
+export default async (req, res) => {
+    const token = req.headers.authorization.substring(7)
+    const { sub: userId } = jwt.verify(token, process.env.JWT_SECRET)
+
+    const { group } = req.body
+
+    try {
+        await createGroup(userId, group)
+        res.status(201).send()
+
+    } catch (error) {
+        let status = 500
+
+        if (error instanceof AuthorizationError) {
+            status = 401
+        }
+
+        if (error instanceof NotFoundError) {
+            status = 404
+        }
+
+        if (error instanceof TypeError || error instanceof ContentError) {
+            status = 409
+        }
+
+        if (error instanceof JsonWebTokenError) {
+            status = 401
+            error = new TokenError(error.message)
+        }
+
+        res.status(status).json({ error: error.constructor.name, message: error.message })
+    }
+}
diff --git a/staff/abel-prieto/PROYECT/API/handlers/deleteFileHandler.js b/staff/abel-prieto/PROYECT/API/handlers/deleteFileHandler.js
@@ -25,7 +25,7 @@ export default async (req, res) => {
         }
 
         if (error instanceof TypeError || error instanceof ContentError) {
-            status = 406
+            status = 409
         }
 
         if (error instanceof JsonWebTokenError) {

diff --git a/staff/abel-prieto/PROYECT/API/handlers/deleteUsersHandler.js b/staff/abel-prieto/PROYECT/API/handlers/deleteUsersHandler.js
@@ -10,10 +10,10 @@ export default async (req, res) => {
     const token = req.headers.authorization.substring(7)
     const { sub: userId } = jwt.verify(token, process.env.JWT_SECRET)
 
-    const { userToDelete } = req.params
+    const { deleteUser } = req.params
 
     try {
-        await deleteUsers(userId, userToDelete)
+        await deleteUsers(userId, deleteUser)
         res.status(201).send()
 
     } catch (error) {
@@ -24,11 +24,11 @@ export default async (req, res) => {
         }
 
         if (error instanceof ContentError || error instanceof TypeError) {
-            status = 406
+            status = 409
         }
 
         if (error instanceof AuthorizationError) {
-            status = 409
+            status = 401
         }
 
         if (error instanceof JsonWebTokenError) {

diff --git a/staff/abel-prieto/PROYECT/API/handlers/downloadFileHandler.js b/staff/abel-prieto/PROYECT/API/handlers/downloadFileHandler.js
@@ -24,7 +24,7 @@ export default async (req, res, next) => {
         }
 
         if (error instanceof ContentError || error instanceof TypeError) {
-            status = 406
+            status = 409
         }
 
         if (error instanceof AuthorizationError) {

diff --git a/staff/abel-prieto/PROYECT/API/handlers/index.js b/staff/abel-prieto/PROYECT/API/handlers/index.js
@@ -13,6 +13,9 @@ import deleteFileHandler from './deleteFileHandler.js'
 import retrieveAllUsersHandler from './retrieveAllUsersHandler.js'
 import deleteUsersHandler from './deleteUsersHandler.js'
 import registerAdminHandler from './registerAdminHandler.js'
+import createGroupHandler from './createGroupHandler.js'
+import retrieveAllGroupsHandler from './retrieveAllGroupsHandler.js'
+import assignGroupsHandler from './assignGroupsHandler.js'
 
 export {
     authenticateUserHandler,
@@ -29,5 +32,8 @@ export {
 
     retrieveAllUsersHandler,
     deleteUsersHandler,
-    registerAdminHandler
+    registerAdminHandler,
+    createGroupHandler,
+    retrieveAllGroupsHandler,
+    assignGroupsHandler
 }
diff --git a/staff/abel-prieto/PROYECT/API/handlers/registerAdminHandler.js b/staff/abel-prieto/PROYECT/API/handlers/registerAdminHandler.js
@@ -27,11 +27,11 @@ export default async (req, res) => {
         }
 
         if (error instanceof ContentError || error instanceof TypeError) {
-            status = 406
+            status = 409
         }
 
         if (error instanceof JsonWebTokenError) {
-            status = 409
+            status = 401
             error = new TokenError(error.message)
         }
 

diff --git a/staff/abel-prieto/PROYECT/API/handlers/registerUserHandler.js b/staff/abel-prieto/PROYECT/API/handlers/registerUserHandler.js
@@ -3,9 +3,9 @@ import { errors } from 'com'
 const { DuplicityError, ContentError } = errors
 
 export default (req, res) => {
-    try {
-        const { username, email, password } = req.body
+    const { username, email, password } = req.body
 
+    try {
         registerUser(username, email, password)
             .then(() => res.status(201).send())
             .catch(error => {
@@ -21,7 +21,7 @@ export default (req, res) => {
         let status = 500
 
         if (error instanceof ContentError || error instanceof TypeError) {
-            status = 406
+            status = 409
         }
 
         res.status(status).json({ error: error.constructor.name, message: error.message })

diff --git a/staff/abel-prieto/PROYECT/API/handlers/retrieveAllGroupsHandler.js b/staff/abel-prieto/PROYECT/API/handlers/retrieveAllGroupsHandler.js
@@ -0,0 +1,38 @@
+import jwt from 'jsonwebtoken'
+import retrieveAllGroups from '../logic/retrieveAllGroups.js'
+import { errors } from 'com'
+
+const { JsonWebTokenError } = jwt
+const { NotFoundError, AuthorizationError, TokenError, ContentError } = errors
+
+export default async (req, res) => {
+    const token = req.headers.authorization.substring(7)
+    const { sub: userId } = jwt.verify(token, process.env.JWT_SECRET)
+
+    try {
+        const allGroups = await retrieveAllGroups(userId)
+        res.json(allGroups)
+
+    } catch (error) {
+        let status = 500
+
+        if (error instanceof NotFoundError) {
+            status = 404
+        }
+
+        if (error instanceof ContentError || error instanceof TypeError) {
+            status = 409
+        }
+
+        if (error instanceof AuthorizationError) {
+            status = 401
+        }
+
+        if (error instanceof JsonWebTokenError) {
+            status = 401
+            error = new TokenError(error.message)
+        }
+
+        res.status(status).json({ error: error.constructor.name, message: error.message })
+    }
+}
diff --git a/staff/abel-prieto/PROYECT/API/handlers/retrieveAllUsersHandler.js b/staff/abel-prieto/PROYECT/API/handlers/retrieveAllUsersHandler.js
@@ -22,11 +22,11 @@ export default async (req, res) => {
         }
 
         if (error instanceof ContentError || error instanceof TypeError) {
-            status = 406
+            status = 409
         }
 
         if (error instanceof AuthorizationError) {
-            status = 409
+            status = 401
         }
 
         if (error instanceof JsonWebTokenError) {

diff --git a/staff/abel-prieto/PROYECT/API/handlers/retrieveFilesHandler.js b/staff/abel-prieto/PROYECT/API/handlers/retrieveFilesHandler.js
@@ -21,7 +21,7 @@ export default async (req, res) => {
         }
 
         if (error instanceof ContentError || error instanceof TypeError) {
-            status = 406
+            status = 409
         }
 
         if (error instanceof JsonWebTokenError) {

diff --git a/staff/abel-prieto/PROYECT/API/handlers/retrieveGuestHandler.js b/staff/abel-prieto/PROYECT/API/handlers/retrieveGuestHandler.js
@@ -19,7 +19,7 @@ export default (req, res) => {
         let status = 500
 
         if (error instanceof ContentError || error instanceof TypeError) {
-            status = 406
+            status = 409
         }
 
         res.status(status).json({ error: error.constructor.name, message: error.message })

diff --git a/staff/abel-prieto/PROYECT/API/handlers/retrieveUserHandler.js b/staff/abel-prieto/PROYECT/API/handlers/retrieveUserHandler.js
@@ -24,7 +24,8 @@ export default (req, res) => {
         let status = 500
 
         if (error instanceof ContentError || error instanceof TypeError) {
-            status = 406
+            status = 409
+
         } else if (error instanceof JsonWebTokenError) {
             status = 401
 

diff --git a/staff/abel-prieto/PROYECT/API/handlers/uploadFileHandler.js b/staff/abel-prieto/PROYECT/API/handlers/uploadFileHandler.js
@@ -23,11 +23,11 @@ export default async (req, res) => {
             status = 404
 
         if (error instanceof ContentError || error instanceof TypeError) {
-            status = 406
+            status = 409
         }
 
         if (error instanceof DuplicityError) {
-            status = 409
+            status = 406
         }
 
         if (error instanceof JsonWebTokenError) {