diff --git a/test/spec/controllers/authCtrlSpec.js b/test/spec/controllers/authCtrlSpec.js index b1f87d4d91..75ea898fca 100644 --- a/test/spec/controllers/authCtrlSpec.js +++ b/test/spec/controllers/authCtrlSpec.js @@ -25,7 +25,7 @@ describe('Auth Controller', function() { describe('logging in', function() { it('should log in users with correct uname / pass', function() { - $httpBackend.expectPOST('/api/v2/user/auth/local').respond({id: 'abc', token: 'abc'}); + $httpBackend.expectPOST('/api/v3/user/auth/local/login').respond({data: {id: 'abc', apiToken: 'abc'}}); scope.auth(); $httpBackend.flush(); expect(user.authenticate).to.be.calledOnce; @@ -33,7 +33,7 @@ describe('Auth Controller', function() { }); it('should not log in users with incorrect uname / pass', function() { - $httpBackend.expectPOST('/api/v2/user/auth/local').respond(404, ''); + $httpBackend.expectPOST('/api/v3/user/auth/local/login').respond(404, ''); scope.auth(); $httpBackend.flush(); expect(user.authenticate).to.not.be.called; diff --git a/website/public/js/controllers/authCtrl.js b/website/public/js/controllers/authCtrl.js index e3e25c3aea..58cc563158 100644 --- a/website/public/js/controllers/authCtrl.js +++ b/website/public/js/controllers/authCtrl.js @@ -26,10 +26,11 @@ angular.module('habitrpg') function errorAlert(data, status, headers, config) { $scope.registrationInProgress = false; + console.log(data) if (status === 0) { $window.alert(window.env.t('noReachServer')); - } else if (!!data && !!data.err) { - $window.alert(data.data.message); + } else if (!!data && !!data.error) { + $window.alert(data.message); } else { $window.alert(window.env.t('errorUpCase') + ' ' + status); } @@ -104,7 +105,7 @@ angular.module('habitrpg') runAuth(data.data.id, data.data.apiToken); }).error(errorAlert); }, function( e ){ - alert("Signin error: " + e.error.message ); + alert("Signin error: " + e.message ); }); };