SEBSERV-859 fixes

Author: anhefti

client/src/services/apiService.ts

@@ -164,20 +164,26 @@ export function createApiInterceptor() {
 
 export function getHeaders(type: string): object {
     const authStore = useAuthStore();
+    const token = authStore.getStorageItem(type);
+
+    console.info("*********** apiService token: " + token);
 
     return {
         accept: "application/json",
-        Authorization: "Bearer " + authStore.getStorageItem(type),
+        Authorization: "Bearer " + token,
         "Content-Type": "application/x-www-form-urlencoded",
     };
 }
 
 export function getPostHeaders(type: string): object {
     const authStore = useAuthStore();
+    const token = authStore.getStorageItem(type);
+
+    console.info("*********** apiService: " + token);
 
     return {
         accept: "application/json",
-        Authorization: "Bearer " + authStore.getStorageItem(type),
+        Authorization: "Bearer " + token,
         "Content-Type": "application/json",
     };
 }

client/src/services/seb-server/api-services/assessmentToolService.ts

@@ -45,9 +45,13 @@ export async function activateAssessmentTool(
 ): Promise<AssessmentTool> {
     const url: string = assessmentToolUrl + "/" + assessmentToolId + "/active";
     return (
-        await apiService.api.post(url, {
-            headers: apiService.getHeaders(StorageItemEnum.ACCESS_TOKEN),
-        })
+        await apiService.api.post(
+            url,
+            {},
+            {
+                headers: apiService.getHeaders(StorageItemEnum.ACCESS_TOKEN),
+            },
+        )
     ).data;
 }
 
@@ -57,9 +61,13 @@ export async function deactivateAssessmentTool(
     const url: string =
         assessmentToolUrl + "/" + assessmentToolId + "/inactive";
     return (
-        await apiService.api.post(url, {
-            headers: apiService.getHeaders(StorageItemEnum.ACCESS_TOKEN),
-        })
+        await apiService.api.post(
+            url,
+            {},
+            {
+                headers: apiService.getHeaders(StorageItemEnum.ACCESS_TOKEN),
+            },
+        )
     ).data;
 }
 

client/src/services/seb-server/api-services/configurationService.ts

@@ -78,9 +78,13 @@ export async function activateConnectionConfiguration(
 ): Promise<ConnectionConfiguration> {
     const url: string = connectionConfigurationUrl + "/" + id + "/active";
     return (
-        await apiService.api.post(url, {
-            headers: apiService.getHeaders(StorageItemEnum.ACCESS_TOKEN),
-        })
+        await apiService.api.post(
+            url,
+            {},
+            {
+                headers: apiService.getHeaders(StorageItemEnum.ACCESS_TOKEN),
+            },
+        )
     ).data;
 }
 
@@ -89,9 +93,13 @@ export async function deactivateConnectionConfiguration(
 ): Promise<ConnectionConfiguration> {
     const url: string = connectionConfigurationUrl + "/" + id + "/inactive";
     return (
-        await apiService.api.post(url, {
-            headers: apiService.getHeaders(StorageItemEnum.ACCESS_TOKEN),
-        })
+        await apiService.api.post(
+            url,
+            {},
+            {
+                headers: apiService.getHeaders(StorageItemEnum.ACCESS_TOKEN),
+            },
+        )
     ).data;
 }
 

client/src/services/seb-server/api-services/monitoringService.ts

@@ -106,9 +106,13 @@ export async function registerInstruction(
 
 export async function quitAll(examId: string): Promise<number> {
     const url: string = monitoringUrl + "/" + examId + "/quitAll";
-    const call = await apiService.api.post(url, {
-        headers: apiService.getPostHeaders(StorageItemEnum.ACCESS_TOKEN),
-    });
+    const call = await apiService.api.post(
+        url,
+        {},
+        {
+            headers: apiService.getPostHeaders(StorageItemEnum.ACCESS_TOKEN),
+        },
+    );
     return call.status;
 }
 
@@ -139,9 +143,15 @@ export async function confirmNotification(
         "/" +
         connectionToken;
     return (
-        await apiService.api.post(url, {
-            headers: apiService.getPostHeaders(StorageItemEnum.ACCESS_TOKEN),
-        })
+        await apiService.api.post(
+            url,
+            {},
+            {
+                headers: apiService.getPostHeaders(
+                    StorageItemEnum.ACCESS_TOKEN,
+                ),
+            },
+        )
     ).status;
 }
 

client/src/services/seb-server/api-services/sebSettingsService.ts

@@ -115,9 +115,15 @@ export async function publish(
     const url: string =
         (forExam ? examUrlPrefix : templateUrlPrefix) + id + "/publish";
     return (
-        await apiService.api.post(url, {
-            headers: apiService.getPostHeaders(StorageItemEnum.ACCESS_TOKEN),
-        })
+        await apiService.api.post(
+            url,
+            {},
+            {
+                headers: apiService.getPostHeaders(
+                    StorageItemEnum.ACCESS_TOKEN,
+                ),
+            },
+        )
     ).data;
 }
 
@@ -128,8 +134,14 @@ export async function undoChanges(
     const url: string =
         (forExam ? examUrlPrefix : templateUrlPrefix) + id + "/undo-changes";
     return (
-        await apiService.api.post(url, {
-            headers: apiService.getPostHeaders(StorageItemEnum.ACCESS_TOKEN),
-        })
+        await apiService.api.post(
+            url,
+            {},
+            {
+                headers: apiService.getPostHeaders(
+                    StorageItemEnum.ACCESS_TOKEN,
+                ),
+            },
+        )
     ).data;
 }

server/src/controllers/seb-server/exam-sebsettings.controller.ts

@@ -74,6 +74,7 @@ export async function publishSettings(req: Request, res: Response){
 
 export async function undoChanges(req: Request, res: Response){
     try{
+        console.info("*********** exam-sebsettings.controller token: " + req.headers.authorization);
         const [exam, status] = await examSEBSettingsService.undoChanges(req.headers.authorization, req.params.id);
         return res.status(status).json(exam);
 

server/src/services/seb-server/exam-sebsettings.service.ts

@@ -44,6 +44,7 @@ export async function publishSettings(token: string, examId: string): Promise<[o
 }
 
 export async function undoChanges(token: string, examId: string): Promise<[object, number]> {
+    console.info("*********** exam-sebsettings.service token: " + token);
     const url: string =  constants.EXAM_SEB_SETTINGS_ENDPOINT + "/" + examId + "/undo-changes"
     const {data, status} = await apiService.api.post(url, "", {headers: apiService.getHeaders(token)});
     return [data, status];