Merge branch 'brian_auth_fix' of fyindr/siimee into dev

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

@@ -59,7 +59,7 @@ module.exports = {
                         `Could not validate session token: ${userSession.sessionToken}`,
                     )
                 }
-                if (userSession?.email)
+                if (!userSession?.email)
                     throw new Error(
                         `Could not validate token based on payload: ${request.payload}`,
                     )
@@ -85,7 +85,7 @@ module.exports = {
                 return {
                     ok: false,
                     handler: pluginConfig.handlerType,
-                    data: { error: err },
+                    data: { error: err.message },
                 }
             }
         },

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

@@ -53,9 +53,8 @@ module.exports = {
                 }
                 // NOTE: When user responds to email,
                 // boolean value is set to true, allowing user back into the survey
-                userService.activeSessions[
-                    hashToMatch
-                ].emailWasRespondedTo = true
+                userService.activeSessions[hashToMatch].emailWasRespondedTo =
+                    true
                 return {
                     ok: true,
                     handler: pluginConfig.handlerType,
@@ -64,12 +63,11 @@ module.exports = {
                     },
                 }
             } catch (err) {
-                console.log('err :=>', err)
                 return {
                     ok: false,
                     handler: pluginConfig.handlerType,
                     data: {
-                        error: err,
+                        error: err.message,
                     },
                 }
             }

frontend/src/router/guards.js

@@ -4,14 +4,12 @@ import { authenticator, currentProfile } from '../services'
 const DEV_MODE = import.meta.env.VITE_DEV == 'true'
 
 async function log(to) {
-    // if (DEV_MODE) {
     if (!currentProfile.isLoggedIn || !currentProfile.isComplete) {
         console.info(
             `[Guard Status debug]: Profile: ${currentProfile.id.value} | Login: ${currentProfile.isLoggedIn} | Complete: ${currentProfile.isComplete}`,
         )
     }
     console.info('[Guard Status debug]: being routed to:', to.fullPath)
-    // }
 }
 
 const loginIfToken = async () => {
@@ -35,7 +33,7 @@ const checkLoginStatus = async (destination, nextCb) => {
     if (DEV_MODE) {
         nextCb()
     } else if (
-        destination.meta.requiresCompleteProfile &&
+        destination.meta.requiresAuth &&
         !currentProfile.isLoggedIn &&
         !currentProfile.isComplete
     ) {

frontend/src/router/index.js

@@ -64,7 +64,7 @@ const routes = [
         path: `/onboarding/`,
         component: OnboardingView,
         name: `OnboardingView`,
-        meta: { requiresAuth: true, requiresCompleteProfile: false },
+        meta: { requiresAuth: false, requiresCompleteProfile: false },
     },
     // We must be able to get to this route BEFORE login to activate the session
     {

frontend/src/services/auth.service.js

@@ -9,10 +9,10 @@ class Authenticator {
         let verification
         try {
             verification = await db.get(`/user/verify/${hashedToken}`)
+            if (verification.error) throw new Error(verification.error)
         } catch (error) {
             console.error(error)
         }
-        console.log('verifiedSession :>> ', verification)
         return verification
     }
     async createToken(req) {
@@ -24,10 +24,10 @@ class Authenticator {
         let validation
         try {
             validation = await db.post('/user/validate-session', hash, true)
+            if (validation.error) throw new Error(validation.error)
         } catch (error) {
             console.error(`Invalid session: ${error}`)
         }
-        console.log('valid Session :>> ', validation)
         return validation
     }
     async authenticateLoginCredentials(credentials) {

frontend/src/views/VerifyView.vue

@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import { currentProfile, authenticator } from '../services'
+import { authenticator } from '../services'
 let hash = null
 export default {
     name: 'VerifyView',
@@ -18,13 +18,12 @@ export default {
             sessionData = await authenticator.verifySession(hash)
             if (!sessionData.hashesMatch)
                 throw new Error('Hash is not in activeSessions!')
-            
             /** Check if session was confirmed and is now valid in guard*/
             this.$router.push('/')
         } catch (err) {
             console.error(err)
         }
-    }
+    },
 }
 </script>