feat: added support for access_token hash passthrough

This commit is contained in:
Wyatt Johnson
2018-10-22 12:13:15 -06:00
parent cd6da751a6
commit 5a1f93975c
3 changed files with 42 additions and 15 deletions
+6 -14
View File
@@ -1,10 +1,5 @@
import * as actions from '../constants/auth';
import jwtDecode from 'jwt-decode';
function cleanAuthData(localStorage) {
localStorage.removeItem('token');
localStorage.removeItem('exp');
}
import { setStorageAuthToken, clearStorageAuthToken } from '../services/auth';
export const checkLogin = () => (
dispatch,
@@ -15,7 +10,7 @@ export const checkLogin = () => (
rest('/auth')
.then(result => {
if (!result.user) {
cleanAuthData(localStorage);
clearStorageAuthToken(localStorage);
dispatch(checkLoginSuccess(null));
client.resetWebsocket();
return;
@@ -32,7 +27,7 @@ export const checkLogin = () => (
.catch(error => {
if (error.status && error.status === 401 && localStorage) {
// Unauthorized.
cleanAuthData(localStorage);
clearStorageAuthToken(localStorage);
client.resetWebsocket();
} else {
console.error(error);
@@ -58,8 +53,7 @@ export const setAuthToken = token => (
_,
{ localStorage, client }
) => {
localStorage.setItem('exp', jwtDecode(token).exp);
localStorage.setItem('token', token);
setStorageAuthToken(localStorage, token);
// Dispatch the set auth token action. For some browsers and situations, we
// may not be able to persist the auth token any other way. Keep it in redux!
@@ -76,9 +70,7 @@ export const handleSuccessfulLogin = (user, token) => (
_,
{ client, localStorage, postMessage }
) => {
const { exp } = jwtDecode(token);
localStorage.setItem('exp', exp);
localStorage.setItem('token', token);
setStorageAuthToken(localStorage, token);
// Send the message via the messages service to the window.opener if it
// exists.
@@ -117,7 +109,7 @@ export const logout = () => async (
}
// Clear the auth data persisted to localStorage.
cleanAuthData(localStorage);
clearStorageAuthToken(localStorage);
// Reset the websocket.
client.resetWebsocket();
+11
View File
@@ -0,0 +1,11 @@
import jwtDecode from 'jwt-decode';
export const setStorageAuthToken = (storage, token) => {
storage.setItem('exp', jwtDecode(token).exp);
storage.setItem('token', token);
};
export const clearStorageAuthToken = storage => {
storage.removeItem('token');
storage.removeItem('exp');
};
+25 -1
View File
@@ -22,6 +22,7 @@ import {
} from 'coral-framework/services/storage';
import { createHistory } from 'coral-framework/services/history';
import { createIntrospection } from 'coral-framework/services/introspection';
import { setStorageAuthToken } from 'coral-framework/services/auth';
import introspectionData from 'coral-framework/graphql/introspection.json';
import coreReducers from '../reducers';
import { checkLogin as checkLoginAction } from '../actions/auth';
@@ -46,9 +47,32 @@ const getAuthToken = (store, storage) => {
// capable of storing the token in localStorage, then we would have
// persisted it to the redux state.
return state.config.auth_token || state.auth.token;
} else if (!bowser.safari && !bowser.ios && storage) {
} else if (
!bowser.safari &&
!bowser.ios &&
storage &&
storage.getItem('token')
) {
// Use local storage auth tokens where there's a stable api.
return storage.getItem('token');
} else if (location.hash && location.hash.startsWith('#access_token=')) {
// Check to see if the access token is living in the URL as a hash.
const token = location.hash.substring(14);
history.replaceState(
{},
document.title,
window.location.pathname + window.location.search
);
// Once we clear the hash above, this login method will not persist across
// refreshes. We will need to persist the token to storage if it's
// available.
if (storage) {
setStorageAuthToken(storage, token);
}
return token;
}
return null;