From 6b70e92a0eec5f497177801eb37ad8d87c39e25a Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Wed, 24 May 2023 18:43:35 +0300 Subject: [PATCH] RED-6713: add login hint --- src/lib/tenants/guards/if-logged-in.guard.ts | 2 +- src/lib/tenants/services/keycloak-status.service.ts | 3 ++- src/lib/tenants/tenant-select/tenant-select.component.html | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lib/tenants/guards/if-logged-in.guard.ts b/src/lib/tenants/guards/if-logged-in.guard.ts index 52a8bd8..d65d9f0 100644 --- a/src/lib/tenants/guards/if-logged-in.guard.ts +++ b/src/lib/tenants/guards/if-logged-in.guard.ts @@ -37,6 +37,6 @@ export const ifLoggedIn: CanActivateFn = async (route: ActivatedRouteSnapshot) = } logger.warn('[ROUTES] Redirect to login'); - await keycloakStatusService.createLoginUrlAndExecute(); + await keycloakStatusService.createLoginUrlAndExecute(route.queryParamMap.get('username')); return false; }; diff --git a/src/lib/tenants/services/keycloak-status.service.ts b/src/lib/tenants/services/keycloak-status.service.ts index 75c14e2..7d19173 100644 --- a/src/lib/tenants/services/keycloak-status.service.ts +++ b/src/lib/tenants/services/keycloak-status.service.ts @@ -13,12 +13,13 @@ export class KeycloakStatusService { readonly #baseHref = inject(BASE_HREF); readonly #logger = inject(NGXLogger); - createLoginUrlAndExecute() { + createLoginUrlAndExecute(username?: string | null) { const keycloakInstance = this.#keycloakService?.getKeycloakInstance(); if (keycloakInstance) { const url = keycloakInstance.createLoginUrl({ redirectUri: this.createLoginUrl(), idpHint: this.#config.OAUTH_IDP_HINT, + loginHint: username ?? undefined, }); this.#logger.info('[KEYCLOAK] Redirect to login url: ', url); diff --git a/src/lib/tenants/tenant-select/tenant-select.component.html b/src/lib/tenants/tenant-select/tenant-select.component.html index 35161cb..d5e4668 100644 --- a/src/lib/tenants/tenant-select/tenant-select.component.html +++ b/src/lib/tenants/tenant-select/tenant-select.component.html @@ -13,6 +13,7 @@