From c3cdc98b9a610599433dbccb6b85606f8193d07c Mon Sep 17 00:00:00 2001 From: aynsix Date: Fri, 6 Oct 2023 15:22:12 +0300 Subject: [PATCH] list expose --- .../PhraseanetService/Controller/PSExposeController.php | 2 +- templates/web/prod/WorkZone/Macros.html.twig | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/lib/Alchemy/Phrasea/PhraseanetService/Controller/PSExposeController.php b/lib/Alchemy/Phrasea/PhraseanetService/Controller/PSExposeController.php index e272f119eb..b202679d40 100644 --- a/lib/Alchemy/Phrasea/PhraseanetService/Controller/PSExposeController.php +++ b/lib/Alchemy/Phrasea/PhraseanetService/Controller/PSExposeController.php @@ -206,7 +206,7 @@ public function listPublicationAction(PhraseaApplication $app, Request $request) if (!$session->has($passSessionName) && $providerId != null) { try { $provider = $this->getAuthenticationProviders()->get($providerId); - if ($provider->getType() == 'PsAuth') { + if ($provider->getType() == 'PsAuth' && $exposeConfiguration['auth_provider_name'] == $providerId) { $session->set($passSessionName, ['access_token' => $provider->getAccessToken()]); $session->set($this->getLoginSessionName($exposeName), $provider->getUserName()); diff --git a/templates/web/prod/WorkZone/Macros.html.twig b/templates/web/prod/WorkZone/Macros.html.twig index 0e66372b6a..3d373493b2 100644 --- a/templates/web/prod/WorkZone/Macros.html.twig +++ b/templates/web/prod/WorkZone/Macros.html.twig @@ -670,16 +670,11 @@
{% set expose_list = app['conf'].get(['phraseanet-service', 'expose-service', 'exposes']) %} - {% set providerId = app['session'].get('auth_provider.id') %}