diff --git a/client/coral-admin/src/actions/auth.js b/client/coral-admin/src/actions/auth.js index 16b6c774a..69e7d4303 100644 --- a/client/coral-admin/src/actions/auth.js +++ b/client/coral-admin/src/actions/auth.js @@ -1,4 +1,4 @@ -import browser from 'bowser'; +import bowser from 'bowser'; import * as actions from '../constants/auth'; import coralApi from 'coral-framework/helpers/response'; import * as Storage from 'coral-framework/helpers/storage'; @@ -29,7 +29,7 @@ export const handleLogin = (email, password, recaptchaResponse) => (dispatch) => .then(({user, token}) => { if (!user) { - if (!browser || browser.name !== 'Safari') { + if (!bowser.safari && !bowser.ios) { Storage.removeItem('token'); } return dispatch(checkLoginFailure('not logged in')); @@ -97,7 +97,7 @@ export const checkLogin = () => (dispatch) => { return coralApi('/auth') .then(({user}) => { if (!user) { - if (!browser || browser.name !== 'Safari') { + if (!bowser.safari && !bowser.ios) { Storage.removeItem('token'); } return dispatch(checkLoginFailure('not logged in')); diff --git a/client/coral-framework/actions/auth.js b/client/coral-framework/actions/auth.js index c4d6d782e..2deda5f1d 100644 --- a/client/coral-framework/actions/auth.js +++ b/client/coral-framework/actions/auth.js @@ -1,6 +1,6 @@ import jwtDecode from 'jwt-decode'; import {pym} from 'coral-framework'; -import browser from 'bowser'; +import bowser from 'bowser'; import * as actions from '../constants/auth'; import * as Storage from '../helpers/storage'; import coralApi, {base} from '../helpers/response'; @@ -127,7 +127,7 @@ export const fetchSignIn = (formData) => { return coralApi('/auth/local', {method: 'POST', body: formData}) .then(({token}) => { - if (!browser || browser.name !== 'Safari') { + if (!bowser.safari && !bowser.ios) { dispatch(handleAuthToken(token)); } dispatch(hideSignInDialog()); @@ -270,7 +270,7 @@ export const fetchForgotPassword = (email) => (dispatch) => { export const logout = () => (dispatch) => { return coralApi('/auth', {method: 'DELETE'}).then(() => { - if (!browser || browser.name !== 'Safari') { + if (!bowser.safari && !bowser.ios) { Storage.removeItem('token'); } dispatch({type: actions.LOGOUT}); @@ -295,7 +295,7 @@ export const checkLogin = () => (dispatch) => { coralApi('/auth') .then((result) => { if (!result.user) { - if (!browser || browser.name !== 'Safari') { + if (!bowser.safari && !bowser.ios) { Storage.removeItem('token'); } throw new Error('Not logged in'); diff --git a/client/coral-framework/helpers/response.js b/client/coral-framework/helpers/response.js index b3e167d16..ac6e53cf9 100644 --- a/client/coral-framework/helpers/response.js +++ b/client/coral-framework/helpers/response.js @@ -1,4 +1,4 @@ -import browser from 'bowser'; +import bowser from 'bowser'; const buildOptions = (inputOptions = {}) => { const defaultOptions = { @@ -15,7 +15,7 @@ const buildOptions = (inputOptions = {}) => { ...inputOptions }; - if (!browser || browser.name !== 'Safari') { + if (!bowser.safari && !bowser.ios) { let authorization = localStorage.getItem('token'); if (authorization) { diff --git a/client/coral-framework/services/transport.js b/client/coral-framework/services/transport.js index 8aa33e2f4..0c430a021 100644 --- a/client/coral-framework/services/transport.js +++ b/client/coral-framework/services/transport.js @@ -1,6 +1,6 @@ import {createNetworkInterface} from 'apollo-client'; import * as Storage from '../helpers/storage'; -import browser from 'bowser'; +import bowser from 'bowser'; //============================================================================== // NETWORK INTERFACE @@ -23,7 +23,7 @@ networkInterface.use([{ req.options.headers = {}; // Create the header object if needed. } - if (!browser || browser.name !== 'Safari') { + if (!bowser.safari && !bowser.ios) { req.options.headers['authorization'] = `Bearer ${Storage.getItem('token')}`; }