turniere
/
turniere-frontend
mirror of https://github.com/turniere/turniere-frontend.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Add verification of credentials after loading page

This commit is contained in:
JP1998 2018-12-03 15:48:05 +01:00
parent 13f7373f6f
commit ba12956abc
1 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
js/api.js
View File

@ -9,20 +9,24 @@ const api_url = 'https://api.turnie.re';
const actiontypes_userinfo = { const actiontypes_userinfo = {
'REGISTER' : 'REGISTER', 'REGISTER' : 'REGISTER',
'REGISTER_RESULT_SUCCESS' : 'REGISTER_RESULT_SUCCESS', 'REGISTER_RESULT_SUCCESS' : 'REGISTER_RESULT_SUCCESS',
'REGISTER_RESULT_ERROR' : 'REGISTER_RESULT_ERROR', 'REGISTER_RESULT_ERROR' : 'REGISTER_RESULT_ERROR',
'LOGIN' : 'LOGIN', 'LOGIN' : 'LOGIN',
'LOGIN_RESULT_SUCCESS' : 'LOGIN_RESULT_SUCCESS', 'LOGIN_RESULT_SUCCESS' : 'LOGIN_RESULT_SUCCESS',
'LOGIN_RESULT_ERROR' : 'LOGIN_RESULT_ERROR', 'LOGIN_RESULT_ERROR' : 'LOGIN_RESULT_ERROR',
'LOGOUT' : 'LOGOUT',
'LOGOUT' : 'LOGOUT', 'VERIFY_CREDENTIALS' : 'VERIFY_CREDENTIALS',
'APPLY_SIGN_OUT' : 'APPLY_SIGN_OUT', 'VERIFY_CREDENTIALS_SUCCESS' : 'VERIFY_CREDENTIALS_SUCCESS',
'VERIFY_CREDENTIALS_ERROR' : 'VERIFY_CREDENTIALS_ERROR',
'STORE_AUTH_HEADERS' : 'STORE_AUTH_HEADERS', 'STORE_AUTH_HEADERS' : 'STORE_AUTH_HEADERS',
'REHYDRATE' : 'USERINFO_REHYDRATE', 'REHYDRATE' : 'USERINFO_REHYDRATE',
'CLEAR' : 'USERINFO_CLEAR',
} }
const defaultstate_userinfo = { const defaultstate_userinfo = {
@ -185,12 +189,30 @@ const reducer_userinfo = (state = defaultstate_userinfo, action) => {
case actiontypes_userinfo.LOGOUT: case actiontypes_userinfo.LOGOUT:
deleteRequest(state, '/users/sign_out').then((resp) => { deleteRequest(state, '/users/sign_out').then((resp) => {
__store.dispatch({ type : actiontypes_userinfo.APPLY_SIGN_OUT }); __store.dispatch({ type : actiontypes_userinfo.CLEAR });
}).catch((error) => { }).catch((error) => {
__store.dispatch({ type : actiontypes_userinfo.APPLY_SIGN_OUT }); __store.dispatch({ type : actiontypes_userinfo.CLEAR });
}); });
return Object.assign({}, state, {}); return Object.assign({}, state, {});
case actiontypes_userinfo.APPLY_SIGN_OUT: case actiontypes_userinfo.STORE_AUTH_HEADERS:
return Object.assign({}, state, {
accesstoken : action.parameters.accesstoken,
client : action.parameters.client,
expiry : action.parameters.expiry,
uid : action.parameters.uid
});
case actiontypes_userinfo.VERIFY_CREDENTIALS:
getRequest(state, '/users/validate_token').then((resp) => {
storeOptionalToken(resp);
}).catch((error) => {
__store.dispatch({ type: actiontypes_userinfo.CLEAR });
});
return Object.assign({}, state, {});
case actiontypes_userinfo.REHYDRATE:
return Object.assign({}, state, action.parameters);
case actiontypes_userinfo.CLEAR:
return Object.assign({}, state, { return Object.assign({}, state, {
isSignedIn : false, isSignedIn : false,
username : null, username : null,
@ -202,15 +224,6 @@ const reducer_userinfo = (state = defaultstate_userinfo, action) => {
expiry : null, expiry : null,
uid : null uid : null
}); });
case actiontypes_userinfo.STORE_AUTH_HEADERS:
return Object.assign({}, state, {
accesstoken : action.parameters.accesstoken,
client : action.parameters.client,
expiry : action.parameters.expiry,
uid : action.parameters.uid
});
case actiontypes_userinfo.REHYDRATE:
return Object.assign({}, state, action.parameters);
default: return state; default: return state;
} }
} }
@ -240,7 +253,9 @@ export function initializeStore(initialState = default_applicationstate) {
export function verifyCredentials() { export function verifyCredentials() {
rehydrateApplicationState(); rehydrateApplicationState();
// TODO: Actually perform a verification of the loaded credentials if(__store.getState().userinfo.isSignedIn) {
__store.dispatch({ type: actiontypes_userinfo.VERIFY_CREDENTIALS });
}
} }
export function register(username, email, password) { export function register(username, email, password) {