Set only auth headers in token.ts DAH-1071 (#1589)

SFDigitalServices · Feb 17, 2022 · 587592a · 587592a
1 parent a65bfbf
commit 587592a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/app/javascript/api/apiService.ts b/app/javascript/api/apiService.ts
@@ -1,6 +1,6 @@
 import axios, { AxiosInstance, AxiosRequestConfig, AxiosResponse } from "axios"
 
-import { setHeaders, getHeaders } from "../authentication/token"
+import { setAuthHeaders, getHeaders } from "../authentication/token"
 
 // Use this function for authenticated calls
 const createAxiosInstance = (): AxiosInstance => {
@@ -12,7 +12,7 @@ const createAxiosInstance = (): AxiosInstance => {
     headers: getHeaders(),
     transformResponse: (res, headers) => {
       if (headers["access-token"]) {
-        setHeaders(headers)
+        setAuthHeaders(headers)
       }
       return JSON.parse(res)
     },

diff --git a/app/javascript/api/authApiService.ts b/app/javascript/api/authApiService.ts
@@ -1,4 +1,4 @@
-import { setHeaders } from "../authentication/token"
+import { setAuthHeaders } from "../authentication/token"
 import { User, UserData } from "../authentication/user"
 import { authenticatedGet, post, put } from "./apiService"
 
@@ -7,7 +7,7 @@ export const signIn = async (email: string, password: string): Promise<User> =>
     email,
     password,
   }).then(({ data, headers }) => {
-    setHeaders(headers)
+    setAuthHeaders(headers)
     return data.data
   })
 

diff --git a/app/javascript/authentication/token.ts b/app/javascript/authentication/token.ts
@@ -24,8 +24,16 @@ export interface AuthHeaders {
   "token-type": string
 }
 
-export const setHeaders = (headers: AuthHeaders) => {
-  getStorage().setItem(ACCESS_TOKEN_LOCAL_STORAGE_KEY, JSON.stringify(headers))
+export const setAuthHeaders = (headers: AuthHeaders) => {
+  // Set only relevant auth headers
+  const headersToSet = {
+    expiry: headers.expiry,
+    "access-token": headers["access-token"],
+    client: headers.client,
+    uid: headers.uid,
+    "token-type": headers["token-type"],
+  }
+  getStorage().setItem(ACCESS_TOKEN_LOCAL_STORAGE_KEY, JSON.stringify(headersToSet))
 }
 
 export const getHeaders = (): AuthHeaders | undefined => getAuthHeaders()