keycloakify 11.12.0 → 11.13.0

package/src/bin/shared/constants.ts

@@ -34,6 +34,7 @@ export const LOGIN_THEME_PAGE_IDS = [
     "login-otp.ftl",
     "login-update-profile.ftl",
     "login-update-password.ftl",
+    "link-idp-action.ftl",
     "login-idp-link-confirm.ftl",
     "login-idp-link-email.ftl",
     "login-page-expired.ftl",

package/src/login/DefaultPage.tsx

@@ -22,6 +22,7 @@ const LoginUsername = lazy(() => import("keycloakify/login/pages/LoginUsername")
 const WebauthnAuthenticate = lazy(() => import("keycloakify/login/pages/WebauthnAuthenticate"));
 const WebauthnRegister = lazy(() => import("keycloakify/login/pages/WebauthnRegister"));
 const LoginUpdatePassword = lazy(() => import("keycloakify/login/pages/LoginUpdatePassword"));
+const LinkIdpAction = lazy(() => import("keycloakify/login/pages/LinkIdpAction"));
 const LoginUpdateProfile = lazy(() => import("keycloakify/login/pages/LoginUpdateProfile"));
 const LoginIdpLinkConfirm = lazy(() => import("keycloakify/login/pages/LoginIdpLinkConfirm"));
 const LoginPageExpired = lazy(() => import("keycloakify/login/pages/LoginPageExpired"));
@@ -87,6 +88,8 @@ export default function DefaultPage(props: DefaultPageProps) {
                         return <WebauthnRegister kcContext={kcContext} {...rest} />;
                     case "login-update-password.ftl":
                         return <LoginUpdatePassword kcContext={kcContext} {...rest} />;
+                    case "link-idp-action.ftl":
+                        return <LinkIdpAction kcContext={kcContext} {...rest} />;
                     case "login-update-profile.ftl":
                         return <LoginUpdateProfile kcContext={kcContext} {...rest} />;
                     case "login-idp-link-confirm.ftl":

package/src/login/KcContext/KcContext.ts

@@ -41,6 +41,7 @@ export type KcContext =
     | KcContext.WebauthnRegister
     | KcContext.LoginPassword
     | KcContext.LoginUpdatePassword
+    | KcContext.LinkIdpAction
     | KcContext.LoginUpdateProfile
     | KcContext.LoginIdpLinkConfirm
     | KcContext.LoginIdpLinkEmail
@@ -441,6 +442,11 @@ export declare namespace KcContext {
         pageId: "login-update-password.ftl";
     };
 
+    export type LinkIdpAction = Common & {
+        pageId: "link-idp-action.ftl";
+        idpDisplayName: string;
+    };
+
     export type LoginIdpLinkConfirm = Common & {
         pageId: "login-idp-link-confirm.ftl";
         idpAlias: string;

package/src/login/KcContext/kcContextMocks.ts

@@ -402,6 +402,11 @@ export const kcContextMocks = [
         ...kcContextCommonMock,
         pageId: "login-update-password.ftl"
     }),
+    id<KcContext.LinkIdpAction>({
+        ...kcContextCommonMock,
+        pageId: "link-idp-action.ftl",
+        idpDisplayName: "FranceConnect"
+    }),
     id<KcContext.LoginUpdateProfile>({
         ...kcContextCommonMock,
         pageId: "login-update-profile.ftl",

package/src/login/i18n/messages_defaultSet/ar.ts

@@ -479,7 +479,9 @@ const messages = {
     remove: "إزالة",
     addValue: "أضف قيمة",
     languages: "اللغات",
-    "organization.select": "اختر مؤسسة للمتابعة:"
+    "organization.select": "اختر مؤسسة للمتابعة:",
+    linkIdpActionTitle: "ربط {0}",
+    linkIdpActionMessage: "هل تريد ربط حسابك مع {0}؟"
 };
 
 export default messages;

package/src/login/i18n/messages_defaultSet/ca.ts

@@ -511,7 +511,9 @@ const messages = {
     remove: "Elimina",
     addValue: "Afegeix valor",
     languages: "Idiomes",
-    "organization.select": "Selecciona una organització per continuar:"
+    "organization.select": "Selecciona una organització per continuar:",
+    linkIdpActionTitle: "Enllaçant {0}",
+    linkIdpActionMessage: "Vols enllaçar el teu compte amb {0}?"
 };
 
 export default messages;

package/src/login/i18n/messages_defaultSet/cs.ts

@@ -488,7 +488,9 @@ const messages = {
     remove: "Odstranit",
     addValue: "Přidat hodnotu",
     languages: "Jazyky",
-    "organization.select": "Vyberte organizaci pro pokračování:"
+    "organization.select": "Vyberte organizaci pro pokračování:",
+    linkIdpActionTitle: "Propojení {0}",
+    linkIdpActionMessage: "Chcete propojit svůj účet s {0}?"
 };
 
 export default messages;

package/src/login/i18n/messages_defaultSet/da.ts

@@ -350,7 +350,9 @@ const messages = {
     remove: "Fjern",
     addValue: "Tilføj værdi",
     languages: "Sprog",
-    "organization.select": "Vælg en organisation for at fortsætte:"
+    "organization.select": "Vælg en organisation for at fortsætte:",
+    linkIdpActionTitle: "Linker {0}",
+    linkIdpActionMessage: "Vil du forbinde din konto med {0}?"
 };
 
 export default messages;

package/src/login/i18n/messages_defaultSet/de.ts

@@ -537,7 +537,9 @@ const messages = {
     remove: "Entfernen",
     addValue: "Wert hinzufügen",
     languages: "Sprachen",
-    "organization.select": "Wählen Sie eine Organisation, um fortzufahren:"
+    "organization.select": "Wählen Sie eine Organisation, um fortzufahren:",
+    linkIdpActionTitle: "Verknüpfe {0}",
+    linkIdpActionMessage: "Möchten Sie Ihr Konto mit {0} verknüpfen?"
 };
 
 export default messages;

package/src/login/i18n/messages_defaultSet/el.ts

@@ -506,7 +506,9 @@ const messages = {
     remove: "Αφαίρεση",
     addValue: "Προσθήκη τιμής",
     languages: "Γλώσσες",
-    "organization.select": "Επιλέξτε έναν οργανισμό για να συνεχίσετε:"
+    "organization.select": "Επιλέξτε έναν οργανισμό για να συνεχίσετε:",
+    linkIdpActionTitle: "Σύνδεση {0}",
+    linkIdpActionMessage: "Θέλετε να συνδέσετε τον λογαριασμό σας με {0};"
 };
 
 export default messages;

package/src/login/i18n/messages_defaultSet/en.ts

@@ -522,7 +522,9 @@ const messages = {
     remove: "Remove",
     addValue: "Add value",
     languages: "Languages",
-    "organization.select": "Select an organization to proceed:"
+    "organization.select": "Select an organization to proceed:",
+    linkIdpActionTitle: "Linking {0}",
+    linkIdpActionMessage: "Do you want to link your account with {0}?"
 };
 
 export default messages;

package/src/login/i18n/messages_defaultSet/es.ts

@@ -519,7 +519,9 @@ const messages = {
     remove: "Eliminar",
     addValue: "Añadir valor",
     languages: "Idiomas",
-    "organization.select": "Selecciona una organización para continuar:"
+    "organization.select": "Selecciona una organización para continuar:",
+    linkIdpActionTitle: "Vinculando {0}",
+    linkIdpActionMessage: "¿Quieres vincular tu cuenta con {0}?"
 };
 
 export default messages;

package/src/login/i18n/messages_defaultSet/fa.ts

@@ -474,7 +474,9 @@ const messages = {
     remove: "حذف",
     addValue: "افزودن مقدار",
     languages: "زبان‌ها",
-    "organization.select": "یک سازمان را برای ادامه انتخاب کنید:"
+    "organization.select": "یک سازمان را برای ادامه انتخاب کنید:",
+    linkIdpActionTitle: "در حال اتصال {0}",
+    linkIdpActionMessage: "آیا می‌خواهید حساب خود را با {0} لینک کنید؟"
 };
 
 export default messages;

package/src/login/i18n/messages_defaultSet/fi.ts

@@ -420,7 +420,9 @@ const messages = {
     remove: "Poista",
     addValue: "Lisää arvo",
     languages: "Kielet",
-    "organization.select": "Valitse organisaatio jatkaaksesi:"
+    "organization.select": "Valitse organisaatio jatkaaksesi:",
+    linkIdpActionTitle: "Linkitetään {0}",
+    linkIdpActionMessage: "Haluatko yhdistää tilisi {0}:n kanssa?"
 };
 
 export default messages;

package/src/login/i18n/messages_defaultSet/fr.ts

@@ -452,7 +452,9 @@ const messages = {
     remove: "Supprimer",
     addValue: "Ajouter une valeur",
     languages: "Langues",
-    "organization.select": "Sélectionnez une organisation pour continuer :"
+    "organization.select": "Sélectionnez une organisation pour continuer :",
+    linkIdpActionTitle: "Association à {0}",
+    linkIdpActionMessage: "Voulez-vous lier votre compte à {0} ?"
 };
 
 export default messages;

package/src/login/i18n/messages_defaultSet/hu.ts

@@ -506,7 +506,9 @@ const messages = {
     remove: "Eltávolítás",
     addValue: "Érték hozzáadása",
     languages: "Nyelvek",
-    "organization.select": "Válasszon egy szervezetet a folytatáshoz:"
+    "organization.select": "Válasszon egy szervezetet a folytatáshoz:",
+    linkIdpActionTitle: "Összekapcsolás: {0}",
+    linkIdpActionMessage: "Össze kívánod kapcsolni a fiókodat a(z) {0} szolgáltatással?"
 };
 
 export default messages;

package/src/login/i18n/messages_defaultSet/it.ts

@@ -360,7 +360,9 @@ const messages = {
     remove: "Rimuovi",
     addValue: "Aggiungi valore",
     languages: "Lingue",
-    "organization.select": "Seleziona un'organizzazione per continuare:"
+    "organization.select": "Seleziona un'organizzazione per continuare:",
+    linkIdpActionTitle: "Collegamento a {0}",
+    linkIdpActionMessage: "Vuoi collegare il tuo account con {0}?"
 };
 
 export default messages;

package/src/login/i18n/messages_defaultSet/ja.ts

@@ -363,7 +363,9 @@ const messages = {
     remove: "削除",
     addValue: "値を追加",
     languages: "言語",
-    "organization.select": "続行する組織を選択してください:"
+    "organization.select": "続行する組織を選択してください:",
+    linkIdpActionTitle: "{0} をリンク",
+    linkIdpActionMessage: "アカウントを{0}にリンクしますか？"
 };
 
 export default messages;

package/src/login/i18n/messages_defaultSet/ka.ts

@@ -531,7 +531,9 @@ const messages = {
     remove: "წაშალეთ",
     addValue: "დაამატეთ მნიშვნელობა",
     languages: "ენები",
-    "organization.select": "აირჩიეთ ორგანიზაცია გაგრძელებისთვის:"
+    "organization.select": "აირჩიეთ ორგანიზაცია გაგრძელებისთვის:",
+    linkIdpActionTitle: "კავშირის დამყარება {0}",
+    linkIdpActionMessage: "გსურთ თქვენი ანგარიშის {0}-თან დაკავშირება?"
 };
 
 export default messages;

package/src/login/i18n/messages_defaultSet/lt.ts

@@ -227,7 +227,9 @@ const messages = {
     remove: "Pašalinti",
     addValue: "Pridėti reikšmę",
     languages: "Kalbos",
-    "organization.select": "Pasirinkite organizaciją, kad galėtumėte tęsti:"
+    "organization.select": "Pasirinkite organizaciją, kad galėtumėte tęsti:",
+    linkIdpActionTitle: "Prijungiama {0}",
+    linkIdpActionMessage: "Ar norite susieti savo paskyrą su {0}?"
 };
 
 export default messages;

package/src/login/i18n/messages_defaultSet/lv.ts

@@ -223,7 +223,9 @@ const messages = {
     remove: "Noņemt",
     addValue: "Pievienot vērtību",
     languages: "Valodas",
-    "organization.select": "Izvēlieties organizāciju, lai turpinātu:"
+    "organization.select": "Izvēlieties organizāciju, lai turpinātu:",
+    linkIdpActionTitle: "Saistīšana ar {0}",
+    linkIdpActionMessage: "Vai vēlaties sasaistīt savu kontu ar {0}?"
 };
 
 export default messages;

package/src/login/i18n/messages_defaultSet/nl.ts

@@ -318,7 +318,9 @@ const messages = {
     remove: "Verwijderen",
     addValue: "Waarde toevoegen",
     languages: "Talen",
-    "organization.select": "Selecteer een organisatie om door te gaan:"
+    "organization.select": "Selecteer een organisatie om door te gaan:",
+    linkIdpActionTitle: "Koppelen met {0}",
+    linkIdpActionMessage: "Wil je je account koppelen aan {0}?"
 };
 
 export default messages;

package/src/login/i18n/messages_defaultSet/no.ts

@@ -222,7 +222,9 @@ const messages = {
     remove: "Fjern",
     addValue: "Legg til verdi",
     languages: "Språk",
-    "organization.select": "Velg en organisasjon for å fortsette:"
+    "organization.select": "Velg en organisasjon for å fortsette:",
+    linkIdpActionTitle: "Kobler til {0}",
+    linkIdpActionMessage: "Vil du koble kontoen din til {0}?"
 };
 
 export default messages;

package/src/login/i18n/messages_defaultSet/pl.ts

@@ -322,7 +322,9 @@ const messages = {
     remove: "Usuń",
     addValue: "Dodaj wartość",
     languages: "Języki",
-    "organization.select": "Wybierz organizację, aby kontynuować:"
+    "organization.select": "Wybierz organizację, aby kontynuować:",
+    linkIdpActionTitle: "Łączenie z {0}",
+    linkIdpActionMessage: "Czy chcesz połączyć swoje konto z {0}?"
 };
 
 export default messages;

package/src/login/i18n/messages_defaultSet/pt-BR.ts

@@ -392,7 +392,9 @@ const messages = {
     remove: "Remover",
     addValue: "Adicionar valor",
     languages: "Idiomas",
-    "organization.select": "Selecione uma organização para continuar:"
+    "organization.select": "Selecione uma organização para continuar:",
+    linkIdpActionTitle: "Associando {0}",
+    linkIdpActionMessage: "Deseja vincular sua conta ao {0}?"
 };
 
 export default messages;

package/src/login/i18n/messages_defaultSet/pt.ts

@@ -513,7 +513,9 @@ const messages = {
     remove: "Remover",
     addValue: "Adicionar valor",
     languages: "Idiomas",
-    "organization.select": "Selecione uma organização para continuar:"
+    "organization.select": "Selecione uma organização para continuar:",
+    linkIdpActionTitle: "Associando {0}",
+    linkIdpActionMessage: "Deseja associar sua conta a {0}?"
 };
 
 export default messages;

package/src/login/i18n/messages_defaultSet/ru.ts

@@ -253,7 +253,9 @@ const messages = {
     remove: "Удалить",
     addValue: "Добавить значение",
     languages: "Языки",
-    "organization.select": "Выберите организацию, чтобы продолжить:"
+    "organization.select": "Выберите организацию, чтобы продолжить:",
+    linkIdpActionTitle: "Связать с {0}",
+    linkIdpActionMessage: "Хотите связать свою учетную запись с {0}?"
 };
 
 export default messages;

package/src/login/i18n/messages_defaultSet/sk.ts

@@ -497,7 +497,9 @@ const messages = {
     remove: "Odstrániť",
     addValue: "Pridať hodnotu",
     languages: "Jazyky",
-    "organization.select": "Vyberte organizáciu, aby ste pokračovali:"
+    "organization.select": "Vyberte organizáciu, aby ste pokračovali:",
+    linkIdpActionTitle: "Prepájanie {0}",
+    linkIdpActionMessage: "Chcete prepojiť svoj účet s {0}?"
 };
 
 export default messages;

package/src/login/i18n/messages_defaultSet/sv.ts

@@ -223,7 +223,9 @@ const messages = {
     remove: "Ta bort",
     addValue: "Lägg till värde",
     languages: "Språk",
-    "organization.select": "Välj en organisation för att fortsätta:"
+    "organization.select": "Välj en organisation för att fortsätta:",
+    linkIdpActionTitle: "Länkar {0}",
+    linkIdpActionMessage: "Vill du länka ditt konto med {0}?"
 };
 
 export default messages;

package/src/login/i18n/messages_defaultSet/th.ts

@@ -485,7 +485,9 @@ const messages = {
     remove: "ลบ",
     addValue: "เพิ่มค่า",
     languages: "ภาษา",
-    "organization.select": "เลือกองค์กรเพื่อดำเนินการต่อ:"
+    "organization.select": "เลือกองค์กรเพื่อดำเนินการต่อ:",
+    linkIdpActionTitle: "กำลังเชื่อมต่อ {0}",
+    linkIdpActionMessage: "คุณต้องการเชื่อมบัญชีของคุณกับ {0} หรือไม่?"
 };
 
 export default messages;

package/src/login/i18n/messages_defaultSet/tr.ts

@@ -300,7 +300,9 @@ const messages = {
     remove: "Kaldır",
     addValue: "Değer ekle",
     languages: "Diller",
-    "organization.select": "Devam etmek için bir organizasyon seçin:"
+    "organization.select": "Devam etmek için bir organizasyon seçin:",
+    linkIdpActionTitle: "Bağlanıyor: {0}",
+    linkIdpActionMessage: "Hesabınızı {0} ile bağlamak ister misiniz?"
 };
 
 export default messages;

package/src/login/i18n/messages_defaultSet/uk.ts

@@ -511,7 +511,9 @@ const messages = {
     remove: "Видалити",
     addValue: "Додати значення",
     languages: "Мови",
-    "organization.select": "Виберіть організацію, щоб продовжити:"
+    "organization.select": "Виберіть організацію, щоб продовжити:",
+    linkIdpActionTitle: "Зв'язування з {0}",
+    linkIdpActionMessage: "Бажаєте прив'язати свій обліковий запис до {0}?"
 };
 
 export default messages;

package/src/login/i18n/messages_defaultSet/zh-CN.ts

@@ -456,7 +456,9 @@ const messages = {
     remove: "移除",
     addValue: "添加值",
     languages: "语言",
-    "organization.select": "选择一个组织以继续:"
+    "organization.select": "选择一个组织以继续:",
+    linkIdpActionTitle: "正在关联 {0}",
+    linkIdpActionMessage: "是否将您的账户与 {0} 关联？"
 };
 
 export default messages;

package/src/login/i18n/messages_defaultSet/zh-TW.ts

@@ -465,7 +465,9 @@ const messages = {
     remove: "移除",
     addValue: "添加值",
     languages: "語言",
-    "organization.select": "選擇一個組織以繼續:"
+    "organization.select": "選擇一個組織以繼續:",
+    linkIdpActionTitle: "正在連結 {0}",
+    linkIdpActionMessage: "是否要將您的帳戶與 {0} 連結？"
 };
 
 export default messages;

package/src/login/pages/LinkIdpAction.tsx

@@ -0,0 +1,53 @@
+import { getKcClsx } from "keycloakify/login/lib/kcClsx";
+import type { PageProps } from "keycloakify/login/pages/PageProps";
+import type { KcContext } from "../KcContext";
+import type { I18n } from "../i18n";
+
+export default function LinkIdpAction(props: PageProps<Extract<KcContext, { pageId: "link-idp-action.ftl" }>, I18n>) {
+    const { kcContext, i18n, doUseDefaultCss, Template, classes } = props;
+
+    const { kcClsx } = getKcClsx({
+        doUseDefaultCss,
+        classes
+    });
+
+    const { idpDisplayName, url } = kcContext;
+
+    const { msg, msgStr } = i18n;
+
+    return (
+        <Template
+            kcContext={kcContext}
+            i18n={i18n}
+            doUseDefaultCss={doUseDefaultCss}
+            classes={classes}
+            headerNode={msg("linkIdpActionTitle", idpDisplayName)}
+            displayMessage={false}
+        >
+            <div id="kc-link-text" className={kcClsx("kcContentWrapperClass")}>
+                {msg("linkIdpActionMessage", idpDisplayName)}
+            </div>
+            <form className={kcClsx("kcFormClass")} action={url.loginAction} method="post">
+                <div className={kcClsx("kcFormGroupClass")}>
+                    <div id="kc-form-buttons" className={kcClsx("kcFormButtonsClass")}>
+                        <input
+                            className={kcClsx("kcButtonClass", "kcButtonPrimaryClass", "kcButtonLargeClass")}
+                            name="continue"
+                            id="kc-continue"
+                            type="submit"
+                            value={msgStr("doContinue")}
+                        />
+                        <input
+                            className={kcClsx("kcButtonClass", "kcButtonDefaultClass", "kcButtonLargeClass")}
+                            name="cancel-aia"
+                            id="kc-cancel"
+                            type="submit"
+                            value={msgStr("doCancel")}
+                        />
+                    </div>
+                </div>
+            </form>
+            <div className="clearfix" />
+        </Template>
+    );
+}

package/stories/login/pages/LinkIdpAction.stories.tsx

@@ -0,0 +1,36 @@
+import React from "react";
+import type { Meta, StoryObj } from "@storybook/react";
+import { createKcPageStory } from "../KcPageStory";
+
+const { KcPageStory } = createKcPageStory({ pageId: "link-idp-action.ftl" });
+
+const meta = {
+    title: "login/link-idp-action.ftl",
+    component: KcPageStory
+} satisfies Meta<typeof KcPageStory>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {
+    render: () => (
+        <KcPageStory
+            kcContext={{
+                idpDisplayName: "GitHub",
+                url: { loginAction: "/mock-login-action" }
+            }}
+        />
+    )
+};
+
+export const DifferentProvider: Story = {
+    render: () => (
+        <KcPageStory
+            kcContext={{
+                idpDisplayName: "Google",
+                url: { loginAction: "/custom-login-action" }
+            }}
+        />
+    )
+};

package/vite-plugin/index.js

@@ -1057,6 +1057,7 @@ const LOGIN_THEME_PAGE_IDS = [
     "login-otp.ftl",
     "login-update-profile.ftl",
     "login-update-password.ftl",
+    "link-idp-action.ftl",
     "login-idp-link-confirm.ftl",
     "login-idp-link-email.ftl",
     "login-page-expired.ftl",