From ac9e70bc67d890f781efc5056ca2586068841c5d Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Mon, 5 Jun 2017 17:48:09 +0700
Subject: [PATCH] Add same getAuthToken logic to apollo transport

---
 client/coral-framework/helpers/request.js    | 3 +--
 client/coral-framework/services/transport.js | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/client/coral-framework/helpers/request.js b/client/coral-framework/helpers/request.js
index 46ef8fd51..52b9ea7da 100644
--- a/client/coral-framework/helpers/request.js
+++ b/client/coral-framework/helpers/request.js
@@ -9,7 +9,7 @@ import {getStore} from 'coral-framework/services/store';
  *   browsers that don't allow us to use cross domain iframe local storage.
  * @return {string|null}
  */
-const getAuthToken = () => {
+export const getAuthToken = () => {
   let state = getStore().getState();
 
   if (state.config.auth_token) {
@@ -21,7 +21,6 @@ const getAuthToken = () => {
 
     // Use local storage auth tokens where there's a stable api.
     return Storage.getItem('token');
-
   }
 
   return null;
diff --git a/client/coral-framework/services/transport.js b/client/coral-framework/services/transport.js
index 0c430a021..f11c20888 100644
--- a/client/coral-framework/services/transport.js
+++ b/client/coral-framework/services/transport.js
@@ -1,6 +1,5 @@
 import {createNetworkInterface} from 'apollo-client';
-import * as Storage from '../helpers/storage';
-import bowser from 'bowser';
+import {getAuthToken} from '../helpers/request';
 
 //==============================================================================
 // NETWORK INTERFACE
@@ -23,8 +22,9 @@ networkInterface.use([{
       req.options.headers = {};  // Create the header object if needed.
     }
 
-    if (!bowser.safari && !bowser.ios) {
-      req.options.headers['authorization'] = `Bearer ${Storage.getItem('token')}`;
+    let authToken = getAuthToken();
+    if (authToken) {
+      req.options.headers['authorization'] = `Bearer ${authToken}`;
     }
 
     next();