Skip to content

Commit 3c5014b

Browse files
committed
Merge branch 'wip-version-7' of github.com:simplesamlphp/simplesamlphp-module-oidc into wip-version-7
2 parents 6fe6d06 + cb5c1c9 commit 3c5014b

86 files changed

Lines changed: 1669 additions & 243 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/test.yaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,10 +255,16 @@ jobs:
255255
./conformance-suite/scripts/run-test-plan.py --expected-failures-file ./main/conformance-tests/implicit-warnings.json --expected-skips-file ./main/conformance-tests/implicit-skips.json "oidcc-implicit-certification-test-plan[server_metadata=discovery][client_registration=static_client]" ./main/conformance-tests/conformance-implicit-ci.json
256256
- name: Run RP logout
257257
run: |
258-
./conformance-suite/scripts/run-test-plan.py "oidcc-rp-initiated-logout-certification-test-plan[response_type=code][client_registration=static_client]" ./main/conformance-tests/conformance-rp-initiated-logout-ci.json
258+
./conformance-suite/scripts/run-test-plan.py "oidcc-rp-initiated-logout-certification-test-plan[response_type=code][client_registration=static_client]" ./main/conformance-tests/conformance-rp-initiated-logout-ci.json
259259
- name: Run RP backchannel
260260
run: |
261-
./conformance-suite/scripts/run-test-plan.py "oidcc-backchannel-rp-initiated-logout-certification-test-plan[response_type=code][client_registration=static_client]" ./main/conformance-tests/conformance-back-channel-logout-ci.json
261+
./conformance-suite/scripts/run-test-plan.py "oidcc-backchannel-rp-initiated-logout-certification-test-plan[response_type=code][client_registration=static_client]" ./main/conformance-tests/conformance-back-channel-logout-ci.json
262+
- name: Run form_post basic tests
263+
run: |
264+
./conformance-suite/scripts/run-test-plan.py "oidcc-formpost-basic-certification-test-plan[server_metadata=discovery][client_registration=static_client]" ./main/conformance-tests/conformance-basic-ci.json
265+
- name: Run form_post implicit tests
266+
run: |
267+
./conformance-suite/scripts/run-test-plan.py "oidcc-formpost-implicit-certification-test-plan[server_metadata=discovery][client_registration=static_client]" ./main/conformance-tests/conformance-implicit-ci.json
262268
- name: Stop SSP
263269
working-directory: ./main
264270
run: |

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"psr/container": "^2.0",
3232
"psr/log": "^3",
3333
"simplesamlphp/composer-module-installer": "^1.3",
34-
"simplesamlphp/openid": "~0.2.0",
34+
"simplesamlphp/openid": "~0.2.3",
3535
"spomky-labs/base64url": "^2.0",
3636
"symfony/expression-language": "^7.4",
3737
"symfony/psr-http-message-bridge": "^7.4",

locales/en/LC_MESSAGES/oidc.po

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -564,3 +564,15 @@ msgstr ""
564564

565565
msgid "enabled"
566566
msgstr ""
567+
568+
msgid "Submitting..."
569+
msgstr ""
570+
571+
msgid "Please wait while we redirect you..."
572+
msgstr ""
573+
574+
msgid "If you are not redirected automatically, click the button below to continue."
575+
msgstr ""
576+
577+
msgid "Continue"
578+
msgstr ""

locales/es/LC_MESSAGES/oidc.po

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -564,3 +564,15 @@ msgstr ""
564564

565565
msgid "enabled"
566566
msgstr ""
567+
568+
msgid "Submitting..."
569+
msgstr "Enviando..."
570+
571+
msgid "Please wait while we redirect you..."
572+
msgstr "Por favor, espere mientras le redirigimos..."
573+
574+
msgid "If you are not redirected automatically, click the button below to continue."
575+
msgstr "Si no es redirigido automáticamente, haga clic en el botón de abajo para continuar."
576+
577+
msgid "Continue"
578+
msgstr "Continuar"

locales/fr/LC_MESSAGES/oidc.po

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -564,3 +564,16 @@ msgstr ""
564564

565565
msgid "enabled"
566566
msgstr ""
567+
568+
msgid "Submitting..."
569+
msgstr "Soumission en cours..."
570+
571+
msgid "Please wait while we redirect you..."
572+
msgstr "Veuillez patienter pendant que nous vous redirigeons..."
573+
574+
msgid "If you are not redirected automatically, click the button below to continue."
575+
msgstr "Si vous n'êtes pas redirigé automatiquement, cliquez sur le bouton ci-dessous pour continuer."
576+
577+
msgid "Continue"
578+
msgstr "Continuer"
579+

locales/hr/LC_MESSAGES/oidc.po

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -612,3 +612,15 @@ msgstr "onemogućeno"
612612

613613
msgid "enabled"
614614
msgstr "omogućeno"
615+
616+
msgid "Submitting..."
617+
msgstr "Slanje u tijeku..."
618+
619+
msgid "Please wait while we redirect you..."
620+
msgstr "Molimo pričekajte dok vas preusmjerimo..."
621+
622+
msgid "If you are not redirected automatically, click the button below to continue."
623+
msgstr "Ako niste automatski preusmjereni, kliknite na gumb ispod za nastavak."
624+
625+
msgid "Continue"
626+
msgstr "Nastavi"

locales/it/LC_MESSAGES/oidc.po

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -564,3 +564,16 @@ msgstr ""
564564

565565
msgid "enabled"
566566
msgstr ""
567+
568+
msgid "Submitting..."
569+
msgstr "Invio in corso..."
570+
571+
msgid "Please wait while we redirect you..."
572+
msgstr "Attendere prego durante il reindirizzamento..."
573+
574+
msgid "If you are not redirected automatically, click the button below to continue."
575+
msgstr "Se non vieni reindirizzato automaticamente, fai clic sul pulsante qui sotto per continuare."
576+
577+
msgid "Continue"
578+
msgstr "Continua"
579+

locales/nl/LC_MESSAGES/oidc.po

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -518,3 +518,15 @@ msgstr "uitgeschakeld"
518518

519519
msgid "enabled"
520520
msgstr "ingeschakeld"
521+
522+
msgid "Submitting..."
523+
msgstr "Verzenden..."
524+
525+
msgid "Please wait while we redirect you..."
526+
msgstr "Wacht alstublieft terwijl u wordt doorgestuurd..."
527+
528+
msgid "If you are not redirected automatically, click the button below to continue."
529+
msgstr "Als u niet automatisch wordt doorgestuurd, klik dan op de onderstaande knop om door te gaan."
530+
531+
msgid "Continue"
532+
msgstr "Doorgaan"

public/assets/js/src/formpost.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
document.getElementById('formpost').submit();

routing/services/services.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,12 @@ services:
6767
SimpleSAML\Module\oidc\Server\ResponseTypes\TokenResponse:
6868
factory: ['@SimpleSAML\Module\oidc\Factories\TokenResponseFactory', 'build']
6969

70+
SimpleSAML\Module\oidc\Server\ResponseModes\:
71+
resource: '../../src/Server/ResponseModes/*'
72+
73+
SimpleSAML\Configuration:
74+
factory: ['SimpleSAML\Configuration', 'getInstance']
75+
7076
oidc.key.private:
7177
class: League\OAuth2\Server\CryptKey
7278
factory: ['@SimpleSAML\Module\oidc\Factories\CryptKeyFactory', 'buildPrivateKey']

0 commit comments

Comments
 (0)