parent
c31f3c5925
commit
9fdeb57fcb
1 changed files with 9 additions and 6 deletions
|
|
@ -124,10 +124,12 @@ export default {
|
||||||
})
|
})
|
||||||
.then((response) => {
|
.then((response) => {
|
||||||
console.log("Response", response);
|
console.log("Response", response);
|
||||||
response.password = pass;
|
var u = Object.assign({}, response);
|
||||||
response.is_guest = true;
|
u.home_server = tempMatrixClient.baseUrl; // Don't use deprecated field from response.
|
||||||
this.$store.commit("setUser", response);
|
u.password = pass;
|
||||||
return response;
|
u.is_guest = true;
|
||||||
|
this.$store.commit("setUser", u);
|
||||||
|
return u;
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
var data = { user: User.localPart(user.user_id), password: user.password, type: "m.login.password", initial_device_display_name: config.appName };
|
var data = { user: User.localPart(user.user_id), password: user.password, type: "m.login.password", initial_device_display_name: config.appName };
|
||||||
|
|
@ -137,13 +139,14 @@ export default {
|
||||||
promiseLogin = tempMatrixClient
|
promiseLogin = tempMatrixClient
|
||||||
.login("m.login.password", data)
|
.login("m.login.password", data)
|
||||||
.then((response) => {
|
.then((response) => {
|
||||||
var u = response;
|
var u = Object.assign({}, response);
|
||||||
if (user.is_guest) {
|
if (user.is_guest) {
|
||||||
// Copy over needed properties
|
// Copy over needed properties
|
||||||
u = Object.assign(user, response);
|
u = Object.assign(user, response);
|
||||||
}
|
}
|
||||||
|
u.home_server = tempMatrixClient.baseUrl; // Don't use deprecated field from response.
|
||||||
this.$store.commit("setUser", u);
|
this.$store.commit("setUser", u);
|
||||||
return response;
|
return u;
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue