:pencil2: Fixed merge issues

backend/lib/services/user.js

@@ -110,7 +110,7 @@ module.exports = class UserService extends Schmervice.Service {
         return user
     }
 
-    async hashToken(token) {
+    hashToken(token) {
         const salt = process.env.APP_SESSION_SALT
         try {
             return crypto.createHmac('sha256', salt).update(token).digest('hex')

frontend/src/components/AspectBar.vue

@@ -1,12 +1,8 @@
 <template lang="pug">
 figure.w-flex.column
     figcaption.w-flex.xs12.justify-space-between.align-center
-        p(
-            :class='{ main: index === 1 }'
-            :key='label'
-            v-for='(label, index) in labels'
-        ) {{ label }}
-    w-progress.mb7(round size='0.5em' v-model='progress')
+        p(v-for="(label, index) in labels" :key="label" :class="{ 'main': index === 1 }")  {{ label }}
+    w-progress(:model-value="percentage" size="0.5em" round).mb7
 </template>
 
 <script>
@@ -16,14 +12,9 @@ export default {
             required: true,
             type: Array,
         },
-        percentage: {
-            required: false,
-            type: Number,
-            default: 50,
-        },
     },
     data: () => ({
-        progress: props.percentage,
+        percentage: 50,
     }),
 }
 </script>
@@ -37,7 +28,6 @@ figure
             font-weight: bold
             text-transform: uppercase
 
-
     .w-progress
         background-color: #4C5264
         .w-progress__progress

frontend/src/services/auth.service.js

@@ -36,9 +36,8 @@ class Authenticator {
         const hashedAccessToken = this.grabStoredCookie(sessionCookie)
         if (!hashedAccessToken)
             return console.warn('WARNING :=> accessToken is not defined')
-        const validatedToken = await authenticator.validateSession(
-            hashedAccessToken,
-        )
+        const validatedToken =
+            await authenticator.validateSession(hashedAccessToken)
         if (validatedToken.error) {
             console.error('ERROR :=>', validatedToken.error)
         } else {

frontend/src/views/VerifyView.vue

@@ -18,8 +18,8 @@ export default {
             await this.doesAccessTokenExist(hashedAccessToken)
             await this.verifyActiveSession(hash)
             const sessionData =
-                await authenticator.verifySessionCookie('siimee_access')
-            await currentProfile.login(
+                await authenticator.verifySessionCookie('siimee_session')
+            currentProfile.login(
                 sessionData.profileId,
                 this.$waveui.notify,
                 sessionData.accessToken,