Add access URL chooser for users with multiple active portals - refs BT#22639

Author: AngelFQC

assets/vue/App.vue

@@ -10,6 +10,8 @@
       ref="legacyContainer"
     />
     <ConfirmDialog />
+
+    <AccessUrlChooser />
   </component>
   <Toast position="top-center">
     <template #message="slotProps">
@@ -56,6 +58,7 @@ import EmptyLayout from "./components/layout/EmptyLayout.vue"
 import { useMediaElementLoader } from "./composables/mediaElementLoader"
 
 import apolloClient from "./config/apolloClient"
+import AccessUrlChooser from "./components/accessurl/AccessUrlChooser.vue"
 
 provide(DefaultApolloClient, apolloClient)
 

assets/vue/components/accessurl/AccessUrlChooser.vue

@@ -0,0 +1,68 @@
+<script setup>
+import { ref } from "vue"
+import { useI18n } from "vue-i18n"
+import Dialog from "primevue/dialog"
+import { findUserActivePortals } from "../../services/accessurlService"
+import { useSecurityStore } from "../../store/securityStore"
+import { useNotification } from "../../composables/notification"
+import BaseAppLink from "../basecomponents/BaseAppLink.vue"
+
+const securityStore = useSecurityStore()
+const { t } = useI18n()
+const { showErrorNotification } = useNotification()
+
+const isLoading = ref(true)
+const accessUrls = ref([])
+
+if (securityStore.showAccessUrlChooser) {
+  findUserActivePortals(securityStore.user["@id"])
+    .then((items) => {
+      accessUrls.value = items
+
+      if (1 === items.length) {
+        window.location.href = items[0].url
+      }
+    })
+    .catch((error) => showErrorNotification(error))
+    .finally(() => {
+      if (1 !== accessUrls.value.length) {
+        isLoading.value = false
+      }
+    })
+}
+</script>
+
+<template>
+  <Dialog
+    v-model:visible="securityStore.showAccessUrlChooser"
+    :modal="true"
+    :closable="false"
+    :header="t('Access URL')"
+    :style="{ width: '50vw' }"
+  >
+    <i
+      v-if="isLoading"
+      class="pi pi-spin pi-spinner"
+    />
+    <div
+      v-else-if="accessUrls.length"
+      class="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 gap-4"
+    >
+      <div
+        v-for="accessUrl in accessUrls"
+        :key="accessUrl.id"
+        class="text-center"
+      >
+        <BaseAppLink :url="accessUrl.url">{{ accessUrl.url }}</BaseAppLink>
+        <p
+          v-if="accessUrl.description"
+          v-text="accessUrl.description"
+        />
+      </div>
+    </div>
+    <p
+      v-else
+      v-text="t('No active access URLs found')"
+    />
+  </Dialog>
+</template>

assets/vue/services/accessurlService.js

@@ -0,0 +1,12 @@
+import baseService from "./baseService"
+
+/**
+ *
+ * @param {string} userIri
+ * @returns {Promise<Object[]>}
+ */
+export async function findUserActivePortals(userIri) {
+  const { items } = await baseService.getCollection(`${userIri}/access_urls`)
+
+  return items
+}

assets/vue/store/securityStore.js

@@ -8,6 +8,10 @@ export const useSecurityStore = defineStore("security", () => {
   const isLoading = ref(true)
   const isAuthenticated = computed(() => !isEmpty(user.value))
 
+  const showAccessUrlChooser = computed(() => {
+    return !!(isAuthenticated.value && !isAdmin.value && window.is_login_url)
+  })
+
   /**
    * @param {Object} newUserInfo
    */
@@ -87,5 +91,6 @@ export const useSecurityStore = defineStore("security", () => {
     isSessionAdmin,
     isAdmin,
     checkSession,
+    showAccessUrlChooser,
   }
 })

src/CoreBundle/Controller/Api/UserAccessUrlsController.php

@@ -0,0 +1,25 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\Controller\Api;
+
+use Chamilo\CoreBundle\Entity\User;
+use Chamilo\CoreBundle\Repository\Node\AccessUrlRepository;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpKernel\Attribute\AsController;
+
+#[AsController]
+class UserAccessUrlsController extends AbstractController
+{
+    public function __construct(
+        private readonly AccessUrlRepository $accessUrlRepo
+    ) {}
+
+    public function __invoke(User $user): array
+    {
+        return $this->accessUrlRepo->getUserActivePortals($user)->getQuery()->getResult();
+    }
+}

src/CoreBundle/Controller/SecurityController.php

@@ -6,13 +6,16 @@
 
 namespace Chamilo\CoreBundle\Controller;
 
+use Chamilo\CoreBundle\Entity\AccessUrl;
+use Chamilo\CoreBundle\Entity\AccessUrlRelUser;
 use Chamilo\CoreBundle\Entity\Course;
 use Chamilo\CoreBundle\Entity\ExtraFieldValues;
 use Chamilo\CoreBundle\Entity\Legal;
 use Chamilo\CoreBundle\Entity\User;
 use Chamilo\CoreBundle\Helpers\AccessUrlHelper;
 use Chamilo\CoreBundle\Helpers\IsAllowedToEditHelper;
 use Chamilo\CoreBundle\Helpers\UserHelper;
+use Chamilo\CoreBundle\Repository\Node\AccessUrlRepository;
 use Chamilo\CoreBundle\Repository\Node\CourseRepository;
 use Chamilo\CoreBundle\Repository\TrackELoginRecordRepository;
 use Chamilo\CoreBundle\Settings\SettingsManager;
@@ -45,6 +48,7 @@ public function __construct(
         private readonly RouterInterface $router,
         private readonly AccessUrlHelper $accessUrlHelper,
         private readonly IsAllowedToEditHelper $isAllowedToEditHelper,
+        private readonly AccessUrlRepository $accessUrlRepo,
     ) {}
 
     #[Route('/login_json', name: 'login_json', methods: ['POST'])]

src/CoreBundle/Entity/AccessUrl.php

@@ -7,6 +7,9 @@
 namespace Chamilo\CoreBundle\Entity;
 
 use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\GetCollection;
+use ApiPlatform\Metadata\Link;
+use Chamilo\CoreBundle\Controller\Api\UserAccessUrlsController;
 use Chamilo\CoreBundle\Repository\Node\AccessUrlRepository;
 use DateTime;
 use Doctrine\Common\Collections\ArrayCollection;
@@ -31,6 +34,15 @@
 #[ORM\Table(name: 'access_url')]
 #[Gedmo\Tree(type: 'nested')]
 #[ORM\Entity(repositoryClass: AccessUrlRepository::class)]
+#[ApiResource(
+    uriTemplate: '/users/{id}/access_urls',
+    operations: [new GetCollection(controller: UserAccessUrlsController::class)],
+    uriVariables: [
+        'id' => new Link(description: 'User identifier'),
+    ],
+    normalizationContext: ['groups' => ['user_access_url:read']],
+    paginationEnabled: false,
+)]
 class AccessUrl extends AbstractResource implements ResourceInterface, Stringable
 {
     public const DEFAULT_ACCESS_URL = 'http://localhost/';
@@ -106,10 +118,11 @@ class AccessUrl extends AbstractResource implements ResourceInterface, Stringabl
     protected ?AccessUrl $root = null;
 
     #[Assert\NotBlank]
-    #[Groups(['access_url:read', 'access_url:write'])]
+    #[Groups(['access_url:read', 'access_url:write', 'user_access_url:read'])]
     #[ORM\Column(name: 'url', type: 'string', length: 255)]
     protected string $url;
 
+    #[Groups(['user_access_url:read'])]
     #[ORM\Column(name: 'description', type: 'text')]
     protected ?string $description = null;
 

src/CoreBundle/Entity/User.php

@@ -1476,6 +1476,9 @@ public function setCurrentUrl(AccessUrl $url): self
         return $this;
     }
 
+    /**
+     * @return Collection<int, AccessUrlRelUser>
+     */
     public function getPortals(): Collection
     {
         return $this->portals;

src/CoreBundle/EventListener/TwigListener.php

@@ -6,10 +6,11 @@
 
 namespace Chamilo\CoreBundle\EventListener;
 
+use Chamilo\CoreBundle\Helpers\AccessUrlHelper;
+use Chamilo\CoreBundle\Helpers\UserHelper;
 use Chamilo\CoreBundle\Repository\LanguageRepository;
+use Chamilo\CoreBundle\Repository\Node\AccessUrlRepository;
 use Symfony\Component\HttpKernel\Event\ControllerEvent;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Serializer\SerializerInterface;
 use Twig\Environment;
 
@@ -21,33 +22,32 @@ class TwigListener
     public function __construct(
         private readonly Environment $twig,
         private readonly SerializerInterface $serializer,
-        private readonly TokenStorageInterface $tokenStorage,
         private readonly LanguageRepository $languageRepository,
+        private readonly UserHelper $userHelper,
+        private readonly AccessUrlHelper $accessUrlHelper,
     ) {}
 
     public function __invoke(ControllerEvent $event): void
     {
-        $request = $event->getRequest();
-        $token = $this->tokenStorage->getToken();
+        $currentAccessUrl = $this->accessUrlHelper->getCurrent();
+        $user = $this->userHelper->getCurrent();
 
         $data = null;
         $isAuth = false;
-        if (null !== $token) {
-            $user = $token->getUser();
-            if ($user instanceof UserInterface) {
-                $data = $this->serializer->serialize($user, 'jsonld', [
-                    'groups' => ['user_json:read'],
-                ]);
-                $isAuth = true;
-            }
+        if ($user) {
+            $data = $this->serializer->serialize($user, 'jsonld', [
+                'groups' => ['user_json:read'],
+            ]);
+            $isAuth = true;
         }
 
         $languages = $this->languageRepository->getAllAvailable()->getQuery()->getArrayResult();
 
         // $this->twig->addGlobal('text_direction', api_get_text_direction());
         $this->twig->addGlobal('is_authenticated', json_encode($isAuth));
         $this->twig->addGlobal('user_json', $data ?? json_encode([]));
-        $this->twig->addGlobal('access_url_id', $request->getSession()->get('access_url_id'));
+        $this->twig->addGlobal('is_login_url', (int) $currentAccessUrl->isLoginOnly());
+        $this->twig->addGlobal('access_url_id', $currentAccessUrl->getId());
         $this->twig->addGlobal('languages_json', json_encode($languages));
     }
 }

src/CoreBundle/Repository/Node/AccessUrlRepository.php

@@ -55,4 +55,18 @@ public function findByUser(User $user): array
             ->getResult()
         ;
     }
+
+    public function getUserActivePortals(User $user): QueryBuilder
+    {
+        /** @var QueryBuilder $qb */
+        $qb = $this->createQueryBuilder('url');
+
+        return $qb
+            ->join('url.users', 'users')
+            ->where($qb->expr()->eq('users.user', ':user'))
+            ->andWhere($qb->expr()->eq('url.active', true))
+            ->andWhere($qb->expr()->neq('url.isLoginOnly', true))
+            ->setParameter('user', $user->getId())
+        ;
+    }
 }