:pencil2: Cleaned up if statements, less nesting

backend/lib/services/user.js

@@ -243,9 +243,9 @@ module.exports = class UserService extends Schmervice.Service {
      */
     validateToken(token) {
         const key = this.server.registrations['main-app-plugin'].options.jwtKey
-        const decodedToken = Jwt.token.decode(token)
         // NOTE: reveals email...perhaps unhashed email belongs here instead...
         try {
+            const decodedToken = Jwt.token.decode(token)
             Jwt.token.verify(decodedToken, key)
             return { isValid: true, payload: decodedToken.decoded.payload }
         } catch (err) {

frontend/src/views/OnboardingView.vue

@@ -65,39 +65,32 @@ export default {
     async created() {
         this.survey = await surveyFactory.createSurvey()
         this.authenticator = new Authenticator()
-        if (document.cookie.length) {
-            const sessionToken = this.grabCookie('siimee_session_onboarding')
-            if (sessionToken) {
-                const sessionData = await this.authenticator.validateJwt(
-                    sessionToken,
-                )
-                // NOTE: Left off here, INCOMPLETE, no ACCESS TOKEN yet, crazy amount of logic here...
-                if (sessionData.isValid) {
-                    const userEmail = sessionData.payload.email
-                    const emailIsInCache =
-                        await this.authenticator.checkEmailCache(userEmail)
-                    if (emailIsInCache) {
-                        const user = await fetchUserByEmail(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
-                        }
-                        const profile = await fetchProfileByProfileId(profileId)
-                        profile.responses.forEach(response => {
-                            this.responses.push({
-                                response_key_id: response.response_key_id,
-                                val: response.val,
-                            })
-                        })
-                        this.currentStep = this.responses.length + 3
-                        this.goToStep(this.currentStep)
-                    }
+        const sessionToken = this.grabCookie('siimee_session_onboarding')
+        const sessionData = await this.authenticator.validateJwt(sessionToken)
+        // NOTE: Left off here, INCOMPLETE, no ACCESS TOKEN yet, crazy amount of logic here...
+        if (sessionData.isValid) {
+            const userEmail = sessionData.payload.email
+            const emailIsInCache = await this.authenticator.checkEmailCache(
+                userEmail,
+            )
+            if (emailIsInCache) {
+                const user = await fetchUserByEmail(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
                 }
+                const profile = await fetchProfileByProfileId(profileId)
+                profile.responses.forEach(response => {
+                    this.responses.push({
+                        response_key_id: response.response_key_id,
+                        val: response.val,
+                    })
+                })
+                this.currentStep = this.responses.length + 3
+                this.goToStep(this.currentStep)
             }
         }
     },