Skip to content

Commit

Permalink
fix(docker): forward query parameters for GOV.UK OneLogin redirect (#302
Browse files Browse the repository at this point in the history
)
  • Loading branch information
JoshuaLicense authored Sep 3, 2024
1 parent 9a08cf3 commit d1eb15f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions app/api/config/autoload/local.php.dist
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ return [
],
],
'govuk_account' => [
'redirectUri' => 'https://ssweb.dev.olcs.dev-dvsacloud.uk/govuk-id/loggedin',
'redirectUri' => 'http://ssweb.local.olcs.dev-dvsacloud.uk/govuk-id/loggedin',
'discovery_endpoint' => 'https://oidc.integration.account.gov.uk/.well-known/openid-configuration',
'client_id' => '',
'keys' => [
Expand All @@ -347,8 +347,8 @@ return [
'identity_assurance_public_key' => (array)json_decode('{"kty":"EC","use":"sig","crv":"P-256","x":"NPGA7cyIKtH1nz2CJIH14s9_CtC93NwdCQcEi-ADvxg=","y":"2cTdmHAmZjighly34lXcxEw50cbKFV7FTOdZKhOG7ps=","alg":"ES256"}'),
],
'redirect_uri' => [
'logged_in' => 'https://olcs-selfserve/govuk-id/loggedin',
'logged_out' => 'https://olcs-selfserve/govuk-id/loggedout',
'logged_in' => 'http://ssweb.local.olcs.dev-dvsacloud.uk/govuk-id/loggedin',
'logged_out' => 'http://ssweb.local.olcs.dev-dvsacloud.uk/govuk-id/loggedout',
],
'expected_core_identity_issuer' => 'https://identity.integration.account.gov.uk/',
'proxy' => new \Laminas\Stdlib\ArrayUtils\MergeRemoveKey(),
Expand Down
4 changes: 2 additions & 2 deletions infra/docker/selfserve/selfserve.conf
Original file line number Diff line number Diff line change
Expand Up @@ -147,12 +147,12 @@ server {

location = /govuk-id/loggedin {
port_in_redirect off;
return 302 /govukaccount-redirect.php;
return 302 /govukaccount-redirect.php$is_args$args;
}

location = /govuk-id/loggedout {
port_in_redirect off;
return 302 /govukaccount-redirect.php;
return 302 /govukaccount-redirect.php$is_args$args;
}

location ~ \.php$ {
Expand Down

0 comments on commit d1eb15f

Please sign in to comment.