:pencil2: Cleaned up OnboardingView into methods, works the same as before thus far

backend/lib/routes/user/getaccess.js

@@ -29,7 +29,7 @@ module.exports = {
             const token = await userService.createToken({
                 ...res,
                 // NOTE: Set Expiration Time for Access Token Here
-                expires: 60 * 3,
+                expires: 60 * 10,
             })
             try {
                 const response = h.response({

backend/lib/routes/user/getsession.js

@@ -29,7 +29,7 @@ module.exports = {
             const token = await userService.createToken({
                 ...res,
                 // NOTE: Set Expiration Time for Session Token Here
-                expires: 60 * 3,
+                expires: 60 * 10,
             })
             try {
                 const response = h.response({

backend/lib/services/user.js

@@ -308,11 +308,6 @@ module.exports = class UserService extends Schmervice.Service {
         if (emailIsRegistered && !emailIsExpired) {
             return true
         } else {
-            // try {
-            // delete this.hashedEmails[hashedEmail]
-            // } catch (err) {
-            // console.error('ERROR :=>', err)
-            // }
             return false
         }
     }
@@ -326,8 +321,8 @@ module.exports = class UserService extends Schmervice.Service {
         if (Object.keys(this.hashedEmails).includes(hashedEmail)) {
             return new Error('email address already in cache!!')
         }
-        // Set expiration time for five minutes from now
-        const duration = 1000 * 60 * 5
+        // Set expiration time for ten minutes from now
+        const duration = 1000 * 60 * 10
 
         this.hashedEmails[hashedEmail] = Date.now() + duration
         const sendSmtpEmail = {

frontend/src/services/auth.service.js

@@ -7,6 +7,7 @@ class Authenticator {
     async sendAuthEmail(answered) {
         return await db.post('/user/sendemail/', answered)
     }
+    // NOTE: doesn't have to be a POST request, could be a GET with token instead of email
     async checkIfEmailIsRegistered(email) {
         return await db.post('/user/checkemailregistry/', email)
     }
@@ -20,8 +21,8 @@ class Authenticator {
     async getAccessToken(req) {
         return await db.post('/user/getaccess', req, true)
     }
-    async validateSession(sessionToken) {
-        return await db.get('/user/validatesession', sessionToken)
+    async validateSession(token) {
+        return await db.get('/user/validatesession', token)
     }
 }
 

frontend/src/views/OnboardingView.vue

@@ -45,26 +45,7 @@ import stepViews from '@/components/onboarding'
 import SurveyCompleteView from './SurveyCompleteView.vue'
 let sessionToken = null
 let accessToken = null
-
-/* BRIAN'S NOTE: 
-I'll need help here. The logic is getting confusing.
-
-    1.  Right now both a session and access token are issued 
-        (session via Auth.vue, access from VerifyView.vue).
-
-    2.  There is also a hashedEmail object on the backend's app state:
-        {
-            hashedEmailString: expiration_in_milliseconds,
-            anotherhashedEmailString: expiration_in_milliseconds,
-        }
-
-        TODO: jwt, hashedEmail, cookie expiration should be the same
-    3.  The session, access tokens all have jwt expirations as well as cookie expirations
-
-    4.  Additionally, we have an expiration on each hashedEmail string...
-    5.  All the data points to check are here... 
-        I just can't quite think straight as of 07/09/2023 at 01:53:22
-*/
+let currentProfileId = null
 
 export default {
     name: 'OnboardingView',
@@ -77,68 +58,34 @@ export default {
         aspectQuestions: [],
         responses: [],
         currentStep: 0,
-        currentProfileId: null,
         survey: null,
         invalidResponse: false,
-        userEmail: null,
-        emailIsRegistered: false,
         authenticator: {},
     }),
     async created() {
         this.survey = await surveyFactory.createSurvey()
         this.authenticator = new Authenticator()
-        // TODO: Once tokens are coming through headers, refactor all of this into methods, etc.
-        // TODO: Consider switch/case() depending on what tokens exist/are valid...
-        const sessionToken = this.grabStoredCookie('siimee_session')
-        if (!sessionToken) {
-            console.warn('WARNING :=> sessionToken not in stored Cookies')
-            this.goToStep(0)
-        }
-        // const accessToken = this.grabStoredCookie('siimee_access')
-        // if (!accessToken) {
-        // check if sessionToken is valid jwt
-        //     // blow up
-        // }
-        let sessionData
-        if (sessionToken) {
-            sessionData = await this.authenticator.validateSession(sessionToken)
-            console.log('sessionData :=>', sessionData)
-        }
-        // if (sessionData && !accessToken) {
-        if (sessionData) {
-            this.userEmail = sessionData.payload.email
-            this.emailIsRegistered =
-                // QUESTION: Would this logic also be needed in VerifyView??
-                await this.authenticator.checkIfEmailIsRegistered(
-                    this.userEmail,
-                )
-        }
-        // TODO: EVERY ROUTE WE HIT AFTER THIS HAS TO BE AUTHENTICATED
-        // ACCESS TOKEN WORKS
-        // START PROTECTING ALL ROUTES
-        if (this.emailIsRegistered) {
-            const user = await fetchUserByEmail(this.userEmail)
-            const userId = user.user_id
-            const profilesFromUserId = await fetchProfilesByUserId(userId)
-            let profileId
-            if (profilesFromUserId.length === 1) {
-                profileId = profilesFromUserId[0].profile_id
-                this.currentProfileId = profileId
-            }
-            // if (!profileId) {
-            // throw new Error
-            // }
-            const profile = await fetchProfileByProfileId(profileId)
-            profile.responses.forEach(response => {
-                this.responses.push({
-                    response_key_id: response.response_key_id,
-                    val: response.val,
-                })
-            })
+        // TODO: Note that all this try/catch can be in a function instead,
+        // since it has to be done on created() and every step after 6...
+        sessionToken = this.grabStoredCookie('siimee_session')
+        accessToken = this.grabStoredCookie('siimee_access')
+        try {
+            await this.verifySessionToken(sessionToken)
+            const sessionData = await this.verifyAccessToken(accessToken)
+            await this.isEmailInRegistry(sessionData.payload.email)
+            const userId = await this.grabUserIdByEmail(
+                sessionData.payload.email,
+            )
+            const profileId = await this.grabProfileIdByUserId(userId)
+            // TODO: consider different implementation once
+            // updateAnswers() no longer relies on this
+            currentProfileId = profileId
+            this.responses = await this.grabResponsesByProfileId(profileId)
             this.currentStep = this.responses.length + 3
             this.goToStep(this.currentStep)
-        } else {
-            // TODO: CHECK SESSION
+        } catch (err) {
+            console.error('ERROR :=>', err)
+            this.goToStep(0)
         }
     },
     methods: {
@@ -160,6 +107,75 @@ export default {
                 cookieKey in cookies ? cookies[`${cookieKey}`] : undefined
             return cookieVal
         },
+        async verifySessionToken(sessionToken) {
+            if (!sessionToken) {
+                console.warn('WARNING :=> sessionToken is not defined')
+            } else return await this.validateToken(sessionToken)
+        },
+        async verifyAccessToken(accessToken) {
+            if (!accessToken) {
+                console.warn('WARNING :=> accessToken is not defined')
+            } else return await this.validateToken(accessToken)
+        },
+        async validateToken(token) {
+            const validatedToken = await this.authenticator.validateSession(
+                token,
+            )
+            if (validatedToken.error) {
+                throw new Error(validatedToken.error)
+            } else {
+                return validatedToken
+            }
+        },
+        async isEmailInRegistry(email) {
+            const emailIsInRegistry =
+                await this.authenticator.checkIfEmailIsRegistered(email)
+            if (!emailIsInRegistry) {
+                throw new Error('Email Is NOT in Registry!')
+            } else return emailIsInRegistry // true
+        },
+        async grabUserIdByEmail(email) {
+            const user = await fetchUserByEmail(email)
+            if (!user) {
+                throw new Error('User NOT found by email')
+            } else return user.user_id
+        },
+        async grabProfileIdByUserId(userId) {
+            const profilesFromUserId = await fetchProfilesByUserId(userId)
+            if (profilesFromUserId.length === 1) {
+                return profilesFromUserId[0].profile_id
+            } else {
+                // TODO: Refactor once more is known on users with multiple profiles
+                console.error(
+                    'ERROR :=> Multiple Profiles for this User ID',
+                    profilesFromUserId,
+                )
+                throw new Error('Multiple Profiles for this User ID')
+            }
+        },
+        async grabProfileByProfileId(profileId) {
+            const profile = await fetchProfileByProfileId(profileId)
+            if (!profile) {
+                throw new Error(`No Profile Found for profileId ${profileId}`)
+            } else {
+                return profile
+            }
+        },
+        async grabResponsesByProfileId(profileId) {
+            const responses = []
+            const profile = await this.grabProfileByProfileId(profileId)
+            if (!profile.responses.length) {
+                throw new Error(`No Responses Found for profileId ${profileId}`)
+            } else {
+                profile.responses.forEach(response => {
+                    responses.push({
+                        response_key_id: response.response_key_id,
+                        val: response.val,
+                    })
+                })
+                return responses
+            }
+        },
         async updateAnswers(payload) {
             if (payload) {
                 // this.invalidResponse = false
@@ -183,7 +199,7 @@ export default {
                 console.log('this.responses :=>', this.responses)
 
                 // sends latest survey response to db
-                if (this.currentProfileId) {
+                if (currentProfileId) {
                     surveyFactory.addNewSurveyAnswer(
                         this.responses[this.responses.length - 1],
                         this.currentProfileId,

frontend/src/views/VerifyView.vue

@@ -67,7 +67,7 @@ export default {
                 throw new Error(sessionTokenIsValid.error)
             } else {
                 // TODO: Does accessToken need sessionToken data?
-                await this.getAccessToken(...sessionToken)
+                await this.getAccessToken(sessionTokenIsValid.payload)
             }
         },
     },