|
|
@@ -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
|