@keycloakify/angular 0.0.1-rc.23 → 0.0.1-rc.25

package/src/login/pages/login-passkeys-conditional-authenticate/login-passkeys-conditional-authenticate.component.html

@@ -9,7 +9,9 @@
 <ng-template #headerNode>
     {{ i18n.msgStr('passkey-login-title') }}
 </ng-template>
-<ng-container infoNode>
+<ng-template #infoNode>
+    @let realm = kcContext.realm;
+    @let url = kcContext.url;
     @if (realm.registrationAllowed && !registrationDisabled) {
         <div id="kc-registration">
             <span>
@@ -23,176 +25,175 @@
             </span>
         </div>
     }
-</ng-container>
+</ng-template>
 
-<ng-container content>
-    <form
-        id="webauth"
-        method="post"
-        [action]="url.loginAction"
-    >
-        <input
-            type="hidden"
-            id="clientDataJSON"
-            name="clientDataJSON"
-        />
-        <input
-            type="hidden"
-            id="authenticatorData"
-            name="authenticatorData"
-        />
-        <input
-            type="hidden"
-            id="signature"
-            name="signature"
-        />
-        <input
-            type="hidden"
-            id="credentialId"
-            name="credentialId"
-        />
-        <input
-            type="hidden"
-            id="userHandle"
-            name="userHandle"
-        />
-        <input
-            type="hidden"
-            id="error"
-            name="error"
-        />
-    </form>
-    <div
-        no-bottom-margin="true"
-        style="margin-bottom: 0"
-        [kcClass]="'kcFormGroupClass'"
-    >
-        @if (authenticators !== undefined && authenticators.authenticators.length !== 0) {
-            <form
-                id="authn_select"
-                [kcClass]="'kcFormClass'"
-            >
-                @for (authenticator of authenticators.authenticators; track authenticator; let i = $index) {
-                    <input
-                        type="hidden"
-                        name="authn_use_chk"
-                        readOnly
-                        [value]="authenticator.credentialId"
-                    />
-                }
-            </form>
+<form
+    id="webauth"
+    method="post"
+    [action]="url.loginAction"
+>
+    <input
+        type="hidden"
+        id="clientDataJSON"
+        name="clientDataJSON"
+    />
+    <input
+        type="hidden"
+        id="authenticatorData"
+        name="authenticatorData"
+    />
+    <input
+        type="hidden"
+        id="signature"
+        name="signature"
+    />
+    <input
+        type="hidden"
+        id="credentialId"
+        name="credentialId"
+    />
+    <input
+        type="hidden"
+        id="userHandle"
+        name="userHandle"
+    />
+    <input
+        type="hidden"
+        id="error"
+        name="error"
+    />
+</form>
+<div
+    no-bottom-margin="true"
+    style="margin-bottom: 0"
+    [kcClass]="'kcFormGroupClass'"
+>
+    @if (authenticators !== undefined && authenticators.authenticators.length !== 0) {
+        <form
+            id="authn_select"
+            [kcClass]="'kcFormClass'"
+        >
+            @for (authenticator of authenticators.authenticators; track authenticator; let i = $index) {
+                <input
+                    type="hidden"
+                    name="authn_use_chk"
+                    readOnly
+                    [value]="authenticator.credentialId"
+                />
+            }
+        </form>
 
-            @if (shouldDisplayAuthenticators) {
-                @if (authenticators.authenticators.length > 1) {
-                    <p [kcClass]="'kcSelectAuthListItemTitle'">
-                        {{ i18n.msgStr('passkey-available-authenticators') }}
-                    </p>
-                }
+        @if (shouldDisplayAuthenticators) {
+            @if (authenticators.authenticators.length > 1) {
+                <p [kcClass]="'kcSelectAuthListItemTitle'">
+                    {{ i18n.msgStr('passkey-available-authenticators') }}
+                </p>
+            }
 
-                <div [kcClass]="'kcFormClass'">
-                    @for (authenticator of authenticators.authenticators; track authenticator; let i = $index) {
-                        <div
-                            id="'kc-webauthn-authenticator-item-' + i"
-                            [kcClass]="'kcSelectAuthListItemClass'"
-                        >
-                            <i
-                                aria-hidden="true"
-                                [ngClass]="selectAuthListItemIconClass(authenticator.transports.iconClass)"
-                                [kcClass]="'kcCommonLogoIdP'"
-                            ></i>
-                            <div [kcClass]="'kcSelectAuthListItemBodyClass'">
+            <div [kcClass]="'kcFormClass'">
+                @for (authenticator of authenticators.authenticators; track authenticator; let i = $index) {
+                    <div
+                        id="'kc-webauthn-authenticator-item-' + i"
+                        [kcClass]="'kcSelectAuthListItemClass'"
+                    >
+                        <i
+                            aria-hidden="true"
+                            [ngClass]="selectAuthListItemIconClass(authenticator.transports.iconClass)"
+                            [kcClass]="'kcCommonLogoIdP'"
+                        ></i>
+                        <div [kcClass]="'kcSelectAuthListItemBodyClass'">
+                            <div
+                                [id]="'kc-webauthn-authenticator-label-' + i"
+                                [kcClass]="'kcSelectAuthListItemHeadingClass'"
+                            >
+                                {{ i18n.advancedMsgStr(authenticator.label) }}
+                            </div>
+                            @if (
+                                authenticator.transports !== undefined &&
+                                authenticator.transports.displayNameProperties !== undefined &&
+                                authenticator.transports.displayNameProperties.length !== 0
+                            ) {
                                 <div
-                                    [id]="'kc-webauthn-authenticator-label-' + i"
-                                    [kcClass]="'kcSelectAuthListItemHeadingClass'"
+                                    [id]="'kc-webauthn-authenticator-transport-' + i"
+                                    [kcClass]="'kcSelectAuthListItemDescriptionClass'"
                                 >
-                                    {{ i18n.advancedMsgStr(authenticator.label) }}
-                                </div>
-                                @if (
-                                    authenticator.transports !== undefined &&
-                                    authenticator.transports.displayNameProperties !== undefined &&
-                                    authenticator.transports.displayNameProperties.length !== 0
-                                ) {
-                                    <div
-                                        [id]="'kc-webauthn-authenticator-transport-' + i"
-                                        [kcClass]="'kcSelectAuthListItemDescriptionClass'"
-                                    >
-                                        @for (nameProperty of authenticator.transports.displayNameProperties; track nameProperty; let i = $index) {
-                                            <span>
-                                                {{ i18n.advancedMsgStr(nameProperty) }}
-                                            </span>
-                                            @if (i !== authenticator.transports.displayNameProperties.length - 1) {
-                                                <span>, </span>
-                                            }
-                                        }
-                                    </div>
-                                    <div [kcClass]="'kcSelectAuthListItemDescriptionClass'">
-                                        <span [id]="'kc-webauthn-authenticator-createdlabel-' + i">
-                                            {{ i18n.msgStr('passkey-createdAt-label') }}
+                                    @for (nameProperty of authenticator.transports.displayNameProperties; track nameProperty; let i = $index) {
+                                        <span>
+                                            {{ i18n.advancedMsgStr(nameProperty) }}
                                         </span>
-                                        <span [id]="'kc-webauthn-authenticator-created-' + i">
-                                            {{ authenticator.createdAt }}
-                                        </span>
-                                    </div>
-                                    <div [kcClass]="'kcSelectAuthListItemFillClass'"></div>
-                                }
-                            </div>
+                                        @if (i !== authenticator.transports.displayNameProperties.length - 1) {
+                                            <span>, </span>
+                                        }
+                                    }
+                                </div>
+                                <div [kcClass]="'kcSelectAuthListItemDescriptionClass'">
+                                    <span [id]="'kc-webauthn-authenticator-createdlabel-' + i">
+                                        {{ i18n.msgStr('passkey-createdAt-label') }}
+                                    </span>
+                                    <span [id]="'kc-webauthn-authenticator-created-' + i">
+                                        {{ authenticator.createdAt }}
+                                    </span>
+                                </div>
+                                <div [kcClass]="'kcSelectAuthListItemFillClass'"></div>
+                            }
                         </div>
-                    }
-                </div>
-            }
+                    </div>
+                }
+            </div>
         }
-        <div id="kc-form-wrapper">
-            @if (realm.password) {
-                <form
-                    id="kc-form-passkey"
-                    method="post"
-                    style="display: none"
-                    [action]="url.loginAction"
-                >
-                    @if (!usernameHidden) {
-                        <div [kcClass]="'kcFormGroupClass'">
-                            <label
-                                for="username"
-                                [kcClass]="'kcLabelClass'"
+    }
+    <div id="kc-form-wrapper">
+        @if (realm.password) {
+            <form
+                id="kc-form-passkey"
+                method="post"
+                style="display: none"
+                [action]="url.loginAction"
+            >
+                @if (!usernameHidden) {
+                    <div [kcClass]="'kcFormGroupClass'">
+                        <label
+                            for="username"
+                            [kcClass]="'kcLabelClass'"
+                        >
+                            {{ i18n.msgStr('passkey-autofill-select') }}
+                        </label>
+                        <input
+                            tabIndex="1"
+                            id="username"
+                            name="username"
+                            type="text"
+                            autoFocus
+                            autoComplete="off"
+                            [attr.aria-invalid]="messagesPerField.existsError('username')"
+                            [kcClass]="'kcInputClass'"
+                            [value]="login.username ?? ''"
+                        />
+                        @if (messagesPerField.existsError('username')) {
+                            <span
+                                id="input-error-username"
+                                aria-live="polite"
+                                [kcClass]="'kcInputErrorMessageClass'"
                             >
-                                {{ i18n.msgStr('passkey-autofill-select') }}
-                            </label>
-                            <input
-                                tabIndex="1"
-                                id="username"
-                                name="username"
-                                type="text"
-                                autoFocus
-                                autoComplete="off"
-                                [attr.aria-invalid]="messagesPerField.existsError('username')"
-                                [kcClass]="'kcInputClass'"
-                                [value]="login.username ?? ''"
-                            />
-                            @if (messagesPerField.existsError('username')) {
-                                <span
-                                    id="input-error-username"
-                                    aria-live="polite"
-                                    [kcClass]="'kcInputErrorMessageClass'"
-                                >
-                                    {{ messagesPerField.get('username') }}
-                                </span>
-                            }
-                        </div>
-                    }
-                </form>
-                <div
-                    id="kc-form-passkey-button"
-                    style="display: none"
-                    [kcClass]="'kcFormButtonsClass'"
-                >
-                    <input
-                        id="authButtonId"
-                        type="button"
-                        autoFocus
-                        [value]="i18n.msgStr('passkey-doAuthenticate')"
-                        [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
-                    />
-                </div>
-            }
-        </div></div
-></ng-container>
+                                {{ messagesPerField.get('username') }}
+                            </span>
+                        }
+                    </div>
+                }
+            </form>
+            <div
+                id="kc-form-passkey-button"
+                style="display: none"
+                [kcClass]="'kcFormButtonsClass'"
+            >
+                <input
+                    id="authButtonId"
+                    type="button"
+                    autoFocus
+                    [value]="i18n.msgStr('passkey-doAuthenticate')"
+                    [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
+                />
+            </div>
+        }
+    </div>
+</div>

package/src/login/pages/login-password/login-password.component.html

@@ -5,79 +5,78 @@
 <ng-template #headerNode>
     {{ i18n.msgStr('doLogIn') }}
 </ng-template>
-<ng-container content>
-    <div id="kc-form">
-        <div id="kc-form-wrapper">
-            <form
-                id="kc-form-login"
-                method="post"
-                [action]="url?.loginAction"
-                (onSubmit)="isLoginButtonDisabled.set(true)"
+
+<div id="kc-form">
+    <div id="kc-form-wrapper">
+        <form
+            id="kc-form-login"
+            method="post"
+            [action]="url?.loginAction"
+            (onSubmit)="isLoginButtonDisabled.set(true)"
+        >
+            <div
+                class="no-bottom-margin"
+                [kcClass]="'kcFormGroupClass'"
             >
-                <div
-                    class="no-bottom-margin"
-                    [kcClass]="'kcFormGroupClass'"
+                <hr />
+                <label
+                    for="password"
+                    [kcClass]="'kcLabelClass'"
                 >
-                    <hr />
-                    <label
-                        for="password"
-                        [kcClass]="'kcLabelClass'"
-                    >
-                        {{ i18n.msgStr('password') }}
-                    </label>
-                    <kc-password-wrapper passwordInputId="password">
-                        <input
-                            type="password"
-                            id="password"
-                            name="password"
-                            aria-describedby="input-error-password"
-                            [kcClass]="'kcInputClass'"
-                            [required]="true"
-                            [autofocus]="true"
-                            [tabindex]="1"
-                        />
-                    </kc-password-wrapper>
+                    {{ i18n.msgStr('password') }}
+                </label>
+                <kc-password-wrapper passwordInputId="password">
+                    <input
+                        type="password"
+                        id="password"
+                        name="password"
+                        aria-describedby="input-error-password"
+                        [kcClass]="'kcInputClass'"
+                        [required]="true"
+                        [autofocus]="true"
+                        [tabindex]="1"
+                    />
+                </kc-password-wrapper>
 
-                    @if (messagesPerField.existsError('password')) {
-                        <span
-                            id="input-error-password"
-                            aria-live="polite"
-                            [kcClass]="'kcInputErrorMessageClass'"
-                            [innerHTML]="messagesPerField.getFirstError('password') | kcSanitize: 'html'"
-                        >
+                @if (messagesPerField.existsError('password')) {
+                    <span
+                        id="input-error-password"
+                        aria-live="polite"
+                        [kcClass]="'kcInputErrorMessageClass'"
+                        [innerHTML]="messagesPerField.getFirstError('password') | kcSanitize: 'html'"
+                    >
+                    </span>
+                }
+            </div>
+            <div [kcClass]="['kcFormGroupClass', 'kcFormSettingClass']">
+                <div id="kc-form-options"></div>
+                <div [kcClass]="'kcFormOptionsWrapperClass'">
+                    @if (realm.resetPasswordAllowed) {
+                        <span>
+                            <a
+                                tabindex="5"
+                                [href]="url.loginResetCredentialsUrl"
+                            >
+                                {{ i18n.msgStr('doForgotPassword') }}
+                            </a>
                         </span>
                     }
                 </div>
-                <div [kcClass]="['kcFormGroupClass', 'kcFormSettingClass']">
-                    <div id="kc-form-options"></div>
-                    <div [kcClass]="'kcFormOptionsWrapperClass'">
-                        @if (realm.resetPasswordAllowed) {
-                            <span>
-                                <a
-                                    tabindex="5"
-                                    [href]="url.loginResetCredentialsUrl"
-                                >
-                                    {{ i18n.msgStr('doForgotPassword') }}
-                                </a>
-                            </span>
-                        }
-                    </div>
-                </div>
-                <div
-                    id="kc-form-buttons"
-                    [kcClass]="'kcFormGroupClass'"
-                >
-                    <input
-                        type="submit"
-                        id="kc-login"
-                        name="login"
-                        [value]="i18n.msgStr('doLogIn')"
-                        [disabled]="isLoginButtonDisabled()"
-                        [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
-                        [tabindex]="4"
-                    />
-                </div>
-            </form>
-        </div>
+            </div>
+            <div
+                id="kc-form-buttons"
+                [kcClass]="'kcFormGroupClass'"
+            >
+                <input
+                    type="submit"
+                    id="kc-login"
+                    name="login"
+                    [value]="i18n.msgStr('doLogIn')"
+                    [disabled]="isLoginButtonDisabled()"
+                    [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
+                    [tabindex]="4"
+                />
+            </div>
+        </form>
     </div>
-</ng-container>
+</div>

package/src/login/pages/login-recovery-authn-code-input/login-recovery-authn-code-input.component.html

@@ -6,63 +6,61 @@
     {{ i18n.msgStr('auth-recovery-code-header') }}
 </ng-template>
 
-<ng-container content>
-    <form
-        id="kc-recovery-code-login-form"
-        method="post"
-        [kcClass]="'kcFormClass'"
-        [action]="url.loginAction"
-    >
-        <div [kcClass]="'kcFormGroupClass'">
-            <div [kcClass]="'kcLabelWrapperClass'">
-                <label
-                    for="recoveryCodeInput"
-                    [kcClass]="'kcLabelClass'"
-                >
-                    {{ i18n.msgStr('auth-recovery-code-prompt', recoveryAuthnCodesInputBean.codeNumber.toString()) }}
-                </label>
-            </div>
-            <div [kcClass]="'kcInputWrapperClass'">
-                <input
-                    tabIndex="1"
-                    id="recoveryCodeInput"
-                    name="recoveryCodeInput"
-                    autoComplete="off"
-                    type="text"
-                    autoFocus
-                    [attr.aria-invalid]="messagesPerField.existsError('recoveryCodeInput')"
-                    [kcClass]="'kcInputClass'"
-                />
-                @if (messagesPerField.existsError('recoveryCodeInput')) {
-                    <span
-                        id="input-error"
-                        aria-live="polite"
-                        [kcClass]="'kcInputErrorMessageClass'"
-                        [innerHTML]="messagesPerField.get('recoveryCodeInput') | kcSanitize: 'html'"
-                    ></span>
-                }
-            </div>
+<form
+    id="kc-recovery-code-login-form"
+    method="post"
+    [kcClass]="'kcFormClass'"
+    [action]="url.loginAction"
+>
+    <div [kcClass]="'kcFormGroupClass'">
+        <div [kcClass]="'kcLabelWrapperClass'">
+            <label
+                for="recoveryCodeInput"
+                [kcClass]="'kcLabelClass'"
+            >
+                {{ i18n.msgStr('auth-recovery-code-prompt', recoveryAuthnCodesInputBean.codeNumber.toString()) }}
+            </label>
+        </div>
+        <div [kcClass]="'kcInputWrapperClass'">
+            <input
+                tabIndex="1"
+                id="recoveryCodeInput"
+                name="recoveryCodeInput"
+                autoComplete="off"
+                type="text"
+                autoFocus
+                [attr.aria-invalid]="messagesPerField.existsError('recoveryCodeInput')"
+                [kcClass]="'kcInputClass'"
+            />
+            @if (messagesPerField.existsError('recoveryCodeInput')) {
+                <span
+                    id="input-error"
+                    aria-live="polite"
+                    [kcClass]="'kcInputErrorMessageClass'"
+                    [innerHTML]="messagesPerField.get('recoveryCodeInput') | kcSanitize: 'html'"
+                ></span>
+            }
         </div>
+    </div>
 
-        <div [kcClass]="'kcFormGroupClass'">
-            <div
-                id="kc-form-options"
-                [kcClass]="'kcFormOptionsWrapperClass'"
-            >
-                <div [kcClass]="'kcFormOptionsWrapperClass'"></div>
-            </div>
-            <div
-                id="kc-form-buttons"
-                [kcClass]="'kcFormButtonsClass'"
-            >
-                <input
-                    name="login"
-                    id="kc-login"
-                    type="submit"
-                    [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
-                    [value]="i18n.msgStr('doLogIn')"
-                />
-            </div>
+    <div [kcClass]="'kcFormGroupClass'">
+        <div
+            id="kc-form-options"
+            [kcClass]="'kcFormOptionsWrapperClass'"
+        >
+            <div [kcClass]="'kcFormOptionsWrapperClass'"></div>
+        </div>
+        <div
+            id="kc-form-buttons"
+            [kcClass]="'kcFormButtonsClass'"
+        >
+            <input
+                name="login"
+                id="kc-login"
+                type="submit"
+                [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
+                [value]="i18n.msgStr('doLogIn')"
+            />
         </div>
-    </form>
-</ng-container>
+    </div>
+</form>