From df73cede0fb16dc139f578503777b45761fb9efd Mon Sep 17 00:00:00 2001
From: rudy <rmasson@cadoles.com>
Date: Mon, 9 Jan 2023 15:06:49 +0100
Subject: [PATCH] prise en compte du cookie_path

---
 .env                                          |  2 +-
 .gitignore                                    | 10 +++++-----
 config/packages/framework.yaml                | 12 +++++++++++-
 config/sql_login_configuration/sql_login.yaml |  2 +-
 src/Hydra/HydraService.php                    |  2 +-
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/.env b/.env
index 11c6cdf..6770ee0 100644
--- a/.env
+++ b/.env
@@ -30,7 +30,7 @@ BASE_URL='http://localhost:8080'
 HYDRA_ADMIN_BASE_URL='http://hydra:4445'
 APP_LOCALES="fr,en"
 SECURITY_PATTERN=
-HASH_ALGO_LEGACY="sha256"
+HASH_ALGO_LEGACY="sha256,ssha"
 ###> symfony/lock ###
 # Choose one of the stores below
 # postgresql+advisory://db_user:db_password@localhost/db_name
diff --git a/.gitignore b/.gitignore
index 4f06bb2..576cae5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,18 +4,18 @@
 /config/secrets/prod/prod.decrypt.private.php
 /public/bundles/
 /var/
-
 /vendor
 /tools/php-cs-fixer/vendor
 /node_modules/
 /public/build/
 npm-debug.log
 yarn-error.log
+supervisord.log
+supervisord.pid
+composer.phar
 /.vscode
-/.cache/
+/.cache
 /.config
 /.npm
 /.local
-/supervisord.log
-/supervisord.pid
-.cache
\ No newline at end of file
+/.bash_history
diff --git a/config/packages/framework.yaml b/config/packages/framework.yaml
index 7853e9e..1b4ac8d 100644
--- a/config/packages/framework.yaml
+++ b/config/packages/framework.yaml
@@ -1,4 +1,9 @@
-# see https://symfony.com/doc/current/reference/configuration/framework.html
+parameters:
+    base_url: '%env(BASE_URL)%'
+    env(BASE_URL): '//'
+
+    cookie_path: '%env(COOKIE_PATH)%'
+    env(COOKIE_PATH): '/'
 framework:
     secret: '%env(APP_SECRET)%'
     #csrf_protection: true
@@ -11,7 +16,12 @@ framework:
         cookie_secure: auto
         cookie_samesite: lax
         storage_factory_id: session.storage.factory.native
+        cookie_path: "%cookie_path%"
+    assets:
+        base_urls: '%base_url%'
 
+    router:
+        default_uri: '%base_url%'
     #esi: true
     #fragments: true
     php_errors:
diff --git a/config/sql_login_configuration/sql_login.yaml b/config/sql_login_configuration/sql_login.yaml
index 2a1d5c8..30239e6 100644
--- a/config/sql_login_configuration/sql_login.yaml
+++ b/config/sql_login_configuration/sql_login.yaml
@@ -1,7 +1,7 @@
 sql_login: 
   login_column_name: email
   password_column_name: password
-  salt_column_name: salt
+  salt_column_name: ~
   table_name: usager
   data_to_fetch:
     - email
diff --git a/src/Hydra/HydraService.php b/src/Hydra/HydraService.php
index 4378f1b..e7f47f5 100644
--- a/src/Hydra/HydraService.php
+++ b/src/Hydra/HydraService.php
@@ -42,7 +42,7 @@ class HydraService extends AbstractController
         // si le challenge est validé par hydra, on le stocke en session pour l'utiliser par la suite et on redirige vers une route interne protégée qui va déclencher l'identification FranceConnect
         $this->session->set('challenge', $loginRequestInfo['challenge']);
 
-        return new RedirectResponse($this->baseUrl.'/login');
+        return new RedirectResponse($this->baseUrl.'/connect/login-accept');
     }
 
     public function handleConsentRequest(Request $request)