Internal: Make a request to reset the current course

assets/vue/router/index.js

@@ -198,11 +198,7 @@ router.beforeResolve(async (to) => {
     cid = parseInt(to.params?.id ?? 0)
   }
 
-  if (cid) {
-    await cidReqStore.setCourseAndSessionById(cid, sid)
-  } else {
-    cidReqStore.resetCid()
-  }
+  await cidReqStore.setCourseAndSessionById(cid, sid)
 })
 
 export default router

assets/vue/services/courseService.js

@@ -1,9 +1,18 @@
 import api from "../config/api"
 import baseService from "./baseService"
 
+/**
+ * @returns {Promise<void>}
+ */
+async function cidReset() {
+  await api.get("/course/cid_reset")
+}
+
 export default {
   find: baseService.get,
 
+  cidReset,
+
   /**
    * @param {number} courseId
    * @param {number=} sessionId

assets/vue/store/cidReq.js

@@ -49,7 +49,11 @@ export const useCidReqStore = defineStore("cidReq", () => {
     }
   })
 
-  const resetCid = () => {
+  const resetCid = async () => {
+    if (course.value) {
+      await courseService.cidReset()
+    }
+
     course.value = null
     session.value = null
     group.value = null
@@ -92,9 +96,14 @@ export const useCidReqStore = defineStore("cidReq", () => {
     }
   }
 
+  /**
+   * @param {number|null} cId
+   * @param {number|null} sId
+   * @returns {Promise<Awaited<void>[]>|Promise<void>}
+   */
   const setCourseAndSessionById = (cId, sId = undefined) => {
     if (!cId) {
-      return Promise.resolve()
+      return resetCid()
     }
 
     const coursePromise = setCourseByIri(cId, sId)

src/CoreBundle/Controller/CourseController.php

@@ -14,6 +14,7 @@
 use Chamilo\CoreBundle\Entity\Tag;
 use Chamilo\CoreBundle\Entity\Tool;
 use Chamilo\CoreBundle\Entity\User;
+use Chamilo\CoreBundle\EventListener\CidReqListener;
 use Chamilo\CoreBundle\Framework\Container;
 use Chamilo\CoreBundle\Repository\CourseCategoryRepository;
 use Chamilo\CoreBundle\Repository\ExtraFieldValuesRepository;
@@ -52,6 +53,7 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Routing\Attribute\Route;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Serializer\SerializerInterface;
 use Symfony\Component\Validator\Exception\ValidatorException;
 use Symfony\Contracts\Translation\TranslatorInterface;
@@ -69,6 +71,19 @@ public function __construct(
         private readonly UserHelper $userHelper,
     ) {}
 
+    #[Route('/cid_reset', methods: ['GET'])]
+    public function cidReset(
+        Request $request,
+        TokenStorageInterface $tokenStorage,
+    ): Response {
+        CidReqListener::cleanSessionHandler(
+            $request,
+            $tokenStorage->getToken()
+        );
+
+        return new Response('', Response::HTTP_NO_CONTENT);
+    }
+
     #[Route('/{cid}/checkLegal.json', name: 'chamilo_core_course_check_legal_json')]
     public function checkTermsAndConditionJson(
         Request $request,

src/CoreBundle/EventListener/CidReqListener.php

@@ -23,6 +23,7 @@
 use Symfony\Component\HttpKernel\Event\RequestEvent;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Symfony\Component\Security\Core\User\UserInterface;
@@ -67,7 +68,10 @@ public function onKernelRequest(RequestEvent $event): void
         }
 
         if (true === $cidReset) {
-            $this->cleanSessionHandler($request);
+            self::cleanSessionHandler(
+                $request,
+                $this->tokenStorage->getToken()
+            );
 
             return;
         }
@@ -192,8 +196,6 @@ public function onKernelRequest(RequestEvent $event): void
             $courseParams = $this->generateCourseUrl($course, $sessionId, $groupId, $origin);
             $sessionHandler->set('course_url_params', $courseParams);
             $twig->addGlobal('course_url_params', $courseParams);
-        } else {
-            $this->cleanSessionHandler($request);
         }
     }
 
@@ -258,7 +260,7 @@ public function onKernelController(ControllerEvent $event): void
         }
     }
 
-    public function cleanSessionHandler(Request $request): void
+    public static function cleanSessionHandler(Request $request, ?TokenInterface $token): void
     {
         $sessionHandler = $request->getSession();
         $alreadyVisited = $sessionHandler->get('course_already_visited');
@@ -296,7 +298,6 @@ public function cleanSessionHandler(Request $request): void
         ChamiloSession::erase('origin');
 
         // Remove user temp roles
-        $token = $this->tokenStorage->getToken();
         if (null !== $token) {
             /** @var User $user */
             $user = $token->getUser();
@@ -309,8 +310,6 @@ public function cleanSessionHandler(Request $request): void
                 $user->removeRole('ROLE_CURRENT_COURSE_SESSION_TEACHER');
             }
         }
-
-        // $request->setLocale($request->getPreferredLanguage());
     }
 
     private function generateCourseUrl(?Course $course, int $sessionId, int $groupId, ?string $origin): string