:recycle: collapse session validation check in route

backend/lib/routes/user/validate-session.js

@@ -31,8 +31,33 @@ module.exports = {
             const hashedSessionToken = request.payload
             const { userService, profileService } = request.server.services()
             try {
-                const validatedSessionInfo =
-                    userService.validateSession(hashedSessionToken)
+                if (!hashedSessionToken) {
+                    throw new Error('hashedSessionToken not passed!')
+                }
+                const userSession =
+                    userService.activeSessions[hashedSessionToken]
+                if (!userSession) {
+                    throw new Error(
+                        'hashedSessionToken not in activeSessions registry!',
+                    )
+                }
+                if (!userSession.emailWasRespondedTo) {
+                    throw new Error(
+                        `Email was never responded to! ${userSession.emailWasRespondedTo}`,
+                    )
+                }
+                if (!userSession.sessionToken) {
+                    throw new Error(
+                        `No session token in userSession ${userSession.sessionToken}`,
+                    )
+                }
+                const sessionTokenIsValid = userService.validateToken(
+                    userSession.sessionToken,
+                )
+                const validatedSessionInfo = sessionTokenIsValid
+                    ? userSession
+                    : { ...sessionTokenIsValid.payload }
+
                 if (validatedSessionInfo?.email)
                     throw new Error(
                         `Could not validate token based on payload: ${request.payload}`,

backend/lib/services/user.js

@@ -252,31 +252,7 @@ module.exports = class UserService extends Schmervice.Service {
      * @param {HashedSessionToken} hashedSessionToken
      * @returns {PayloadFromActiveSessions}
      */
-    validateSession(hashedSessionToken) {
-        if (!hashedSessionToken) {
-            throw new Error('hashedSessionToken not passed!')
-        }
-        const userSession = this.activeSessions[hashedSessionToken]
-        if (!userSession) {
-            throw new Error(
-                'hashedSessionToken not in activeSessions registry!',
-            )
-        }
-        if (!userSession.emailWasRespondedTo) {
-            throw new Error('email was never responded to!')
-        }
-        const sessionToken = userSession.sessionToken
-        if (!sessionToken) {
-            throw new Error('No session token in userSession')
-        }
-        const sessionTokenIsValid = this.validateToken(sessionToken)
-        return sessionTokenIsValid
-            ? {
-                  sessionToken,
-                  email: this.activeSessions[hashedSessionToken].email,
-              }
-            : { ...sessionTokenIsValid.payload }
-    }
+    validateSession(hashedSessionToken) {}
     removeSession(hashedSessionToken) {
         const userSession = this.activeSessions[hashedSessionToken]
         if (!userSession) {