Merge pull request Sunbird-ALL#274 from ajinkyapandetekdi/api-service…

…-all-1.4.0 fix virtualId issue
Bhashabyasa · Feb 6, 2025 · 66a9561 · 66a9561
2 parents 6493338 + cdbf934
commit 66a9561
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 21 deletions.
diff --git a/src/services/learnerAi/learnerAiService.js b/src/services/learnerAi/learnerAiService.js
@@ -1,17 +1,10 @@
 import axios from "axios";
 import config from "../../utils/urlConstants.json";
 import { getLocalData } from "../../utils/constants";
-import { jwtDecode } from "jwt-decode";
+import { getVirtualId } from "../userservice/userService";
 
 const API_LEARNER_AI_APP_HOST = process.env.REACT_APP_LEARNER_AI_APP_HOST;
 
-const TOKEN = localStorage.getItem("apiToken");
-let virtualId;
-if (TOKEN) {
-  const tokenDetails = jwtDecode(TOKEN);
-  virtualId = JSON.stringify(tokenDetails?.virtual_id);
-}
-
 const getHeaders = () => {
   const token = getLocalData("apiToken");
   return {
@@ -73,7 +66,7 @@ export const fetchGetSetResult = async (
         collectionId: currentCollectionId,
         totalSyllableCount: totalSyllableCount,
         language: lang,
-        user_id: virtualId,
+        user_id: getVirtualId(),
       },
       getHeaders()
     );
@@ -98,7 +91,7 @@ export const getSetResultPractice = async ({
         sub_session_id: subSessionId,
         contentType: currentContentType,
         session_id: sessionId,
-        user_id: virtualId,
+        user_id: getVirtualId(),
         totalSyllableCount: totalSyllableCount,
         language: localStorage.getItem("lang"),
         is_mechanics: mechanism && mechanism?.id ? true : false,
@@ -114,7 +107,7 @@ export const getSetResultPractice = async ({
 
 export const updateLearnerProfile = async (lang, requestBody) => {
   try {
-    requestBody.user_id = virtualId;
+    requestBody.user_id = getVirtualId();
     const response = await axios.post(
       `${API_LEARNER_AI_APP_HOST}/${config.URLS.UPDATE_LEARNER_PROFILE}/${lang}`,
       requestBody,

diff --git a/src/services/orchestration/orchestrationService.js b/src/services/orchestration/orchestrationService.js
@@ -1,16 +1,10 @@
 import axios from "axios";
 import { getLocalData } from "../../utils/constants";
 import config from "../../utils/urlConstants.json";
-import { jwtDecode } from "jwt-decode";
+import { getVirtualId } from "../userservice/userService";
 
 const API_BASE_URL_ORCHESTRATION =
   process.env.REACT_APP_LEARNER_AI_ORCHESTRATION_HOST;
-const TOKEN = localStorage.getItem("apiToken");
-let virtualId;
-if (TOKEN) {
-  const tokenDetails = jwtDecode(TOKEN);
-  virtualId = JSON.stringify(tokenDetails?.virtual_id);
-}
 
 const getHeaders = () => {
   const token = getLocalData("apiToken");
@@ -59,7 +53,7 @@ export const addPointer = async (points, milestone) => {
     const response = await axios.post(
       `${API_BASE_URL_ORCHESTRATION}/${config.URLS.ADD_POINTER}`,
       {
-        userId: virtualId,
+        userId: getVirtualId(),
         sessionId: sessionId,
         points: points,
         language: lang,
@@ -84,7 +78,7 @@ export const createLearnerProgress = async (
 
   try {
     const requestBody = {
-      userId: virtualId,
+      userId: getVirtualId(),
       sessionId: sessionId,
       subSessionId: subSessionId,
       milestoneLevel: milestoneLevel,
@@ -117,7 +111,7 @@ export const addLesson = async ({
     const response = await axios.post(
       `${API_BASE_URL_ORCHESTRATION}/${config.URLS.ADD_LESSON}`,
       {
-        userId: virtualId,
+        userId: getVirtualId(),
         sessionId: sessionId,
         milestone: milestone,
         lesson: lesson,

diff --git a/src/services/userservice/userService.js b/src/services/userservice/userService.js
@@ -1,5 +1,6 @@
 import axios from "axios";
 import config from "../../utils/urlConstants.json";
+import { jwtDecode } from "jwt-decode";
 
 const API_HOST_VIRTUAL_ID_HOST = process.env.REACT_APP_VIRTUAL_ID_HOST;
 
@@ -14,3 +15,17 @@ export const fetchVirtualId = async (username) => {
     throw error;
   }
 };
+
+export const getVirtualId = () => {
+  const TOKEN = localStorage.getItem("apiToken");
+  let virtualId;
+  if (TOKEN) {
+    try {
+      const tokenDetails = jwtDecode(TOKEN);
+      virtualId = JSON.stringify(tokenDetails?.virtual_id);
+    } catch (error) {
+      console.error("Error decoding token:", error);
+    }
+  }
+  return virtualId;
+};