@truedat/core 4.48.11 → 4.48.14

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [4.48.14] 2022-07-29
+
+### Fixed
+
+- [TD-5094] Federated authentication fails if token is present in local storage
+
 ## [4.48.10] 2022-07-19
 
 ### Added

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/core",
-  "version": "4.48.11",
+  "version": "4.48.14",
   "description": "Truedat Web Core",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -112,5 +112,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "c174776672b9079d23a00a6561db635d43cbeb32"
+  "gitHead": "958a84bddc4a739679ea01e0758b78fa6583e240"
 }

package/src/services/axios.js

@@ -1,22 +1,35 @@
+import _ from "lodash/fp";
 import axios from "axios";
-import { readToken } from "./storage";
+import { clearToken, readToken } from "./storage";
 
-axios.interceptors.request.use(
-  function (config) {
+// If no authorization header is present and token exists in local storage, put
+// the bearer token authorization header
+const maybePutAuthorization = (config) => {
+  if (config.headers?.authorization) {
+    return config;
+  } else {
     const token = readToken();
     return token === null
-      ? config
+      ? token
       : {
           ...config,
           headers: {
             ...config.headers,
-            Authorization: `Bearer ${token}`,
+            authorization: `Bearer ${token}`,
           },
         };
-  },
-  function (err) {
-    return Promise.reject(err);
   }
-);
+};
+
+// If an unauthorized response is received, remove token from local storage
+const maybeClearToken = (error) => {
+  if (error?.response?.status === 401) {
+    clearToken();
+  }
+  return Promise.reject(error);
+};
+
+axios.interceptors.request.use(maybePutAuthorization, Promise.reject);
+axios.interceptors.response.use(_.identity, maybeClearToken);
 
 export default axios;