Merge pull request #1716 from glific/fix/renew-call

Fixed renew call issues
glific · Oct 25, 2021 · 3ef07fb · 3ef07fb
2 parents 5dc7943 + 33241da
commit 3ef07fb
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 18 deletions.
diff --git a/src/common/utils.ts b/src/common/utils.ts
@@ -30,7 +30,7 @@ const validateMediaMethod = (URL: string, attachmentType: string) =>
   new Promise((resolve) => {
     axios
       .get(`${FLOW_EDITOR_API}validate-media?url=${URL}&type=${attachmentType.toLowerCase()}`, {
-        headers: { Authorization: getAuthSession('access_token') },
+        headers: { authorization: getAuthSession('access_token') },
       })
       .then((response: any) => {
         resolve(response);

diff --git a/src/components/floweditor/FlowEditor.tsx b/src/components/floweditor/FlowEditor.tsx
@@ -307,7 +307,7 @@ export const FlowEditor = (props: FlowEditorProps) => {
 
   useEffect(() => {
     if (flowId) {
-      const { fetch, xmlSend } = setAuthHeaders();
+      const { fetch, xmlSend, xmlOpen } = setAuthHeaders();
       const files = loadfiles(() => {
         getFreeFlow({ variables: { id: flowId } });
       });
@@ -329,6 +329,7 @@ export const FlowEditor = (props: FlowEditorProps) => {
           clearTimeout(timeoutId);
         }
         XMLHttpRequest.prototype.send = xmlSend;
+        XMLHttpRequest.prototype.open = xmlOpen;
         window.fetch = fetch;
       };
     }

diff --git a/src/config/apolloclient.ts b/src/config/apolloclient.ts
@@ -61,7 +61,7 @@ const gqlClient = (history: any) => {
     return {
       headers: {
         ...headers,
-        Authorization: accessToken || '',
+        authorization: accessToken || '',
       },
     };
   });

diff --git a/src/containers/Auth/Logout/Logout.tsx b/src/containers/Auth/Logout/Logout.tsx
@@ -33,7 +33,7 @@ export const Logout: React.SFC<LogoutProps> = (props: any) => {
   // let's notify the backend when user logs out
   const userLogout = () => {
     // get the auth token from session
-    axios.defaults.headers.common.Authorization = getAuthSession('access_token');
+    axios.defaults.headers.common.authorization = getAuthSession('access_token');
     axios.delete(USER_SESSION);
   };
 

diff --git a/src/containers/Chat/ChatMessages/AddVariables/AddVariables.tsx b/src/containers/Chat/ChatMessages/AddVariables/AddVariables.tsx
@@ -38,7 +38,7 @@ export const AddVariables: React.FC<AddVariablesPropTypes> = ({
   const glificBase = FLOW_EDITOR_API;
   const contactFieldsprefix = '@contact.fields.';
   const contactVariablesprefix = '@contact.';
-  const headers = { Authorization: getAuthSession('access_token') };
+  const headers = { authorization: getAuthSession('access_token') };
 
   useEffect(() => {
     const getVariableOptions = async () => {

diff --git a/src/containers/InteractiveMessage/InteractiveMessage.helper.ts b/src/containers/InteractiveMessage/InteractiveMessage.helper.ts
@@ -163,7 +163,7 @@ export const getVariableOptions = async (setContactVariables: any) => {
 
   const contactFieldsprefix = '@contact.fields.';
   const contactVariablesprefix = '@contact.';
-  const headers = { Authorization: getAuthSession('access_token') };
+  const headers = { authorization: getAuthSession('access_token') };
   // get fields keys
   const fieldsData = await axios.get(`${glificBase}fields`, {
     headers,

diff --git a/src/services/AuthService.tsx b/src/services/AuthService.tsx
@@ -35,7 +35,7 @@ export const renewAuthToken = () => {
     return new Error('Error');
   }
   // get the renewal token from session
-  axios.defaults.headers.common.Authorization = renewalToken;
+  axios.defaults.headers.common.authorization = renewalToken;
 
   return axios
     .post(RENEW_TOKEN)
@@ -147,7 +147,7 @@ export const getUserSession = (element?: string) => {
 export const setAuthHeaders = () => {
   // // add authorization header in all calls
   let renewTokenCalled = false;
-  let tokenRenewed = false;
+  let renewCallInProgress = false;
 
   const { fetch } = window;
   window.fetch = (...args) =>
@@ -169,47 +169,74 @@ export const setAuthHeaders = () => {
         // update localstore
         setAuthSession(JSON.stringify(authToken.data.data));
         renewTokenCalled = false;
-        tokenRenewed = false;
       }
       if (parametersCopy[1]) {
         parametersCopy[1].headers = {
           ...parametersCopy[1].headers,
-          Authorization: getAuthSession('access_token'),
+          authorization: getAuthSession('access_token'),
         };
       }
       const result = await fetch(...parametersCopy);
       return result;
     })(args);
 
   const xmlSend = XMLHttpRequest.prototype.send;
+  const xmlOpen = XMLHttpRequest.prototype.open;
+
+  ((open) => {
+    // @ts-ignore
+    XMLHttpRequest.prototype.open = function authOpen(
+      method: string,
+      url: string | URL,
+      async: boolean,
+      username?: string | null,
+      password?: string | null
+    ) {
+      if (url.toString().endsWith('renew')) {
+        // @ts-ignore
+        this.renewGlificCall = true;
+      }
+      open.call(this, method, url, async, username, password);
+    };
+  })(XMLHttpRequest.prototype.open);
 
   ((send) => {
     XMLHttpRequest.prototype.send = async function authCheck(body) {
       this.addEventListener('loadend', () => {
-        if (this.status === 401) {
+        // @ts-ignore
+        if (this.renewGlificCall) {
+          renewCallInProgress = false;
+        } else if (this.status === 401) {
           window.location.href = '/logout/user';
         }
       });
-      if (checkAuthStatusService()) {
-        this.setRequestHeader('Authorization', getAuthSession('access_token'));
+
+      // @ts-ignore
+      if (this.renewGlificCall && !renewCallInProgress) {
+        renewCallInProgress = true;
         send.call(this, body);
-      } else if (renewTokenCalled && !tokenRenewed) {
+      }
+      // @ts-ignore
+      else if (this.renewGlificCall) {
+        this.abort();
+      }
+      // @ts-ignore
+      else if (checkAuthStatusService()) {
+        this.setRequestHeader('authorization', getAuthSession('access_token'));
         send.call(this, body);
-        tokenRenewed = true;
       } else if (!renewTokenCalled) {
         renewTokenCalled = true;
         const authToken = await renewAuthToken();
         if (authToken.data) {
           // update localstore
           setAuthSession(JSON.stringify(authToken.data.data));
           renewTokenCalled = false;
-          tokenRenewed = false;
         }
-        this.setRequestHeader('Authorization', getAuthSession('access_token'));
+        this.setRequestHeader('authorization', getAuthSession('access_token'));
         send.call(this, body);
       }
     };
   })(XMLHttpRequest.prototype.send);
 
-  return { xmlSend, fetch };
+  return { xmlSend, fetch, xmlOpen };
 };