Przeglądaj źródła

:recycle: drone notes | some logs and try catch wrappings

brian_lifecycle_docs
j 2 lat temu
rodzic
commit
92a2acae9c
3 zmienionych plików z 34 dodań i 17 usunięć
  1. 2
    1
      .drone.yml
  2. 31
    11
      frontend/src/services/auth.service.js
  3. 1
    5
      frontend/src/views/HomeView.vue

+ 2
- 1
.drone.yml Wyświetl plik

@@ -97,6 +97,7 @@ trigger:
97 97
 
98 98
 steps:
99 99
     # post-receive hook
100
+    # note: remember to copy the id_rsa.pub to staging authorized_keys
100 101
     - name: push commit
101 102
       image: appleboy/drone-git-push:0.2.0-linux-amd64
102 103
       settings:
@@ -105,7 +106,7 @@ steps:
105 106
           remote_name: staging
106 107
           force: true
107 108
           ssh_key:
108
-              # !: id_rsa from DRONE machine
109
+              # !: private id_rsa from DRONE machine
109 110
               from_secret: push_deploy_key
110 111
 
111 112
 volumes:

+ 31
- 11
frontend/src/services/auth.service.js Wyświetl plik

@@ -5,34 +5,54 @@ class Authenticator {
5 5
         return await db.post('/user/send-email/', answered)
6 6
     }
7 7
     async verifySession(hashedToken) {
8
-        return await db.get(`/user/verify/${hashedToken}`)
8
+        let verification
9
+        try {
10
+            verification = await db.get(`/user/verify/${hashedToken}`)
11
+        } catch (error) {
12
+            console.error(error)
13
+        }
14
+        console.log('verifiedSession :>> ', verification)
15
+        return verification
9 16
     }
10 17
     async createToken(req) {
11 18
         return await db.post('/user/token', req, true)
12 19
     }
13
-    async validateSession(hashedSessionToken) {
14
-        return await db.post('/user/validate-session', hashedSessionToken, true)
20
+    async validateSession() {
21
+        const hashedSessionToken = this.grabStoredSessionToken()
22
+        let validation
23
+        try {
24
+            validation = await db.post(
25
+                '/user/validate-session',
26
+                hashedSessionToken,
27
+                true,
28
+            )
29
+        } catch (error) {
30
+            console.error(error)
31
+        }
32
+        console.log('validatedSession :>> ', validation)
33
+        return validation
15 34
     }
16 35
     async authenticateLoginCredentials(credentials) {
17 36
         return await db.post('/user/login', credentials)
18 37
     }
19
-    async removeSession(hashedSessionToken) {
38
+    async removeSession() {
39
+        const hashedSessionToken = this.grabStoredSessionToken()
20 40
         return await db.post('/user/remove-session', hashedSessionToken, true)
21 41
     }
22
-    grabStoredCookie(cookieKey) {
42
+    grabStoredSessionToken(cookieKey = 'siimee_session') {
23 43
         const cookies = document.cookie.split('; ').reduce((prev, current) => {
24 44
             const [name, ...value] = current.split('=')
25 45
             prev[name] = value.join('=')
26 46
             return prev
27 47
         }, {})
48
+        if (!cookies[cookieKey])
49
+            return console.warn(
50
+                'WARNING :=> accessToken is not defined; There was problem with session cookie you are not logged in.',
51
+            )
28 52
         return cookies[cookieKey]
29 53
     }
30
-    async verifySessionCookie(sessionCookieKey = 'siimee_session') {
31
-        const hashedAccessToken = this.grabStoredCookie(sessionCookieKey)
32
-        console.log('verifySessionCookie :>> ', hashedAccessToken)
33
-        if (!hashedAccessToken)
34
-            return console.warn('WARNING :=> accessToken is not defined')
35
-        const validatedToken = await this.validateSession(hashedAccessToken)
54
+    async verifySessionCookie() {
55
+        const validatedToken = await this.validateSession()
36 56
         if (validatedToken.error)
37 57
             return console.error('ERROR :=>', validatedToken.error)
38 58
         return validatedToken

+ 1
- 5
frontend/src/views/HomeView.vue Wyświetl plik

@@ -99,11 +99,7 @@ export default {
99 99
             if (currentProfile.isLoggedIn) {
100 100
                 currentProfile.logout()
101 101
             }
102
-            const hashedSessionToken =
103
-                authenticator.grabStoredCookie('siimee_session')
104
-            const removedSession = await authenticator.removeSession(
105
-                hashedSessionToken,
106
-            )
102
+            const removedSession = await authenticator.removeSession()
107 103
             if (removedSession.error)
108 104
                 console.error('ERROR :=>', removedSession.error)
109 105
             document.cookie = `siimee_session=''; max-age=0; path=/`

Ładowanie…
Anuluj
Zapisz