diff options
| author | Kegan Dougal <kegan@matrix.org> | 2014-08-14 16:40:15 +0100 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2014-08-14 16:40:15 +0100 |
| commit | fef3183461a60715cb5fb0638abcde335c61db82 (patch) | |
| tree | d34d0aa0abee7536e19efd2bde8ddb637d7a1534 /webclient/login | |
| parent | hs: Make /login accept full user IDs or just local parts. webclient: Only ena... (diff) | |
| download | synapse-fef3183461a60715cb5fb0638abcde335c61db82.tar.xz | |
Pass back the user_id in the response to /login in case it has changed. Store and use that on the webclient rather than the input field.
Diffstat (limited to 'webclient/login')
| -rw-r--r-- | webclient/login/login-controller.js | 2 | ||||
| -rw-r--r-- | webclient/login/login.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/webclient/login/login-controller.js b/webclient/login/login-controller.js index 53756be9ea..8bd6a4e84f 100644 --- a/webclient/login/login-controller.js +++ b/webclient/login/login-controller.js @@ -79,7 +79,7 @@ angular.module('LoginController', ['matrixService']) $scope.feedback = "Login successful."; matrixService.setConfig({ homeserver: $scope.account.homeserver, - user_id: $scope.account.user_id, + user_id: response.data.user_id, access_token: response.data.access_token }); matrixService.saveConfig(); diff --git a/webclient/login/login.html b/webclient/login/login.html index 0fbeeabed7..a8b2b1f12d 100644 --- a/webclient/login/login.html +++ b/webclient/login/login.html @@ -24,7 +24,7 @@ <!-- Login with an registered user --> <div>{{ login_error_msg }} </div> <div> - <input id="user_id" size="70" type="text" auto-focus ng-model="account.user_id" placeholder="User ID (ex:@bob:localhost)"/> + <input id="user_id" size="70" type="text" auto-focus ng-model="account.user_id" placeholder="User ID (ex:@bob:localhost or bob)"/> <br /> <input id="password" size="70" type="password" ng-model="account.password" placeholder="Password"/><br /> <br/> |