From fef3183461a60715cb5fb0638abcde335c61db82 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Thu, 14 Aug 2014 16:40:15 +0100
Subject: 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.

---
 webclient/login/login-controller.js | 2 +-
 webclient/login/login.html          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'webclient')

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/>
-- 
cgit 1.4.1