@@ -16,13 +16,11 @@ type AllowAccessData = {
16
16
className : string
17
17
}
18
18
19
- type Uid = string
20
19
type LoginWithAPIKEY = boolean
21
20
interface User {
22
21
email : Email
23
22
emailVerified : EmailVerified
24
23
displayName : DisplayName
25
- uid : Uid
26
24
}
27
25
28
26
interface userData {
@@ -34,7 +32,6 @@ export class UserStore extends VuexModule implements User {
34
32
email : Email = ''
35
33
emailVerified : EmailVerified = false
36
34
displayName : DisplayName = ''
37
- uid : Uid = ''
38
35
39
36
public get isAuthenticated ( ) : Promise < boolean > {
40
37
return ( async ( ) => {
@@ -45,21 +42,19 @@ export class UserStore extends VuexModule implements User {
45
42
}
46
43
47
44
@mutation
48
- private setUser ( { email, emailVerified, displayName, uid } : User ) {
45
+ private setUser ( { email, emailVerified, displayName } : User ) {
49
46
this . email = email
50
47
this . emailVerified = emailVerified
51
48
this . displayName = displayName
52
- this . uid = uid
53
49
}
54
50
55
51
@action
56
52
public async login ( ) {
57
53
const user = await Auth . currentAuthenticatedUser ( )
58
54
this . setUser ( {
59
- email : user . email ? user . email : '' ,
60
- emailVerified : user . emailVerified ,
61
- displayName : user . name ,
62
- uid : user . id ,
55
+ email : user . attributes . email ,
56
+ emailVerified : user . attributes . email_verified ,
57
+ displayName : user . attributes . name ,
63
58
} )
64
59
}
65
60
@@ -69,15 +64,13 @@ export class UserStore extends VuexModule implements User {
69
64
email : user . email ,
70
65
emailVerified : user . emailVerified ,
71
66
displayName : user . name ,
72
- uid : user . id ,
73
67
} )
74
68
}
75
69
76
70
@action
77
71
public async logout ( ) {
78
72
await Auth . signOut ( )
79
73
this . setUser ( {
80
- uid : '' ,
81
74
email : '' ,
82
75
emailVerified : false ,
83
76
displayName : '' ,
0 commit comments