diff --git a/.env.example b/.env.example index 6d8f624..213a146 100644 --- 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 index 6809792..784e2c8 100644 --- 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 index 69413cd..5ed6fbd 100644 --- 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 index 5f20d46..c4ee8b9 100644 --- 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 index 4931c86..8efd23c 100644 --- 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 index 1ff7fa0..2ec8877 100644 --- 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 index 86cc9c9..ce94207 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "dd85b2f41d992d86551a6bf9b1540275", + "content-hash": "3d4d62613976b9efcddda22e8ebb1b49", "packages": [ { "name": "aws/aws-crt-php", @@ -7512,19 +7512,20 @@ }, { "name": "zanichelli/idp-extensions", - "version": "v3.7.0", + "version": "v3.8.0", "source": { "type": "git", "url": "https://github.com/ZanichelliEditore/idp-extension.git", - "reference": "3a2f8af80e041ae5ae4baf6b6b4806539df143f5" + "reference": "0138554bdeb4729c8f3d2afcb9d040ca1eb76c01" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ZanichelliEditore/idp-extension/zipball/3a2f8af80e041ae5ae4baf6b6b4806539df143f5", - "reference": "3a2f8af80e041ae5ae4baf6b6b4806539df143f5", + "url": "https://api.github.com/repos/ZanichelliEditore/idp-extension/zipball/0138554bdeb4729c8f3d2afcb9d040ca1eb76c01", + "reference": "0138554bdeb4729c8f3d2afcb9d040ca1eb76c01", "shasum": "" }, "require": { + "firebase/php-jwt": "^6.10", "guzzlehttp/guzzle": "~7.0", "laravel/framework": "^8|^9|^10|^11|^12" }, @@ -7558,9 +7559,9 @@ "description": "Classes to interact with the Zanichelli identity provider", "support": { "issues": "https://github.com/ZanichelliEditore/idp-extension/issues", - "source": "https://github.com/ZanichelliEditore/idp-extension/tree/v3.7.0" + "source": "https://github.com/ZanichelliEditore/idp-extension/tree/v3.8.0" }, - "time": "2025-04-04T12:29:44+00:00" + "time": "2025-05-06T12:44:57+00:00" }, { "name": "zircote/swagger-php", diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 3ccdf7f..fd54ae5 100644 --- 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"