Cadoles/hydra-sql
22
0
Fork 0
Code Issues 5 Pull Requests 4 Projects Releases Wiki Activity

Compare commits

base: Cadoles:issue-14318
Branches Tags
Cadoles:develop Cadoles:alpine-upgrade Cadoles:issue-14318 Cadoles:issue-4707 Cadoles:issue-mse-4332 Cadoles:issue-39 Cadoles:redis-prefix-ttl Cadoles:issue-14 Cadoles:issue-16 Cadoles:master Cadoles:staging
Cadoles:v01
..
compare: Cadoles:alpine-upgrade
Branches Tags
Cadoles:alpine-upgrade Cadoles:issue-14318 Cadoles:develop Cadoles:issue-4707 Cadoles:issue-mse-4332 Cadoles:issue-39 Cadoles:redis-prefix-ttl Cadoles:issue-14 Cadoles:issue-16 Cadoles:master Cadoles:staging
Cadoles:v01

1 Commits
issue-1431 ... alpine-upg

Author SHA1 Message Date
Gauthier DUPONT
7448a9af4d chore(alpine): bump alpine version and php package
Some checks failed
Cadoles/hydra-sql/pipeline/head There was a failure building this commit
Details
Cadoles/hydra-sql/pipeline/pr-develop There was a failure building this commit
Details
2025-09-01 17:05:41 +02:00
4 changed files with 8 additions and 9 deletions
Expand all files Collapse all files

4
misc/images/hydra-sql-base/Dockerfile
View File

@ -1,5 +1,5 @@
ARG NODE_OPTIONS="--openssl-legacy-provider" \ ARG NODE_OPTIONS="--openssl-legacy-provider" \
PHP_PKG_VERSION="8.4.5-r0" \ PHP_PKG_VERSION="8.4.11-r0" \
ENCORE_MODE="production" \ ENCORE_MODE="production" \
APP_ENV="prod" \ APP_ENV="prod" \
BASE_PATH="" \ BASE_PATH="" \
@ -20,4 +20,4 @@ ARG NODE_OPTIONS="--openssl-legacy-provider" \
BASE_PATH=${BASE_PATH} \ BASE_PATH=${BASE_PATH} \
APP_LOCALES=${APP_LOCALES}" APP_LOCALES=${APP_LOCALES}"
FROM reg.cadoles.com/cadoles/symfony:alpine-php-8.4-base-2025.6.12-stable.1038.48ea3b9 FROM reg.cadoles.com/cadoles/symfony:alpine-php-8.4-base-2025.9.1-stable.1652.6889275

4
misc/images/hydra-sql-standalone/Dockerfile
View File

@ -1,5 +1,5 @@
ARG NODE_OPTIONS="--openssl-legacy-provider" \ ARG NODE_OPTIONS="--openssl-legacy-provider" \
PHP_PKG_VERSION="8.4.5-r0" \ PHP_PKG_VERSION="8.4.11-r0" \
ENCORE_MODE="production" \ ENCORE_MODE="production" \
APP_ENV="prod" \ APP_ENV="prod" \
BASE_PATH="" \ BASE_PATH="" \
@ -20,5 +20,5 @@ ARG NODE_OPTIONS="--openssl-legacy-provider" \
BASE_PATH=${BASE_PATH} \ BASE_PATH=${BASE_PATH} \
APP_LOCALES=${APP_LOCALES}" APP_LOCALES=${APP_LOCALES}"
FROM reg.cadoles.com/cadoles/symfony:alpine-php-8.4-standalone-2025.6.12-stable.1038.48ea3b9 FROM reg.cadoles.com/cadoles/symfony:alpine-php-8.4-standalone-2025.9.1-stable.1652.6889275
USER www-data USER www-data

7
src/Controller/MainController.php
View File

@ -20,8 +20,7 @@ class MainController extends AbstractController
public function __construct( public function __construct(
private readonly RequestStack $requestStack, private readonly RequestStack $requestStack,
private readonly HydraService $hydra, private readonly HydraService $hydra,
private readonly Client $client, private readonly Client $client
private readonly SQLLoginRequest $sqlLoginRequest
){ ){
} }
@ -41,7 +40,7 @@ class MainController extends AbstractController
} }
#[Route('/connect/login-accept', name: 'app_login_accept', methods: ['GET'])] #[Route('/connect/login-accept', name: 'app_login_accept', methods: ['GET'])]
public function loginAccept(): RedirectResponse public function loginAccept(SQLLoginRequest $sqlLoginRequest): RedirectResponse
{ {
$user = $this->getUser(); $user = $this->getUser();
@ -55,7 +54,7 @@ class MainController extends AbstractController
$subject = $user->getLogin(); $subject = $user->getLogin();
$subjectRewriteExpression = $this->sqlLoginRequest->getSubjectRewriteExpression(); $subjectRewriteExpression = $sqlLoginRequest->getSubjectRewriteExpression();
if (null != $subjectRewriteExpression) { if (null != $subjectRewriteExpression) {
$expressionLanguage = new ExpressionLanguage(); $expressionLanguage = new ExpressionLanguage();

2
src/Hydra/HydraService.php
View File

@ -39,7 +39,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 // 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->requestStack->getSession()->set('challenge', $loginRequestInfo['challenge']); $this->requestStack->getSession()->set('challenge', $loginRequestInfo['challenge']);
return new RedirectResponse($this->baseUrl.'/login'); return new RedirectResponse($this->baseUrl.'/connect/login-accept');
} }
public function handleConsentRequest(Request $request): RedirectResponse public function handleConsentRequest(Request $request): RedirectResponse