Преглед изворни кода

:recycle: trim down validate session route further

brian_auth_fix
j пре 2 година
родитељ
комит
a2c564079d
2 измењених фајлова са 8 додато и 15 уклоњено
  1. 7
    10
      backend/lib/routes/user/validate-session.js
  2. 1
    5
      backend/lib/services/user.js

+ 7
- 10
backend/lib/routes/user/validate-session.js Прегледај датотеку

54
                 const sessionTokenIsValid = userService.validateToken(
54
                 const sessionTokenIsValid = userService.validateToken(
55
                     userSession.sessionToken,
55
                     userSession.sessionToken,
56
                 )
56
                 )
57
-                if (sessionTokenIsValid.message) {
58
-                    throw new Error(sessionTokenIsValid.message)
57
+                if (!sessionTokenIsValid) {
58
+                    throw new Error(
59
+                        `Could not validate session token: ${userSession.sessionToken}`,
60
+                    )
59
                 }
61
                 }
60
-                const validatedSessionInfo = sessionTokenIsValid
61
-                    ? userSession
62
-                    : { ...sessionTokenIsValid }
63
-
64
-                if (validatedSessionInfo?.email)
62
+                if (userSession?.email)
65
                     throw new Error(
63
                     throw new Error(
66
                         `Could not validate token based on payload: ${request.payload}`,
64
                         `Could not validate token based on payload: ${request.payload}`,
67
                     )
65
                     )
68
-
69
                 const user = await userService.findByUserEmail(
66
                 const user = await userService.findByUserEmail(
70
-                    validatedSessionInfo.email,
67
+                    userSession.email,
71
                 )
68
                 )
72
                 const type = user.is_poster === 1 ? 'poster' : 'seeker'
69
                 const type = user.is_poster === 1 ? 'poster' : 'seeker'
73
                 const profiles = await profileService.getCompleteProfilesFor(
70
                 const profiles = await profileService.getCompleteProfilesFor(
80
                     ok: true,
77
                     ok: true,
81
                     handler: pluginConfig.handlerType,
78
                     handler: pluginConfig.handlerType,
82
                     data: {
79
                     data: {
83
-                        ...validatedSessionInfo,
80
+                        ...userSession,
84
                         profileId: profileId,
81
                         profileId: profileId,
85
                     },
82
                     },
86
                 }
83
                 }

+ 1
- 5
backend/lib/services/user.js Прегледај датотеку

240
      */
240
      */
241
     validateToken(token) {
241
     validateToken(token) {
242
         const key = process.env.APP_SECRET
242
         const key = process.env.APP_SECRET
243
-        try {
244
-            return JWT.verify(token, key)
245
-        } catch (err) {
246
-            return { payload: null, message: err.message }
247
-        }
243
+        return JWT.verify(token, key)
248
     }
244
     }
249
     removeSession(hashedSessionToken) {
245
     removeSession(hashedSessionToken) {
250
         const userSession = this.activeSessions[hashedSessionToken]
246
         const userSession = this.activeSessions[hashedSessionToken]

Loading…
Откажи
Сачувај