@live-change/user-service 0.2.8 → 0.2.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/authenticator.js +9 -3
- package/index.js +0 -10
- package/package.json +2 -2
package/authenticator.js
CHANGED
|
@@ -16,29 +16,35 @@ definition.authenticator({
|
|
|
16
16
|
let userObserver = null
|
|
17
17
|
let oldCredentials = null
|
|
18
18
|
await authenticatedTable.object(session).onChange(async (authData, oldAuthData) => {
|
|
19
|
+
output.debug("NEW USER AUTH", authData, "FROM", oldAuthData)
|
|
19
20
|
const newUser = authData ? authData.user : null
|
|
20
21
|
if(newUser == user) return
|
|
21
22
|
if(user) {
|
|
22
|
-
|
|
23
|
+
if(userObject) {
|
|
24
|
+
await userObject.unobserve(userObserver)
|
|
25
|
+
}
|
|
23
26
|
userObject = null
|
|
24
27
|
userObserver = null
|
|
25
28
|
}
|
|
26
|
-
if(
|
|
29
|
+
if(newUser) {
|
|
27
30
|
user = newUser
|
|
31
|
+
output.debug("NEW USER", user)
|
|
28
32
|
userObject = userTable.object(user)
|
|
33
|
+
const currentUserObject = userObject
|
|
29
34
|
await userObject.onChange(async (userData, oldUserData) => {
|
|
30
35
|
const newCredentials = userData ? {
|
|
31
36
|
id: user,
|
|
32
37
|
user,
|
|
33
38
|
roles: userData.roles
|
|
34
39
|
} : null
|
|
40
|
+
output.debug("NEW CREDENTIALS", newCredentials)
|
|
35
41
|
output.change(newCredentials, oldCredentials)
|
|
36
42
|
oldCredentials = newCredentials
|
|
37
43
|
}).then(observer => {
|
|
38
44
|
if(user == newUser) {
|
|
39
45
|
userObserver = observer
|
|
40
46
|
} else { // if user changed before observer loaded data
|
|
41
|
-
|
|
47
|
+
currentUserObject.unobserve(observer)
|
|
42
48
|
}
|
|
43
49
|
})
|
|
44
50
|
} else {
|
package/index.js
CHANGED
|
@@ -49,16 +49,6 @@ definition.trigger({
|
|
|
49
49
|
|
|
50
50
|
definition.action({
|
|
51
51
|
name: 'signOut',
|
|
52
|
-
properties: {
|
|
53
|
-
user: {
|
|
54
|
-
type: User,
|
|
55
|
-
validation: ['nonEmpty']
|
|
56
|
-
},
|
|
57
|
-
session: {
|
|
58
|
-
type: Session,
|
|
59
|
-
validation: ['nonEmpty']
|
|
60
|
-
}
|
|
61
|
-
},
|
|
62
52
|
async execute({ }, { client, service }, emit) {
|
|
63
53
|
if(!client.user) throw "notSignedIn"
|
|
64
54
|
emit({
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@live-change/user-service",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.10",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -24,5 +24,5 @@
|
|
|
24
24
|
"@live-change/framework": "^0.5.7",
|
|
25
25
|
"@live-change/relations-plugin": "^0.1.10"
|
|
26
26
|
},
|
|
27
|
-
"gitHead": "
|
|
27
|
+
"gitHead": "ae86524e5ac7052eb6b6e7b34e319373b6bdef23"
|
|
28
28
|
}
|