matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-11 20:22:36 +03:00
Code Activity

Merge pull request #410 from matrix-org/rav/use_server_device_id

Browse Source 
Use server-generated deviceId
This commit is contained in:
David Baker
2016-08-12 11:40:55 +01:00
committed by GitHub
parent 7992042526 5fc98ffc49
commit 33e9abe421
4 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Signup.js
View File

@@ -336,6 +336,7 @@ class Login extends Signup {
}).then((creds) => {
return {
userId: creds.user_id,
deviceId: creds.device_id,
accessToken: creds.access_token,
homeserverUrl: this._hsUrl,
identityServerUrl: this._isUrl,
@@ -371,6 +372,7 @@ class Login extends Signup {
homeserverUrl: self._hsUrl,
identityServerUrl: self._isUrl,
userId: data.user_id,
deviceId: data.device_id,
accessToken: data.access_token
});
}, function(error) {
@@ -394,6 +396,7 @@ class Login extends Signup {
homeserverUrl: self._fallbackHsUrl,
identityServerUrl: self._isUrl,
userId: data.user_id,
deviceId: data.device_id,
accessToken: data.access_token
});
}, function(fallback_error) {