Skip to content

Commit 73e15d1

Browse files
committed
Fix auth for simple users.
1 parent 05199b9 commit 73e15d1

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

node-client/src/config_types.ts

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -53,22 +53,24 @@ function userIterator(): u.ListIterator<any, User> {
5353
throw new Error(`users[${i}].name is missing`);
5454
}
5555
let token = null;
56-
if (elt.user.token) {
57-
token = elt.user.token;
58-
}
59-
if (elt.user['token-file']) {
60-
token = fs.readFileSync(elt.user['token-file']);
56+
if (elt.user) {
57+
if (elt.user.token) {
58+
token = elt.user.token;
59+
}
60+
if (elt.user['token-file']) {
61+
token = fs.readFileSync(elt.user['token-file']);
62+
}
6163
}
6264
return {
63-
authProvider: elt.user['auth-provider'],
64-
certData: elt.user['client-certificate-data'],
65-
certFile: elt.user['client-certificate'],
66-
keyData: elt.user['client-key-data'],
67-
keyFile: elt.user['client-key'],
65+
authProvider: elt.user ? elt.user['auth-provider'] : null,
66+
certData: elt.user ? elt.user['client-certificate-data'] : null,
67+
certFile: elt.user ? elt.user['client-certificate'] : null,
68+
keyData: elt.user ? elt.user['client-key-data'] : null,
69+
keyFile: elt.user ? elt.user['client-key'] : null,
6870
name: elt.name,
69-
password: elt.user.password,
71+
password: elt.user ? elt.user.password : null,
7072
token,
71-
username: elt.user.username,
73+
username: elt.user ? elt.user.username : null,
7274
};
7375
};
7476
}

0 commit comments

Comments
 (0)