avniproject/avni-webapp#1242 | Use global axios headers only in servicing DEA calls routed through avni-server

Author: himeshr

package-lock.json

@@ -11,7 +11,7 @@
     "safe-eval": "^0.4.1",
     "uuid": "^7.0.2",
     "avni-health-modules": "0.0.26",
-    "openchs-models": "1.31.48",
+    "openchs-models": "1.31.76",
     "rules-config": "https://github.com/avniproject/rules-config.git#fe552da405368bfd138e2f38e605c1d307e3ebe4",
     "lodash": "^4.17.11",
     "moment": "^2.22.2"

package.json

@@ -12,7 +12,7 @@ export const setUploadUser = async () => {
         console.debug("Fetched details ", details);
         cognitoDetails.setDetails(details);
     }
-    if (!cognitoDetails.isDummy()) {
+    if (!(cognitoDetails.isDummy() || cognitoDetails.isEmpty())) {
         console.debug("Setting up upload user");
         await setupUploadUser();
     }
@@ -37,7 +37,7 @@ const signIn = async function () {
 };
 
 export const getUploadUserToken = async () => {
-    if (cognitoDetails.isDummy()) return null;
+    if (cognitoDetails.isDummy() || cognitoDetails.isEmpty()) return null;
     console.debug("Getting upload user token");
     const currentSession = await Auth.currentSession();
     const jwtToken = currentSession.idToken.jwtToken;

src/services/AuthService.js

@@ -6,11 +6,11 @@ const BASE_URL = "http://localhost:8021";
 export default {
     getLegacyRulesBundle: (token) =>
         axios
-            .get(BASE_URL + "/ruleDependency/search/lastModified?lastModifiedDateTime=1900-01-01T00:00:00.000Z&size=1000", putTokenHeader(token))
+            .get(BASE_URL + "/ruleDependency/search/lastModified?lastModifiedDateTime=1900-01-01T00:00:00.000Z&size=1000", token && putTokenHeader(token))
             .then(response => get(response, "data._embedded.ruleDependency[0].code")),
     getLegacyRules: (token) =>
         axios
-            .get(BASE_URL + "/rule/search/lastModified?lastModifiedDateTime=1900-01-01T00:00:00.000Z&size=1000", putTokenHeader(token))
+            .get(BASE_URL + "/rule/search/lastModified?lastModifiedDateTime=1900-01-01T00:00:00.000Z&size=1000", token && putTokenHeader(token))
             .then(response => get(response, "data._embedded.rule")),
     getSubjects: (addressLevelUUID, subjectTypeName) =>
         axios