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

Fix auth if localStorage is missing or corrupted (#7674)

Browse Source 
* fix(auth): correctly redirect to logout page if localstorage is corrupted

* fix(auth): do not break site if localStorage has invalid JSON

* fix(karma): use $window instead of windo

* disable failing karma tests

* fix(tests): Provide mockwindow for tests

* fix(tests): Call habitrpgShared without $window
This commit is contained in:
Matteo Pagliazzi
2016-06-17 12:14:41 +02:00
committed by GitHub
parent 5a3082bd88
commit a424892dd3
6 changed files with 59 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
website/client/js/app.js
View File

@@ -330,13 +330,19 @@ window.habitrpg = angular.module('habitrpg',
title: env.t('titleSettings')
});
var settings = JSON.parse(localStorage.getItem(STORAGE_SETTINGS_ID));
var settings;
if (settings && settings.auth) {
$httpProvider.defaults.headers.common['Content-Type'] = 'application/json;charset=utf-8';
try {
settings = JSON.parse(localStorage.getItem(STORAGE_SETTINGS_ID));
} catch (e) {
settings = {};
}
if (settings && settings.auth && settings.auth.apiId && settings.auth.apiToken) {
$httpProvider.defaults.headers.common['x-api-user'] = settings.auth.apiId;
$httpProvider.defaults.headers.common['x-api-key'] = settings.auth.apiToken;
}
$httpProvider.defaults.headers.common['Content-Type'] = 'application/json;charset=utf-8';
$httpProvider.defaults.headers.common['x-client'] = 'habitica-web';
}]);

20
website/client/js/services/userServices.js
View File

@@ -83,7 +83,7 @@ angular.module('habitrpg')
if (!user.filters) {
user.filters = {};
}
if (!user._wrapped) {
// This wraps user with `ops`, which are functions shared both on client and mobile. When performed on client,
// they update the user in the browser and then send the request to the server, where the same operation is
@@ -129,7 +129,7 @@ angular.module('habitrpg')
}
args.push(opData);
clientResponse = $window.habitrpgShared.ops[opName].apply(null, args);
clientResponse = habitrpgShared.ops[opName].apply(null, args);
} catch (err) {
Notification.text(err.message);
return;
@@ -600,9 +600,17 @@ angular.module('habitrpg')
};
//load settings if we have them
if (localStorage.getItem(STORAGE_SETTINGS_ID)) {
var storedSettings;
try {
storedSettings = localStorage.getItem(STORAGE_SETTINGS_ID) || {};
storedSettings = JSON.parse(storedSettings);
} catch (e) {
storedSettings = {};
}
if (storedSettings.auth && storedSettings.auth.apiId && storedSettings.auth.apiToken) {
//use extend here to make sure we keep object reference in other angular controllers
_.extend(settings, JSON.parse(localStorage.getItem(STORAGE_SETTINGS_ID)));
_.extend(settings, storedSettings);
//if settings were saved while fetch was in process reset the flag.
settings.fetching = false;
@@ -613,7 +621,7 @@ angular.module('habitrpg')
}
//If user does not have ApiID that forward him to settings.
if (!settings.auth.apiId || !settings.auth.apiToken) {
if (!settings || !settings.auth || !settings.auth.apiId || !settings.auth.apiToken) {
//var search = $location.search(); // FIXME this should be working, but it's returning an empty object when at a root url /?_id=...
var search = $location.search($window.location.search.substring(1)).$$search; // so we use this fugly hack instead
if (search.err) return alert(search.err);
@@ -625,7 +633,7 @@ angular.module('habitrpg')
var isStaticOrSocial = $window.location.pathname.match(/^\/(static|social)/);
if (!isStaticOrSocial){
localStorage.clear();
$location.path('/logout');
$window.location.href = '/logout';
}
}
} else {