send role to app from api b00tc4mp#485

juditta99 · Jun 17, 2024 · 3b54c1e · 3b54c1e
1 parent 9c68718
commit 3b54c1e
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/staff/judy-grayland/project/api/handlers/authenticateUserHandler.js b/staff/judy-grayland/project/api/handlers/authenticateUserHandler.js
@@ -9,11 +9,12 @@ export default (req, res) => {
   try {
     logic
       .authenticateUser(email, password)
-      .then((userId) => {
-        const token = jwt.sign({ sub: userId }, process.env.JWT_SECRET, {
+      .then((user) => {
+        const token = jwt.sign({ sub: user.id }, process.env.JWT_SECRET, {
           expiresIn: process.env.JWT_EXP,
         })
-        res.json({ token })
+        const role = user.role
+        res.json({ token, role })
         res.send()
       })
       .catch((error) => {

diff --git a/staff/judy-grayland/project/api/logic/authenticateUser.js b/staff/judy-grayland/project/api/logic/authenticateUser.js
@@ -29,7 +29,8 @@ function authenticateUser(email, password) {
           if (!match) {
             throw new CredentialsError('wrong password')
           }
-          return user.id
+
+          return user
         })
     })
 }

diff --git a/staff/judy-grayland/project/app/src/logic/authenticateUser.js b/staff/judy-grayland/project/app/src/logic/authenticateUser.js
@@ -45,7 +45,7 @@ function authenticateUser(email, password) {
 
       res
         .json()
-        .then(({ token }) => {
+        .then(({ token, role }) => {
           const payloadB64 = token.slice(
             token.indexOf('.') + 1,
             token.lastIndexOf('.')
@@ -57,6 +57,7 @@ function authenticateUser(email, password) {
 
           context.sessionUserId = userId
           context.token = token
+          context.role = role
         })
         .catch((error) => {
           throw new SystemError(error)

diff --git a/staff/judy-grayland/project/app/src/logic/context.js b/staff/judy-grayland/project/app/src/logic/context.js
@@ -22,6 +22,18 @@ const context = {
   get token() {
     return sessionStorage.token ? sessionStorage.token : null
   },
+
+  set role(role) {
+    if (role) {
+      sessionStorage.role = role
+    } else {
+      delete sessionStorage.role
+    }
+  },
+
+  get role() {
+    return sessionStorage.role ? sessionStorage.role : null
+  },
 }
 
 export default context