From b9c7aa4d4ed657797667951f2a4e82f4e4fdeba2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Dufaure?= Date: Wed, 10 Apr 2024 12:14:32 +0200 Subject: [PATCH] [CLEAN] Clean old admin theme --- README.en.md | 14 +- README.md | 13 +- pom.xml | 2 +- .../resources/META-INF/keycloak-themes.json | 1 - .../admin-messages_en.properties | 0 .../admin-messages_fr.properties | 0 .../realm-identity-provider-agentconnect.html | 409 ----------------- ...ty-provider-franceconnect-particulier.html | 416 ------------------ .../theme/fc-ac-theme/admin/theme.properties | 2 - 9 files changed, 13 insertions(+), 844 deletions(-) rename src/main/resources/{theme-resources/messages => }/admin-messages_en.properties (100%) rename src/main/resources/{theme-resources/messages => }/admin-messages_fr.properties (100%) delete mode 100644 src/main/resources/theme-resources/resources/partials/realm-identity-provider-agentconnect.html delete mode 100644 src/main/resources/theme-resources/resources/partials/realm-identity-provider-franceconnect-particulier.html delete mode 100644 src/main/resources/theme/fc-ac-theme/admin/theme.properties diff --git a/README.en.md b/README.en.md index 6c20fec..476a68b 100644 --- a/README.en.md +++ b/README.en.md @@ -26,14 +26,10 @@ This [Keycloak](https://www.keycloak.org) plugin adds an identity provider allow ## Compatibility -**WARNING** - -Starting from version 19 and the use of the new graphical administration interface of Keycloak, it is no longer possible to properly configure this extension via the UI. However, the provided version allows you to maintain the functionality of the plugin if it has been configured in a previous version, with configurations to be done manually in SQL if necessary. -A version is currently under development to restore the configuration of the plugin, which will require breaking changes in the usage of this plugin. - -* The version 6.1.0 of this plugin is compatible with Keycloak `22.0.0` and higher. -* The version 5.0.0 of this plugin is compatible with Keycloak `21.x.y`. -* The version 4.0.0 of this plugin is compatible with Keycloak `15.0.0` until `20.0.0`. +* The version 6.2.0 of this plugin is compatible with Keycloak `24.0.0` and higher. It's configurable with UI. +* The version 6.1.0 of this plugin is compatible with Keycloak `22.0.0` and higher. (not configurable with UI) +* The version 5.0.0 of this plugin is compatible with Keycloak `21.x.y`. (not configurable with UI) +* The version 4.0.0 of this plugin is compatible with Keycloak `15.0.0` until `20.0.0`. (not configurable with UI starting keycloak 19) * The version 2.1 up to 3.0.0 of this plugin is compatible with Keycloak `9.0.2` until `15.0.0`. * The version 2.0 of this plugin is compatible with Keycloak `8.0.1` until `9.0.2`. @@ -67,6 +63,8 @@ You must have a [France Connect account](https://franceconnect.gouv.fr/partenair There are 2 environments, `Integration` and `Production`. The request for an Integration account is made by email to the France Connect support team. +France Connect account can be managed at https://partenaires.franceconnect.gouv.fr + ### Configuration Once the installation is complete, the `France Connect Particulier` identity provider appears. Once selected, you can see the following configuration page: diff --git a/README.md b/README.md index 88e7178..7f8d889 100644 --- a/README.md +++ b/README.md @@ -40,13 +40,10 @@ Pour toutes questions sur l'utilisation de cette extension, n'hésitez pas à ou ## Compatibilité -**ATTENTION** -A partir de la version 19 et de l'usage de la nouvelle interface graphique d'administration de Keycloak, il n'est plus possible de paramétrer correctement cette extension via ihm. Cela étant la version fourni permet de conserver la fonctionalité du plugin s'il a été configuré dans une version précedente, les manipulation de configuration devant se faire manuellement en sql si nécessaire. -Une version est en cours de développement pour rétablir la configuration du plugin, elle nécessitera des changements disruptifs dans l'usage de ce plugin. - -- La version 6.1.0 est compatible avec Keycloak `22.0.0` et supérieur. -- La version 5.0.0 est compatible avec Keycloak `21.x.y`. -- La version 4.0.0 est compatible avec Keycloak `15.0.0` jusqu'à `20.0.0`. +- La version 6.2.0 est compatible avec Keycloak `24.0.0` et supérieur. L'ihm d'administration est fonctionnelle. +- La version 6.1.0 est compatible avec Keycloak `22.0.0` et supérieur. (non configurable par ihm) +- La version 5.0.0 est compatible avec Keycloak `21.x.y`. (non configurable par ihm) +- La version 4.0.0 est compatible avec Keycloak `15.0.0` jusqu'à `20.0.0`. (non configurable par ihm à partir de keycloak 19) - La version 2.1 jusqu'à 3.0.0 est compatible avec Keycloak `9.0.2` jusqu'à `15.0.0`. - La version 2.0 est compatible avec Keycloak `8.0.1` jusqu'à `9.0.0`. @@ -81,6 +78,8 @@ Vous devez créer un [compte France Connect](https://franceconnect.gouv.fr/parte Il existe 2 environnements de connexion, `Integration` et `Production`. La demande d'un compte permettant l'accès à l'environnement d'Intégration s'effectue par email au service support de France Connect. +Le compte partenaire France Connect est configurable via https://partenaires.franceconnect.gouv.fr + #### Configuration Suite à l'installation de l'extension, le fournisseur d'identité `France Connect Particulier` est apparu. Une fois ce dernier selectionné, vous arrivez sur la page de configuration suivante : diff --git a/pom.xml b/pom.xml index 4acafd0..1d8689e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ fr.insee.keycloak keycloak-franceconnect - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT ${project.groupId}:${project.artifactId} France Connect Openid-Connect Provider for Keycloak diff --git a/src/main/resources/META-INF/keycloak-themes.json b/src/main/resources/META-INF/keycloak-themes.json index 705577a..1d89eb4 100644 --- a/src/main/resources/META-INF/keycloak-themes.json +++ b/src/main/resources/META-INF/keycloak-themes.json @@ -3,7 +3,6 @@ { "name": "fc-ac-theme", "types": [ - "admin", "login" ] } diff --git a/src/main/resources/theme-resources/messages/admin-messages_en.properties b/src/main/resources/admin-messages_en.properties similarity index 100% rename from src/main/resources/theme-resources/messages/admin-messages_en.properties rename to src/main/resources/admin-messages_en.properties diff --git a/src/main/resources/theme-resources/messages/admin-messages_fr.properties b/src/main/resources/admin-messages_fr.properties similarity index 100% rename from src/main/resources/theme-resources/messages/admin-messages_fr.properties rename to src/main/resources/admin-messages_fr.properties diff --git a/src/main/resources/theme-resources/resources/partials/realm-identity-provider-agentconnect.html b/src/main/resources/theme-resources/resources/partials/realm-identity-provider-agentconnect.html deleted file mode 100644 index 224091b..0000000 --- a/src/main/resources/theme-resources/resources/partials/realm-identity-provider-agentconnect.html +++ /dev/null @@ -1,409 +0,0 @@ -
- -
    -
  1. - {{:: 'identity-providers' | translate}} -
    2. -
  2. {{identityProvider.displayName}}
    3. -
  3. {{identityProvider.alias}}
    4. -
  4. {{:: 'add-identity-provider' | translate}}
    5. -
- - - -
-
-
- - -
-
- -
-
- - {{:: 'agentconnect.environment.tooltip' | translate}} -
- -
- - -
- -
- - {{:: 'redirect-uri.tooltip' | translate}} -
- -
- - -
- -
- - {{:: 'identity-provider.alias.tooltip' | translate}} -
- -
- - -
- -
- - {{:: 'identity-provider.display-name.tooltip' | translate}} -
- -
- - -
- -
- -
- - {{:: 'agentconnect.link.account.management' | translate}} - -
- - {{:: 'identity-provider.client-id.tooltip' | translate}} -
- -
- - -
- -
- - {{:: 'client-secret.tooltip' | translate}} -
- -
- - -
- -
- -
- - {{:: 'agentconnect.link.scopes.supported' | translate}} - -
- - {{:: 'identity-provider.default-scopes.tooltip' | translate}} -
- -
- - -
-
- -
-
- - {{:: 'agentconnect.eidas.tooltip' | translate}} -
- -
- - -
- -
- - {{:: 'identity-provider.enabled.tooltip' | translate}} -
- -
- - -
- -
- - {{:: 'trust-email.tooltip' | translate}} -
-
- -
- - {{:: 'agentconnect.config.advanced.label' | translate}} - {{:: 'agentconnect.config.advanced.tooltip' | translate}} - - -
- - -
- -
- - {{:: 'identity-provider.store-tokens.tooltip' | translate}} -
- -
- - -
- -
- - {{:: 'identity-provider.stored-tokens-readable.tooltip' | translate}} -
- -
- - -
- -
- - {{:: 'link-only.tooltip' | translate}} -
- -
- - -
- -
- - {{:: 'hide-on-login-page.tooltip' | translate}} -
- -
- - -
- -
- - {{:: 'gui-order.tooltip' | translate}} -
- -
- - -
-
- -
-
- - {{:: 'first-broker-login-flow.tooltip' | translate}} -
- -
- - -
-
- -
-
- - {{:: 'post-broker-login-flow.tooltip' | translate}} -
- -
- - -
- -
- - {{:: 'loginHint.tooltip' | translate}} -
- -
- - -
- -
- - {{:: 'uiLocales.tooltip' | translate}} -
- -
- - -
-
- -
-
- - {{:: 'prompt.tooltip' | translate}} -
- -
- - -
- -
- - {{:: 'identity-provider.validate-signatures.tooltip' | translate}} -
- -
- - -
- -
- - {{:: 'agentconnect.config.ignorestateparam.tooltip' | translate}} -
- -
- - -
- -
- - {{:: 'identity-provider.allowed-clock-skew.tooltip' | translate}} -
- -
- - -
- -
- - {{:: 'identity-provider.forwarded-query-parameters.tooltip' | translate}} -
-
- -
- - {{:: 'import-external-idp-config' | translate}} - {{:: 'import-external-idp-config.tooltip' | translate}} - - -
- - -
- -
- - {{:: 'identity-provider.import-from-url.tooltip' | translate}} -
- -
- - -
- -
-
- -
- - - {{:: 'identity-provider.import-from-file.tooltip' | translate}} - -
-
- - - -
- - - {{files[0].name}} - -
- -
- - -
- -
-
-
-
- -
-
- - -
-
-
-
- - diff --git a/src/main/resources/theme-resources/resources/partials/realm-identity-provider-franceconnect-particulier.html b/src/main/resources/theme-resources/resources/partials/realm-identity-provider-franceconnect-particulier.html deleted file mode 100644 index b3b6f72..0000000 --- a/src/main/resources/theme-resources/resources/partials/realm-identity-provider-franceconnect-particulier.html +++ /dev/null @@ -1,416 +0,0 @@ -
- -
    -
  1. - {{:: 'identity-providers' | translate}} -
    2. -
  2. {{identityProvider.displayName}}
    3. -
  3. {{identityProvider.alias}}
    4. -
  4. {{:: 'add-identity-provider' | translate}}
    5. -
- - - -
-
-
- - -
-
- -
-
- - {{:: 'franceconnect.environment.tooltip' | translate}} -
- -
- - -
- -
- - {{:: 'redirect-uri.tooltip' | translate}} -
- -
- - -
- -
- - {{:: 'identity-provider.alias.tooltip' | translate}} -
- -
- - -
- -
- - {{:: 'identity-provider.display-name.tooltip' | translate}} -
- -
- - -
- -
- -
- - {{:: 'franceconnect.link.account.management' | translate}} - -
- - {{:: 'identity-provider.client-id.tooltip' | translate}} -
- -
- - -
- -
- - {{:: 'client-secret.tooltip' | translate}} -
- -
- - -
- -
- -
- - {{:: 'franceconnect.link.scopes.supported' | translate}} - -
- - {{:: 'identity-provider.default-scopes.tooltip' | translate}} -
- -
- - -
-
- -
-
- - {{:: 'franceconnect.eidas.tooltip' | translate}} -
- -
- - -
- -
- - {{:: 'identity-provider.enabled.tooltip' | translate}} -
- -
- - -
- -
- - {{:: 'trust-email.tooltip' | translate}} -
-
- -
- - {{:: 'franceconnect.config.advanced.label' | translate}} - {{:: 'franceconnect.config.advanced.tooltip' | translate}} - - -
- - -
- -
- - {{:: 'identity-provider.store-tokens.tooltip' | translate}} -
- -
- - -
- -
- - {{:: 'identity-provider.stored-tokens-readable.tooltip' | translate}} -
- -
- - -
- -
- - {{:: 'link-only.tooltip' | translate}} -
- -
- - -
- -
- - {{:: 'hide-on-login-page.tooltip' | translate}} -
- -
- - -
- -
- - {{:: 'gui-order.tooltip' | translate}} -
- -
- - -
-
- -
-
- - {{:: 'first-broker-login-flow.tooltip' | translate}} -
- -
- - -
-
- -
-
- - {{:: 'post-broker-login-flow.tooltip' | translate}} -
- -
- - -
- -
- - {{:: 'loginHint.tooltip' | translate}} -
- -
- - -
- -
- - {{:: 'uiLocales.tooltip' | translate}} -
- -
- - -
-
- -
-
- - {{:: 'prompt.tooltip' | translate}} -
- -
- - -
- -
- - {{:: 'identity-provider.validate-signatures.tooltip' | translate}} -
- -
- - -
- -
- - {{:: 'franceconnect.config.ignorestateparam.tooltip' | translate}} -
- -
- - -
- -
- - {{:: 'identity-provider.allowed-clock-skew.tooltip' | translate}} -
- -
- - -
- -
- - {{:: 'identity-provider.forwarded-query-parameters.tooltip' | translate}} -
-
- -
- - {{:: 'import-external-idp-config' | translate}} - {{:: 'import-external-idp-config.tooltip' | translate}} - - -
- - -
- -
- - {{:: 'identity-provider.import-from-url.tooltip' | translate}} -
- -
- - -
- -
-
- -
- - - {{:: 'identity-provider.import-from-file.tooltip' | translate}} - -
-
- - - -
- - - {{files[0].name}} - -
- -
- - -
- -
-
-
-
- -
-
- - -
-
-
-
- - diff --git a/src/main/resources/theme/fc-ac-theme/admin/theme.properties b/src/main/resources/theme/fc-ac-theme/admin/theme.properties deleted file mode 100644 index 574f55f..0000000 --- a/src/main/resources/theme/fc-ac-theme/admin/theme.properties +++ /dev/null @@ -1,2 +0,0 @@ -parent=keycloak -locales=en,fr \ No newline at end of file