Преглед изворни кода

:recycle: undo woops

brian_auth_fix
j пре 2 година
родитељ
комит
9518501c6d
1 измењених фајлова са 19 додато и 16 уклоњено
  1. 19
    16
      frontend/src/services/auth.service.js

+ 19
- 16
frontend/src/services/auth.service.js Прегледај датотеку

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

Loading…
Откажи
Сачувај