Merge pull request #24 from ZanichelliEditore/develop

vpasquino · web-flow · commit d7ca43421489 · 2026-02-27T15:45:13.000+01:00
Develop
diff --git a/.env.example b/.env.example
@@ -32,9 +32,8 @@ REDIS_QUEUE={default}
 USE_ZANICHELLI_IDP=true
 VITE_SHOW_LOGOUT="${USE_ZANICHELLI_IDP}"
 
-IDP_URL=
-IDP_TOKEN_URL=
-IDP_LOGOUT_URL=
+IDP_BASE_URL=
+IDP_COOKIE_NAME=
 
 TELESCOPE_ENABLED=true
 TELESCOPE_CACHE_WATCHER=true
diff --git a/ansible/group_vars/production.yml b/ansible/group_vars/production.yml
@@ -1,4 +1,5 @@
 project_url:  buzzer.zanichelli.it
 idp_url: idp.zanichelli.it
+idp_cookie_name: token
 env_param: "production"
 email_from: noreplybuzzer@zanichelli.it
diff --git a/ansible/group_vars/staging.yml b/ansible/group_vars/staging.yml
@@ -1,4 +1,5 @@
 project_url: buzzer-test.zanichelli.it
 idp_url: idp-test.zanichelli.it
+idp_cookie_name: token_test
 env_param: "staging"
 email_from: noreplybuzzertest@zanichelli.it
diff --git a/ansible/roles/deploy-buzzer/templates/.env.j2 b/ansible/roles/deploy-buzzer/templates/.env.j2
@@ -34,9 +34,8 @@ VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 USE_ZANICHELLI_IDP=true
 VITE_SHOW_LOGOUT="${USE_ZANICHELLI_IDP}"
 
-IDP_URL=https://{{ idp_url }}/loginForm
-IDP_TOKEN_URL=https://{{ idp_url }}/v1/user
-IDP_LOGOUT_URL=https://{{ idp_url }}/v1/logout
+IDP_BASE_URL=https://{{ idp_url }}
+IDP_COOKIE_NAME={{ idp_cookie_name }}
 
 TELESCOPE_ENABLED=false
 TELESCOPE_CACHE_WATCHER=true
diff --git a/app-prod.dockerfile b/app-prod.dockerfile
@@ -1,7 +1,7 @@
 FROM php:8.4-fpm
 
 RUN apt-get update && apt-get install -y wget libmcrypt-dev mariadb-client \
-    xvfb libfontconfig wkhtmltopdf libxslt1-dev libgtk2.0-0 libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 gnupg libcanberra-gtk-module\
+    xvfb libfontconfig libxslt1-dev libgtk2.0-0 libnotify-dev libnss3 libxss1 libasound2 gnupg\
     openssl zip unzip git nano wget libaio-dev iputils-ping
 
 RUN docker-php-ext-configure pcntl --enable-pcntl && docker-php-ext-install pcntl
diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
         "laravel/tinker": "^2.0",
         "laravel/ui": "^4.0",
         "zanichelli/healthcheck": "^1.1",
-        "zanichelli/idp-extensions": "^3.7",
+        "zanichelli/idp-extensions": "^3.8",
         "zircote/swagger-php": "4.*"
     },
     "require-dev": {
diff --git a/composer.lock b/composer.lock
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -61,7 +61,7 @@ services:
         max-size: 5m
         max-file: "3"
   database:
-    image: mysql:8
+    image: mysql:8.4.5
     container_name: buzzer_db
     environment:
       - "MYSQL_ROOT_PASSWORD=secret"
