Merge pull request #288 from ajinkyapandetekdi/25-feb-1.4.0

Issueid #236033 Not Able to Record Audio in TN-Staging after CSP changes
Sunbird-ALL · Feb 28, 2025 · 267acea · 267acea
2 parents b42c5ee + 5fc62df
commit 267acea
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 41 deletions.
diff --git a/public/index.html b/public/index.html
@@ -12,7 +12,7 @@
       name="description"
       content="Base React App structure for Devigital Systems Projects"
     />
-    
+
     <!-- <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" /> -->
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
     <link rel="preconnect" href="https://fonts.googleapis.com" />
@@ -23,24 +23,26 @@
     />
     <link href="https://fonts.cdnfonts.com/css/bad-comic" rel="stylesheet" />
     <script src="./js/jquery-3.7.0.min.js" defer></script>
-    <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/confetti.browser.min.js"></script>
     <title>EkStep</title>
 
     <!-- Content Security Policy -->
-    <meta http-equiv="Content-Security-Policy" content="
-      default-src 'self';
-      script-src 'self' https://cdn.jsdelivr.net/npm/[email protected]/dist/confetti.browser.min.js 'unsafe-eval';
-      style-src 'self' https://fonts.googleapis.com https://fonts.cdnfonts.com 'unsafe-inline';
-      object-src 'none';
-      base-uri 'self';
-      connect-src 'self' *.theall.ai;
-      font-src 'self' https://fonts.googleapis.com https://fonts.cdnfonts.com https://fonts.gstatic.com;
-      frame-src 'self';
-      img-src 'self' https://images.squarespace-cdn.com data:;
-      manifest-src 'self';
-      media-src 'self';
-      worker-src 'none';
-    " />
+<meta http-equiv="Content-Security-Policy" content="
+  default-src 'none';
+  script-src 'self' https://cdn.jsdelivr.net/npm/[email protected]/dist/confetti.browser.min.js 'unsafe-eval';
+  style-src 'self' https://fonts.googleapis.com https://fonts.cdnfonts.com 'unsafe-inline';
+  object-src 'none';
+  base-uri 'self';
+  connect-src 'self' *.theall.ai https://all-prod-content-service.s3.ap-south-1.amazonaws.com blob:;
+  font-src 'self' https://fonts.googleapis.com https://fonts.cdnfonts.com https://fonts.gstatic.com;
+  frame-src 'self';
+  img-src 'self' https://images.squarespace-cdn.com https://all-prod-content-service.s3.ap-south-1.amazonaws.com https://s3.ap-south-1.amazonaws.com data: blob: https://raw.githubusercontent.com/;
+  manifest-src 'self';
+  media-src 'self' blob: https://all-prod-content-service.s3.ap-south-1.amazonaws.com;
+  worker-src 'self' blob: https://d114esnbvw5tst.cloudfront.net;
+  form-action 'self';
+  frame-ancestors 'self';
+" />
+
 
   </head>
   <body>

diff --git a/src/components/Layouts.jsx/MainLayout.jsx b/src/components/Layouts.jsx/MainLayout.jsx
@@ -795,7 +795,7 @@ const MainLayout = (props) => {
                         >
                           <Stack justifyContent="center" alignItems="center">
                             <img
-                              src={`https://raw.githubusercontent.com/Sunbird-ALL/all-learner-ai-app/refs/heads/all-1.3/src/assets/images/gameLost.svg`}
+                              src={gameLost}
                               alt="gameLost"
                               style={{ height: 340 }}
                             />
@@ -923,13 +923,10 @@ const MainLayout = (props) => {
                                     </Box>
 
                                     {elem?.correctAnswer === false ? (
-                                      <img
-                                        src="https://raw.githubusercontent.com/Sunbird-ALL/all-learner-ai-app/refs/heads/all-1.2-tn-dev/src/assets/wrong.svg"
-                                        alt="wrongImage"
-                                      />
+                                      <img src={wrongImage} alt="wrongImage" />
                                     ) : (
                                       <img
-                                        src="https://raw.githubusercontent.com/Sunbird-ALL/all-learner-ai-app/refs/heads/all-1.2-tn-dev/src/assets/correct.svg"
+                                        src={correctImage}
                                         alt="correctImage"
                                       />
                                     )}
@@ -944,7 +941,9 @@ const MainLayout = (props) => {
                                         minWidth: "100px",
                                       }}
                                     >
-                                      {elem.selectedAnswer || "Binocular"}
+                                      {elem?.correctOption?.length > 0
+                                        ? elem.correctOption
+                                        : elem.selectedAnswer || "Binocular"}
                                     </span>
                                   </Stack>
                                 ))}
@@ -962,10 +961,7 @@ const MainLayout = (props) => {
                                 justifyContent={"center"}
                                 alignItems={"center"}
                               >
-                                <img
-                                  src="https://raw.githubusercontent.com/Sunbird-ALL/all-learner-ai-app/refs/heads/all-1.2-tn-dev/src/assets/turtle.svg"
-                                  alt="turtleImage"
-                                />
+                                <img src={turtleImage} alt="turtleImage" />
                                 <span
                                   style={{
                                     marginTop: "12px",

diff --git a/src/services/learnerAi/learnerAiService.js b/src/services/learnerAi/learnerAiService.js
@@ -10,7 +10,7 @@ const getHeaders = () => {
   return {
     headers: {
       Authorization: `Bearer ${token}`,
-      "Content-Type": "application/json"
+      "Content-Type": "application/json",
     },
   };
 };
@@ -66,7 +66,6 @@ export const fetchGetSetResult = async (
         collectionId: currentCollectionId,
         totalSyllableCount: totalSyllableCount,
         language: lang,
-        user_id: getVirtualId(),
       },
       getHeaders()
     );
@@ -91,7 +90,6 @@ export const getSetResultPractice = async ({
         sub_session_id: subSessionId,
         contentType: currentContentType,
         session_id: sessionId,
-        user_id: getVirtualId(),
         totalSyllableCount: totalSyllableCount,
         language: localStorage.getItem("lang"),
         is_mechanics: mechanism && mechanism?.id ? true : false,
@@ -107,7 +105,6 @@ export const getSetResultPractice = async ({
 
 export const updateLearnerProfile = async (lang, requestBody) => {
   try {
-    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
@@ -11,7 +11,7 @@ const getHeaders = () => {
   return {
     headers: {
       Authorization: `Bearer ${token}`,
-      "Content-Type": "application/json"
+      "Content-Type": "application/json",
     },
   };
 };
@@ -53,7 +53,6 @@ export const addPointer = async (points, milestone) => {
     const response = await axios.post(
       `${API_BASE_URL_ORCHESTRATION}/${config.URLS.ADD_POINTER}`,
       {
-        userId: getVirtualId(),
         sessionId: sessionId,
         points: points,
         language: lang,
@@ -78,7 +77,6 @@ export const createLearnerProgress = async (
 
   try {
     const requestBody = {
-      userId: getVirtualId(),
       sessionId: sessionId,
       subSessionId: subSessionId,
       milestoneLevel: milestoneLevel,
@@ -111,7 +109,6 @@ export const addLesson = async ({
     const response = await axios.post(
       `${API_BASE_URL_ORCHESTRATION}/${config.URLS.ADD_LESSON}`,
       {
-        userId: getVirtualId(),
         sessionId: sessionId,
         milestone: milestone,
         lesson: lesson,

diff --git a/src/views/Practice/Practice.jsx b/src/views/Practice/Practice.jsx
@@ -137,7 +137,8 @@ const Practice = () => {
         {
           score: score,
           message: "all-test-rig-score",
-        }, window?.location?.ancestorOrigins?.[0] || window.parent.location.origin
+        },
+        window?.location?.ancestorOrigins?.[0] || window.parent.location.origin
       );
     }
   };
@@ -419,10 +420,8 @@ const Practice = () => {
           });
       }
 
-      let userState = Number.isInteger(
-        Number(resLessons?.result?.result?.lesson)
-      )
-        ? Number(resLessons.result?.result?.lesson)
+      let userState = Number.isInteger(Number(resLessons?.result?.lesson))
+        ? Number(resLessons.result?.lesson)
         : 0;
 
       // TODO: revisit this - looks like not required
@@ -713,7 +712,11 @@ const Practice = () => {
               "mechanic_1")
             ? 500
             : stringLengths[0];
-        window.parent.postMessage({ type: "stringLengths", length }, window?.location?.ancestorOrigins?.[0] || window.parent.location.origin);
+        window.parent.postMessage(
+          { type: "stringLengths", length },
+          window?.location?.ancestorOrigins?.[0] ||
+            window.parent.location.origin
+        );
       }
     }
   }, [questions[currentQuestion]]);