wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-15 11:26:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Detect mobile safari & desktop safari

Browse Source
This commit is contained in:
Chi Vinh Le
2017-05-26 20:48:24 +07:00
parent bab47c9d44
commit 6a1befc3f0
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/coral-admin/src/actions/auth.js
+3 -3
View File
@@ -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'));
client/coral-framework/actions/auth.js
+4 -4
View File
@@ -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');
client/coral-framework/helpers/response.js
+2 -2
View File
@@ -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) {
client/coral-framework/services/transport.js
+2 -2
View File
@@ -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')}`;
}