:gears: Small User API cleanup + removed one of many onboarding survey step props

backend/lib/plugins/user.js

@@ -12,10 +12,10 @@ const UserProfileCreateRoute = require('../routes/user/create-profile')
 const UserProfilesListRoute = require('../routes/user/list-profiles')
 const UserLoginRoute = require('../routes/user/login')
 const UserSignupRoute = require('../routes/user/signup')
-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 UserEmailRoute = require('../routes/user/send-email')
+const UserVerifyActiveRoute = require('../routes/user/verify-session')
+const UserCreateTokenRoute = require('../routes/user/token')
+const UserValidateSessionRoute = require('../routes/user/validate-session')
 const UserPassword = require('../routes/user/authentication')
 
 const UserService = require('../services/user')
@@ -55,7 +55,7 @@ module.exports = {
         await server.route(UserProfilesListRoute)
         await server.route(UserEmailRoute)
         await server.route(UserVerifyActiveRoute)
-        await server.route(UserGetAccessRoute)
+        await server.route(UserCreateTokenRoute)
         await server.route(UserValidateSessionRoute)
         await server.route(UserPassword)
     },

backend/lib/routes/user/email.js → backend/lib/routes/user/send-email.js

@@ -14,7 +14,7 @@ const pluginConfig = {
 
 module.exports = {
     method: 'POST',
-    path: '/sendemail/',
+    path: '/send-email/',
     options: {
         ...pluginConfig.docs.get,
         tags: ['api'],

backend/lib/routes/user/getaccess.js → backend/lib/routes/user/token.js

@@ -6,15 +6,15 @@ const pluginConfig = {
     handlerType: 'authentication',
     docs: {
         get: {
-            description: 'gets session token for authentication',
-            notes: 'Gets session token for authentication',
+            description: 'creates session token for authentication',
+            notes: 'Creates session token for authentication',
         },
     },
 }
 
 module.exports = {
     method: 'POST',
-    path: '/getaccess',
+    path: '/token',
     options: {
         ...pluginConfig.docs.get,
         tags: ['api'],

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

@@ -15,7 +15,7 @@ const pluginConfig = {
 
 module.exports = {
     method: 'POST',
-    path: '/validatesession',
+    path: '/validate-session',
     options: {
         ...pluginConfig.docs.get,
         tags: ['api'],

frontend/src/components/onboarding/Auth.vue

@@ -48,11 +48,11 @@ export default {
                 password: userPass.val,
             })
             await this.createProfileForNewUser(newUserId, this.responses)
-            const accessToken = await this.getAccessToken({
+            const accessToken = await this.createToken({
                 ...this.answered,
             })
             console.log('accessToken :=>', accessToken)
-            const sessionInfo = await this.authenticator.sendAuthEmail({
+            const sessionInfo = await this.authenticator.sendEmail({
                 ...this.answered,
                 accessToken: accessToken,
             })
@@ -70,8 +70,8 @@ export default {
                     'User has not answered minimum amount of questions to create profile',
                 )
         },
-        async getAccessToken(payload) {
-            return await this.authenticator.getAccessToken({
+        async createToken(payload) {
+            return await this.authenticator.createToken({
                 payload,
             })
         },

frontend/src/components/onboarding/QuestionResponse.vue

@@ -28,9 +28,10 @@ export default {
             type: Number,
             required: true,
         },
-        surveyStepsCount: {
-            type: Number,
+        survey: {
+            type: Object,
             required: true,
+            default: () => {},
         },
     },
     emits: ['update-answers'],
@@ -38,7 +39,11 @@ export default {
         radioItems: [1, 2, 3, 4, 5],
         answer: null,
         noChoiceMade: null,
+        surveyStepsCount: null,
     }),
+    created (){
+        this.surveyStepsCount = this.survey?.steps?.length
+    },
     methods: {
         onUpdate(index) {
             this.noChoiceMade = false

frontend/src/services/auth.service.js

@@ -4,17 +4,17 @@ class Authenticator {
     constructor() {
         this.curentUser = null
     }
-    async sendAuthEmail(answered) {
-        return await db.post('/user/sendemail/', answered)
+    async sendEmail(answered) {
+        return await db.post('/user/send-email/', answered)
     }
-    async verifyAuthSession(hashedToken) {
+    async verifySession(hashedToken) {
         return await db.get(`/user/verify/${hashedToken}`)
     }
-    async getAccessToken(req) {
-        return await db.post('/user/getaccess', req, true)
+    async createToken(req) {
+        return await db.post('/user/token', req, true)
     }
     async validateSession(hashedAccessToken) {
-        return await db.post('/user/validatesession', hashedAccessToken, true)
+        return await db.post('/user/validate-session', hashedAccessToken, true)
     }
 }
 

frontend/src/views/OnboardingView.vue

@@ -15,7 +15,6 @@ main.view--onboarding
                 :question='step'
                 :responses='responses'
                 :survey='survey'
-                :surveyStepsCount='survey?.steps?.length'
                 @handle-submit='onSubmit'
                 @update-answers='updateAnswers'
                 v-if='step && currentStep == i'
@@ -61,7 +60,7 @@ export default {
         this.authenticator = new Authenticator()
         hashedAccessToken = this.grabStoredCookie('siimee_access')
         try {
-            const sessionData = await this.verifySession(hashedAccessToken)
+            const sessionData = await this.validateSession(hashedAccessToken)
             currentProfileId = sessionData.profileId
             this.responses = sessionData.responses
             this.currentStep = this.responses.length + 3
@@ -90,7 +89,7 @@ export default {
                 cookieKey in cookies ? cookies[`${cookieKey}`] : undefined
             return cookieVal
         },
-        async verifySession(hashedAccessToken) {
+        async validateSession(hashedAccessToken) {
             if (!hashedAccessToken)
                 return console.warn('WARNING :=> accessToken is not defined')
             const validatedToken = await this.authenticator.validateSession(
@@ -128,7 +127,7 @@ export default {
                     currentProfileId,
                 )
                 try {
-                    await this.verifySession(hashedAccessToken)
+                    await this.validateSession(hashedAccessToken)
                 } catch (err) {
                     this.currentStep = 0
                     this.goToStep(this.currentStep)

frontend/src/views/VerifyView.vue

@@ -48,7 +48,7 @@ export default {
                 throw new Error('accessToken not in cookie store!')
         },
         async verifyActiveSession(hashedToken) {
-            const sessionData = await this.authenticator.verifyAuthSession(
+            const sessionData = await this.authenticator.verifySession(
                 hashedToken,
             )
             if (!sessionData.hashesMatch)