krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 15:17:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed auth tests. Updated Authctrl response

Browse Source
This commit is contained in:
Keith Holliday
2016-05-10 22:09:04 -05:00
parent 04d8e7dd28
commit f807bc2a49
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/spec/controllers/authCtrlSpec.js
View File

@@ -25,7 +25,7 @@ describe('Auth Controller', function() {
describe('logging in', function() { describe('logging in', function() {
it('should log in users with correct uname / pass', 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(); scope.auth();
$httpBackend.flush(); $httpBackend.flush();
expect(user.authenticate).to.be.calledOnce; 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() { 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(); scope.auth();
$httpBackend.flush(); $httpBackend.flush();
expect(user.authenticate).to.not.be.called; expect(user.authenticate).to.not.be.called;

7
website/public/js/controllers/authCtrl.js
View File

@@ -26,10 +26,11 @@ angular.module('habitrpg')
function errorAlert(data, status, headers, config) { function errorAlert(data, status, headers, config) {
$scope.registrationInProgress = false; $scope.registrationInProgress = false;
console.log(data)
if (status === 0) { if (status === 0) {
$window.alert(window.env.t('noReachServer')); $window.alert(window.env.t('noReachServer'));
} else if (!!data && !!data.err) { } else if (!!data && !!data.error) {
$window.alert(data.data.message); $window.alert(data.message);
} else { } else {
$window.alert(window.env.t('errorUpCase') + ' ' + status); $window.alert(window.env.t('errorUpCase') + ' ' + status);
} }
@@ -104,7 +105,7 @@ angular.module('habitrpg')
runAuth(data.data.id, data.data.apiToken); runAuth(data.data.id, data.data.apiToken);
}).error(errorAlert); }).error(errorAlert);
}, function( e ){ }, function( e ){
alert("Signin error: " + e.error.message ); alert("Signin error: " + e.message );
}); });
}; };