Move the unknown token broadcast to the interceptor. Return the $http promise and not a wrapped one via $q. Everything now needs a level deeper nesting. Fixed registration and login.

1 files changed, 9 insertions, 5 deletions

diff --git a/webclient/login/login-controller.js b/webclient/login/login-controller.js
index fa91bf4253..c519f7698c 100644
--- a/webclient/login/login-controller.js
+++ b/webclient/login/login-controller.js
@@ -39,14 +39,13 @@ angular.module('LoginController', ['matrixService'])
         }
 
         matrixService.register($scope.account.desired_user_name, $scope.account.pwd1).then(
-            function(data) {
+            function(response) {
                 $scope.feedback = "Success";
-
                 // Update the current config 
                 var config = matrixService.config();
                 angular.extend(config, {
-                    access_token: data.access_token,
-                    user_id: data.user_id
+                    access_token: response.data.access_token,
+                    user_id: response.data.user_id
                 });
                 matrixService.setConfig(config);
 
@@ -74,7 +73,7 @@ angular.module('LoginController', ['matrixService'])
                     matrixService.setConfig({
                         homeserver: $scope.account.homeserver,
                         user_id: $scope.account.user_id,
-                        access_token: response.access_token
+                        access_token: response.data.access_token
                     });
                     matrixService.saveConfig();
                     $location.path("rooms");
@@ -82,6 +81,11 @@ angular.module('LoginController', ['matrixService'])
                 else {
                     $scope.feedback = "Failed to login: " + JSON.stringify(response);
                 }
+            },
+            function(error) {
+                if (error.data.errcode === "M_FORBIDDEN") {
+                    $scope.login_error_msg = "Incorrect username or password.";
+                }
             }
         );
     };