From e65c331deed94a934d18d8e535cc34fef992af67 Mon Sep 17 00:00:00 2001 From: Theo Sanderson Date: Thu, 29 Feb 2024 12:09:40 +0000 Subject: [PATCH 01/10] try this --- keycloak/keycloakify/src/login/Template.tsx | 3 +- .../src/login/pages/LogoutConfirm.tsx | 56 +++++++++++++++++++ 2 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 keycloak/keycloakify/src/login/pages/LogoutConfirm.tsx diff --git a/keycloak/keycloakify/src/login/Template.tsx b/keycloak/keycloakify/src/login/Template.tsx index c7bf33beb..aa98985c0 100644 --- a/keycloak/keycloakify/src/login/Template.tsx +++ b/keycloak/keycloakify/src/login/Template.tsx @@ -97,7 +97,8 @@ export default function Template(props: TemplateProps) { )} {!(auth !== undefined && auth.showUsername && !auth.showResetCredentials) ? ( displayRequiredFields ? ( -
+
* diff --git a/keycloak/keycloakify/src/login/pages/LogoutConfirm.tsx b/keycloak/keycloakify/src/login/pages/LogoutConfirm.tsx new file mode 100644 index 000000000..6e920ed76 --- /dev/null +++ b/keycloak/keycloakify/src/login/pages/LogoutConfirm.tsx @@ -0,0 +1,56 @@ +import { clsx } from "keycloakify/tools/clsx"; +import type { PageProps } from "keycloakify/login/pages/PageProps"; +import { useGetClassName } from "keycloakify/login/lib/useGetClassName"; +import type { KcContext } from "../kcContext"; +import type { I18n } from "../i18n"; + +export default function LogoutConfirm(props: PageProps, I18n>) { + const { kcContext, i18n, doUseDefaultCss, Template, classes } = props; + + const { getClassName } = useGetClassName({ + doUseDefaultCss, + classes + }); + + const { url, client, logoutConfirm } = kcContext; + + const { msg, msgStr } = i18n; + + return ( + + ); +} \ No newline at end of file From eb4585ea8619c3230167b15155c713c30fb3a035 Mon Sep 17 00:00:00 2001 From: Theo Sanderson Date: Thu, 29 Feb 2024 12:21:25 +0000 Subject: [PATCH 02/10] increase failure threshold --- kubernetes/loculus/templates/keycloak-deployment.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/kubernetes/loculus/templates/keycloak-deployment.yaml b/kubernetes/loculus/templates/keycloak-deployment.yaml index 56a02c5cf..ae96cf1bc 100644 --- a/kubernetes/loculus/templates/keycloak-deployment.yaml +++ b/kubernetes/loculus/templates/keycloak-deployment.yaml @@ -81,6 +81,7 @@ spec: port: 8080 initialDelaySeconds: 60 periodSeconds: 10 + failureThreshold: 30 readinessProbe: httpGet: path: /health/ready From 10f071cd0c1c727028e19ff3a8163a2fe3edcf7b Mon Sep 17 00:00:00 2001 From: Theo Sanderson Date: Thu, 29 Feb 2024 12:22:23 +0000 Subject: [PATCH 03/10] increase failure threshold --- kubernetes/loculus/templates/keycloak-deployment.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/kubernetes/loculus/templates/keycloak-deployment.yaml b/kubernetes/loculus/templates/keycloak-deployment.yaml index ae96cf1bc..9cd427e6d 100644 --- a/kubernetes/loculus/templates/keycloak-deployment.yaml +++ b/kubernetes/loculus/templates/keycloak-deployment.yaml @@ -88,6 +88,7 @@ spec: port: 8080 initialDelaySeconds: 60 periodSeconds: 10 + failureThreshold: 30 volumes: - name: config-volume configMap: From bdd92efb1a32310453c4ac899bdf339624d69bb3 Mon Sep 17 00:00:00 2001 From: Theo Sanderson Date: Thu, 29 Feb 2024 12:40:44 +0000 Subject: [PATCH 04/10] back to start dev --- kubernetes/loculus/templates/keycloak-deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/loculus/templates/keycloak-deployment.yaml b/kubernetes/loculus/templates/keycloak-deployment.yaml index 9cd427e6d..d3cf14db1 100644 --- a/kubernetes/loculus/templates/keycloak-deployment.yaml +++ b/kubernetes/loculus/templates/keycloak-deployment.yaml @@ -65,7 +65,7 @@ spec: - name: KC_FEATURES value: "declarative-user-profile" args: - - "start" + - "start-dev" - "--import-realm" - "--cache=local" ports: From 45c48bfa14a5865da93233022da209657b6b7266 Mon Sep 17 00:00:00 2001 From: Theo Sanderson Date: Thu, 29 Feb 2024 12:43:27 +0000 Subject: [PATCH 05/10] use local cache --- kubernetes/loculus/templates/keycloak-deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/loculus/templates/keycloak-deployment.yaml b/kubernetes/loculus/templates/keycloak-deployment.yaml index d3cf14db1..9cd427e6d 100644 --- a/kubernetes/loculus/templates/keycloak-deployment.yaml +++ b/kubernetes/loculus/templates/keycloak-deployment.yaml @@ -65,7 +65,7 @@ spec: - name: KC_FEATURES value: "declarative-user-profile" args: - - "start-dev" + - "start" - "--import-realm" - "--cache=local" ports: From f9e94a016d4f7bdcd309d19c51ce5bd798409d79 Mon Sep 17 00:00:00 2001 From: Theo Sanderson Date: Thu, 29 Feb 2024 12:50:37 +0000 Subject: [PATCH 06/10] add logout page --- keycloak/keycloakify/src/login/KcApp.tsx | 2 ++ keycloak/keycloakify/src/login/pages/LogoutConfirm.tsx | 1 + 2 files changed, 3 insertions(+) diff --git a/keycloak/keycloakify/src/login/KcApp.tsx b/keycloak/keycloakify/src/login/KcApp.tsx index 243344491..fc834d4d9 100644 --- a/keycloak/keycloakify/src/login/KcApp.tsx +++ b/keycloak/keycloakify/src/login/KcApp.tsx @@ -13,6 +13,7 @@ const Terms = lazy(() => import("./pages/Terms")); const MyExtraPage1 = lazy(() => import("./pages/MyExtraPage1")); const MyExtraPage2 = lazy(() => import("./pages/MyExtraPage2")); const Info = lazy(() => import("keycloakify/login/pages/Info")); +const LogoutConfirm = lazy(() => import("./pages/LogoutConfirm")); // This is like adding classes to theme.properties // https://github.com/keycloak/keycloak/blob/11.0.3/themes/src/main/resources/theme/keycloak/login/theme.properties @@ -48,6 +49,7 @@ export default function KcApp(props: { kcContext: KcContext; }) { case "register.ftl": return ; case "register-user-profile.ftl": return case "terms.ftl": return ; + case "logout-confirm.ftl": return ; // Removes those pages in you project. They are included to show you how to implement keycloak pages // that are not yes implemented by Keycloakify. // See: https://docs.keycloakify.dev/limitations#some-pages-still-have-the-default-theme.-why diff --git a/keycloak/keycloakify/src/login/pages/LogoutConfirm.tsx b/keycloak/keycloakify/src/login/pages/LogoutConfirm.tsx index 6e920ed76..c227b7bc6 100644 --- a/keycloak/keycloakify/src/login/pages/LogoutConfirm.tsx +++ b/keycloak/keycloakify/src/login/pages/LogoutConfirm.tsx @@ -20,6 +20,7 @@ export default function LogoutConfirm(props: PageProps

{msg("logoutConfirmHeader")}

+ Logout
From 0343902a62c3d30d3689e183447cd64abaf8c156 Mon Sep 17 00:00:00 2001 From: Theo Sanderson Date: Thu, 29 Feb 2024 13:02:41 +0000 Subject: [PATCH 07/10] update --- keycloak/keycloakify/src/login/pages/LogoutConfirm.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/keycloak/keycloakify/src/login/pages/LogoutConfirm.tsx b/keycloak/keycloakify/src/login/pages/LogoutConfirm.tsx index c227b7bc6..9d4cfae94 100644 --- a/keycloak/keycloakify/src/login/pages/LogoutConfirm.tsx +++ b/keycloak/keycloakify/src/login/pages/LogoutConfirm.tsx @@ -20,7 +20,7 @@ export default function LogoutConfirm(props: PageProps

{msg("logoutConfirmHeader")}

- Logout +
@@ -51,6 +51,11 @@ export default function LogoutConfirm(props: PageProps )}
+ +

+ + +

); From 6d732b0a187fb176bfcf157e41943a9b370250ae Mon Sep 17 00:00:00 2001 From: Theo Sanderson Date: Thu, 29 Feb 2024 13:13:53 +0000 Subject: [PATCH 08/10] Update keycloak-deployment.yaml --- kubernetes/loculus/templates/keycloak-deployment.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/kubernetes/loculus/templates/keycloak-deployment.yaml b/kubernetes/loculus/templates/keycloak-deployment.yaml index 9cd427e6d..56a02c5cf 100644 --- a/kubernetes/loculus/templates/keycloak-deployment.yaml +++ b/kubernetes/loculus/templates/keycloak-deployment.yaml @@ -81,14 +81,12 @@ spec: port: 8080 initialDelaySeconds: 60 periodSeconds: 10 - failureThreshold: 30 readinessProbe: httpGet: path: /health/ready port: 8080 initialDelaySeconds: 60 periodSeconds: 10 - failureThreshold: 30 volumes: - name: config-volume configMap: From f02983cacda0151a214d8507a0d3b61a9c99402d Mon Sep 17 00:00:00 2001 From: Theo Sanderson Date: Thu, 29 Feb 2024 13:14:17 +0000 Subject: [PATCH 09/10] Update Template.tsx --- keycloak/keycloakify/src/login/Template.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keycloak/keycloakify/src/login/Template.tsx b/keycloak/keycloakify/src/login/Template.tsx index aa98985c0..c7bf33beb 100644 --- a/keycloak/keycloakify/src/login/Template.tsx +++ b/keycloak/keycloakify/src/login/Template.tsx @@ -97,8 +97,7 @@ export default function Template(props: TemplateProps) { )} {!(auth !== undefined && auth.showUsername && !auth.showResetCredentials) ? ( displayRequiredFields ? ( -
+
* From 847c7dbb421028ee6223e423abb1e6647ad34a77 Mon Sep 17 00:00:00 2001 From: Theo Sanderson Date: Thu, 29 Feb 2024 13:15:42 +0000 Subject: [PATCH 10/10] Update LogoutConfirm.tsx --- keycloak/keycloakify/src/login/pages/LogoutConfirm.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keycloak/keycloakify/src/login/pages/LogoutConfirm.tsx b/keycloak/keycloakify/src/login/pages/LogoutConfirm.tsx index 9d4cfae94..adff33cd0 100644 --- a/keycloak/keycloakify/src/login/pages/LogoutConfirm.tsx +++ b/keycloak/keycloakify/src/login/pages/LogoutConfirm.tsx @@ -52,11 +52,11 @@ export default function LogoutConfirm(props: PageProps -

+

); -} \ No newline at end of file +}