:sparkles: Finished refactor so less network calls and OnboardingView.vue cleaner

backend/lib/plugins/user.js

@@ -16,7 +16,6 @@ const UserEmailRoute = require('../routes/user/email.js')
 const UserVerifyActiveRoute = require('../routes/user/verifyactivesession.js')
 const UserGetAccessRoute = require('../routes/user/getaccess.js')
 const UserValidateSessionRoute = require('../routes/user/validatesession.js')
-const UserByEmail = require('../routes/user/user-by-email.js')
 const UserPassword = require('../routes/user/authentication')
 
 const UserService = require('../services/user')
@@ -58,7 +57,6 @@ module.exports = {
         await server.route(UserVerifyActiveRoute)
         await server.route(UserGetAccessRoute)
         await server.route(UserValidateSessionRoute)
-        await server.route(UserByEmail)
         await server.route(UserPassword)
     },
 }

backend/lib/routes/user/user-by-email.js

@@ -1,55 +0,0 @@
-'use strict'
-
-const Joi = require('joi')
-
-const pluginConfig = {
-    handlerType: 'email',
-    docs: {
-        get: {
-            description: 'Fetches User Data by Email',
-            notes: 'Grabs the User Data by Email for use in survey validation',
-        },
-    },
-}
-
-module.exports = {
-    method: 'GET',
-    path: '/fetchbymail/{email}',
-    options: {
-        ...pluginConfig.docs.get,
-        tags: ['api'],
-        auth: 'default_jwt',
-        cors: true,
-        handler: async function (request, h) {
-            const email = request.params.email
-            const { userService } = request.server.services()
-            const data = await userService.findByUserEmail(email)
-            try {
-                return {
-                    ok: true,
-                    handler: pluginConfig.handlerType,
-                    data: data,
-                }
-            } catch (err) {
-                return {
-                    ok: false,
-                    handler: pluginConfig.handlerType,
-                    data: {
-                        error: err,
-                    },
-                }
-            }
-        },
-        validate: {
-            failAction: 'log',
-        },
-        response: {
-            schema: Joi.object({
-                ok: Joi.bool(),
-                handler: Joi.string(),
-                data: Joi.object(),
-            }).label('fetchbymail'),
-            failAction: 'log',
-        },
-    },
-}

backend/lib/routes/user/validatesession.js

@@ -26,14 +26,35 @@ module.exports = {
         },
         handler: async function (request, h) {
             const hashedAccessToken = request.payload
-            const { userService } = request.server.services()
+            const { userService, profileService } = request.server.services()
             try {
                 const validatedSessionToken =
                     userService.validateSession(hashedAccessToken)
+                const user = await userService.findByUserEmail(
+                    validatedSessionToken.email,
+                )
+                const type = user.is_poster == 1 ? 'poster' : 'seeker'
+                const profiles = await profileService.getCompleteProfilesFor(
+                    user.user_id,
+                    type,
+                )
+                // TODO: handle user with multiple profiles...
+                const profileId = profiles[0].profile_id
+                const responses = []
+                profiles[0].responses.forEach(response => {
+                    responses.push({
+                        response_key_id: response.response_key_id,
+                        val: response.val,
+                    })
+                })
                 return {
                     ok: true,
                     handler: pluginConfig.handlerType,
-                    data: validatedSessionToken,
+                    data: {
+                        ...validatedSessionToken,
+                        profileId: profileId,
+                        responses: responses,
+                    },
                 }
             } catch (err) {
                 return {

frontend/src/services/user.service.js

@@ -14,8 +14,4 @@ const signupUser = async user => {
     return await db.post(`/user/signup`, payload)
 }
 
-const fetchUserByEmail = async (userEmail, sessionToken) => {
-    return await db.get(`/user/fetchbymail/${userEmail}`, sessionToken)
-}
-
-export { signupUser, fetchUserByEmail }
+export { signupUser }

frontend/src/views/OnboardingView.vue

@@ -35,11 +35,6 @@ main.view--onboarding
 
 <script>
 import { Authenticator } from '../services/auth.service.js'
-import { fetchUserByEmail } from '../services/user.service.js'
-import {
-    fetchProfilesByUserId,
-    fetchProfileByProfileId,
-} from '../services/profile.service.js'
 import { surveyFactory } from '@/utils'
 import stepViews from '@/components/onboarding'
 import SurveyCompleteView from './SurveyCompleteView.vue'
@@ -67,21 +62,8 @@ export default {
         hashedAccessToken = this.grabStoredCookie('siimee_access')
         try {
             const sessionData = await this.verifySession(hashedAccessToken)
-            console.log('sessionData :=>', sessionData)
-            // TODO: Move this logic onto the backend and have it
-            // returned in verifySession(hashedSessionToken)
-            const userId = await this.grabUserIdByEmail(
-                sessionData.email,
-                sessionData.accessToken,
-            )
-            currentProfileId = await this.grabProfileIdByUserId(
-                userId,
-                sessionData.accessToken,
-            )
-            this.responses = await this.grabResponsesByProfileId(
-                currentProfileId,
-                sessionData.accessToken,
-            )
+            currentProfileId = sessionData.profileId
+            this.responses = sessionData.responses
             this.currentStep = this.responses.length + 3
             this.goToStep(this.currentStep)
         } catch (err) {
@@ -108,11 +90,9 @@ export default {
                 cookieKey in cookies ? cookies[`${cookieKey}`] : undefined
             return cookieVal
         },
-        // TODO: sessionToken is flying around far too often,
-        // see above TODO regarding moving most of this logic to the backend
         async verifySession(hashedAccessToken) {
             if (!hashedAccessToken)
-                return console.warn('WARNING :=> sessionToken is not defined')
+                return console.warn('WARNING :=> accessToken is not defined')
             const validatedToken = await this.authenticator.validateSession(
                 hashedAccessToken,
             )
@@ -122,58 +102,6 @@ export default {
                 return validatedToken
             }
         },
-        async grabUserIdByEmail(email, accessToken) {
-            const user = await fetchUserByEmail(email, accessToken)
-            if (!user) {
-                throw new Error('User NOT found by email')
-            } else return user.user_id
-        },
-        async grabProfileIdByUserId(userId, accessToken) {
-            const profilesFromUserId = await fetchProfilesByUserId(
-                userId,
-                accessToken,
-            )
-            if (
-                profilesFromUserId.length === 1 &&
-                profilesFromUserId.status !== 401
-            ) {
-                return profilesFromUserId[0].profile_id
-            } else if (profilesFromUserId.length > 1) {
-                // TODO: Refactor once more is known on users with multiple profiles
-                throw new Error('Multiple Profiles for this User ID')
-            } else {
-                throw new Error('No Profile for User ID found')
-            }
-        },
-        async grabProfileByProfileId(profileId, accessToken) {
-            const profile = await fetchProfileByProfileId(
-                profileId,
-                accessToken,
-            )
-            if (!profile || profile.status === 401) {
-                throw new Error(`No Profile Found for profileId ${profileId}`)
-            } else {
-                return profile
-            }
-        },
-        async grabResponsesByProfileId(profileId, accessToken) {
-            const responses = []
-            const profile = await this.grabProfileByProfileId(
-                profileId,
-                accessToken,
-            )
-            if (!profile.responses.length || profile.responses.status === 401) {
-                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) {
                 const k = payload.question.survey_stage
@@ -192,7 +120,7 @@ export default {
                 this.responses.push(response)
                 if (k === 'aspects') return
             }
-            // If user has finished minimum profile creation,
+            // NOTE: If user has finished minimum profile creation,
             // Adds survey answers to responses table and verifies tokens on each step
             if (currentProfileId) {
                 await surveyFactory.addNewSurveyAnswer(