Explorar el Código

:pencil2: Fixed merge issues

tags/0.0.4
tomit4 hace 2 años
padre
commit
0dbad7f7f6

+ 1
- 1
backend/lib/services/user.js Ver fichero

110
         return user
110
         return user
111
     }
111
     }
112
 
112
 
113
-    async hashToken(token) {
113
+    hashToken(token) {
114
         const salt = process.env.APP_SESSION_SALT
114
         const salt = process.env.APP_SESSION_SALT
115
         try {
115
         try {
116
             return crypto.createHmac('sha256', salt).update(token).digest('hex')
116
             return crypto.createHmac('sha256', salt).update(token).digest('hex')

+ 3
- 13
frontend/src/components/AspectBar.vue Ver fichero

1
 <template lang="pug">
1
 <template lang="pug">
2
 figure.w-flex.column
2
 figure.w-flex.column
3
     figcaption.w-flex.xs12.justify-space-between.align-center
3
     figcaption.w-flex.xs12.justify-space-between.align-center
4
-        p(
5
-            :class='{ main: index === 1 }'
6
-            :key='label'
7
-            v-for='(label, index) in labels'
8
-        ) {{ label }}
9
-    w-progress.mb7(round size='0.5em' v-model='progress')
4
+        p(v-for="(label, index) in labels" :key="label" :class="{ 'main': index === 1 }")  {{ label }}
5
+    w-progress(:model-value="percentage" size="0.5em" round).mb7
10
 </template>
6
 </template>
11
 
7
 
12
 <script>
8
 <script>
16
             required: true,
12
             required: true,
17
             type: Array,
13
             type: Array,
18
         },
14
         },
19
-        percentage: {
20
-            required: false,
21
-            type: Number,
22
-            default: 50,
23
-        },
24
     },
15
     },
25
     data: () => ({
16
     data: () => ({
26
-        progress: props.percentage,
17
+        percentage: 50,
27
     }),
18
     }),
28
 }
19
 }
29
 </script>
20
 </script>
37
             font-weight: bold
28
             font-weight: bold
38
             text-transform: uppercase
29
             text-transform: uppercase
39
 
30
 
40
-
41
     .w-progress
31
     .w-progress
42
         background-color: #4C5264
32
         background-color: #4C5264
43
         .w-progress__progress
33
         .w-progress__progress

+ 2
- 3
frontend/src/services/auth.service.js Ver fichero

36
         const hashedAccessToken = this.grabStoredCookie(sessionCookie)
36
         const hashedAccessToken = this.grabStoredCookie(sessionCookie)
37
         if (!hashedAccessToken)
37
         if (!hashedAccessToken)
38
             return console.warn('WARNING :=> accessToken is not defined')
38
             return console.warn('WARNING :=> accessToken is not defined')
39
-        const validatedToken = await authenticator.validateSession(
40
-            hashedAccessToken,
41
-        )
39
+        const validatedToken =
40
+            await authenticator.validateSession(hashedAccessToken)
42
         if (validatedToken.error) {
41
         if (validatedToken.error) {
43
             console.error('ERROR :=>', validatedToken.error)
42
             console.error('ERROR :=>', validatedToken.error)
44
         } else {
43
         } else {

+ 2
- 2
frontend/src/views/VerifyView.vue Ver fichero

18
             await this.doesAccessTokenExist(hashedAccessToken)
18
             await this.doesAccessTokenExist(hashedAccessToken)
19
             await this.verifyActiveSession(hash)
19
             await this.verifyActiveSession(hash)
20
             const sessionData =
20
             const sessionData =
21
-                await authenticator.verifySessionCookie('siimee_access')
22
-            await currentProfile.login(
21
+                await authenticator.verifySessionCookie('siimee_session')
22
+            currentProfile.login(
23
                 sessionData.profileId,
23
                 sessionData.profileId,
24
                 this.$waveui.notify,
24
                 this.$waveui.notify,
25
                 sessionData.accessToken,
25
                 sessionData.accessToken,

Loading…
Cancelar
Guardar