Fix login-register-email.ftl

This commit is contained in:
garronej
2022-07-06 02:05:08 +02:00
parent bc4b0ec17d
commit 7c6eed99d2
3 changed files with 11 additions and 2 deletions

View File

@ -7,7 +7,7 @@ import { getMsg } from "../i18n";
export const LoginVerifyEmail = memo(({ kcContext, ...props }: { kcContext: KcContextBase.LoginVerifyEmail } & KcProps) => { export const LoginVerifyEmail = memo(({ kcContext, ...props }: { kcContext: KcContextBase.LoginVerifyEmail } & KcProps) => {
const { msg } = getMsg(kcContext); const { msg } = getMsg(kcContext);
const { url } = kcContext; const { url, user } = kcContext;
return ( return (
<Template <Template
@ -17,10 +17,12 @@ export const LoginVerifyEmail = memo(({ kcContext, ...props }: { kcContext: KcCo
headerNode={msg("emailVerifyTitle")} headerNode={msg("emailVerifyTitle")}
formNode={ formNode={
<> <>
<p className="instruction">{msg("emailVerifyInstruction1")}</p> <p className="instruction">{msg("emailVerifyInstruction1", user?.email)}</p>
<p className="instruction"> <p className="instruction">
{msg("emailVerifyInstruction2")} {msg("emailVerifyInstruction2")}
<br />
<a href={url.loginAction}>{msg("doClickHere")}</a> <a href={url.loginAction}>{msg("doClickHere")}</a>
&nbsp;
{msg("emailVerifyInstruction3")} {msg("emailVerifyInstruction3")}
</p> </p>
</> </>

View File

@ -179,6 +179,10 @@ export declare namespace KcContextBase {
export type LoginVerifyEmail = Common & { export type LoginVerifyEmail = Common & {
pageId: "login-verify-email.ftl"; pageId: "login-verify-email.ftl";
//NOTE: Optional because maybe it wasn't defined in older keycloak versions.
user?: {
email: string;
};
}; };
export type Terms = Common & { export type Terms = Common & {

View File

@ -337,6 +337,9 @@ export const kcContextMocks: KcContextBase[] = [
id<KcContextBase.LoginVerifyEmail>({ id<KcContextBase.LoginVerifyEmail>({
...kcContextCommonMock, ...kcContextCommonMock,
"pageId": "login-verify-email.ftl", "pageId": "login-verify-email.ftl",
"user": {
"email": "john.doe@gmail.com",
},
}), }),
id<KcContextBase.Terms>({ id<KcContextBase.Terms>({
...kcContextCommonMock, ...kcContextCommonMock,