ulysia/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed app state authentication variables

Browse source
This commit is contained in:
Marcin Kurczewski 2014-09-01 08:07:51 +02:00
parent 2b2aa04aea
commit a55a8a825c
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
public_html/js/Auth.js
View file

@ -6,9 +6,7 @@ App.Auth = function(jQuery, api, appState) {
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
api.post('/login', {userName: userName, password: password}) api.post('/login', {userName: userName, password: password})
.then(function(response) { .then(function(response) {
appState.set('loggedIn', true); updateAppState(response);
appState.set('loggedInUser', response.json.user);
appState.set('loginToken', response.json.token);
jQuery.cookie( jQuery.cookie(
'auth', 'auth',
response.json.token.name, response.json.token.name,
@ -24,9 +22,7 @@ App.Auth = function(jQuery, api, appState) {
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
api.post('/login', {token: token}) api.post('/login', {token: token})
.then(function(response) { .then(function(response) {
appState.set('loggedIn', response.json.user && response.json.user.id); updateAppState(response);
appState.set('loggedInUser', response.json.user);
appState.set('loginToken', response.json.token.name);
resolve(response); resolve(response);
}).catch(function(response) { }).catch(function(response) {
reject(response); reject(response);
@ -38,9 +34,7 @@ App.Auth = function(jQuery, api, appState) {
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
api.post('/login') api.post('/login')
.then(function(response) { .then(function(response) {
appState.set('loggedIn', false); updateAppState(response);
appState.set('loggedInUser', response.json.user);
appState.set('loginToken', null);
resolve(response); resolve(response);
}).catch(function(response) { }).catch(function(response) {
reject(response); reject(response);
@ -79,6 +73,12 @@ App.Auth = function(jQuery, api, appState) {
}); });
}; };
function updateAppState(response) {
appState.set('loggedIn', response.json.user && !!response.json.user.id);
appState.set('loginToken', response.json.token && response.json.token.name);
appState.set('loggedInUser', response.json.user);
}
return { return {
loginFromCredentials: loginFromCredentials, loginFromCredentials: loginFromCredentials,
loginFromToken: loginFromToken, loginFromToken: loginFromToken,