@keycloakify/angular 0.0.1-rc.8 → 0.0.1

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

@@ -6,200 +6,194 @@
 @let messagesPerField = kcContext.messagesPerField;
 @let usernameHidden = kcContext.usernameHidden;
 @let registrationDisabled = kcContext.registrationDisabled;
-<kc-login-template [displayInfo]="displayInfo">
-    <ng-container headerNode>
-        {{ i18n.msgStr('passkey-login-title') }}
-    </ng-container>
-    <ng-container infoNode>
-        @if (realm.registrationAllowed && !registrationDisabled) {
-            <div id="kc-registration">
-                <span>
-                    {{ i18n.msgStr('noAccount') }}
-                    <a
-                        tabIndex="6"
-                        [href]="url.registrationUrl"
-                    >
-                        {{ i18n.msgStr('doRegister') }}
-                    </a>
-                </span>
-            </div>
-        }
-    </ng-container>
+<ng-template #headerNode>
+    {{ i18n.msgStr('passkey-login-title') }}
+</ng-template>
+<ng-template #infoNode>
+    @let realm = kcContext.realm;
+    @let url = kcContext.url;
+    @if (realm.registrationAllowed && !registrationDisabled) {
+        <div id="kc-registration">
+            <span>
+                {{ i18n.msgStr('noAccount') }}
+                <a
+                    tabIndex="6"
+                    [href]="url.registrationUrl"
+                >
+                    {{ i18n.msgStr('doRegister') }}
+                </a>
+            </span>
+        </div>
+    }
+</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="webauth"
-            [action]="url.loginAction"
-            method="post"
+            id="authn_select"
+            [kcClass]="'kcFormClass'"
         >
-            <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"
-            />
+            @for (authenticator of authenticators.authenticators; track authenticator; let i = $index) {
+                <input
+                    type="hidden"
+                    name="authn_use_chk"
+                    readOnly
+                    [value]="authenticator.credentialId"
+                />
+            }
         </form>
-        <div
-            [kcClass]="'kcFormGroupClass'"
-            no-bottom-margin="true"
-            style="margin-bottom: 0"
-        >
-            @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 [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-item-' + i"
-                                [kcClass]="'kcSelectAuthListItemClass'"
+                                [id]="'kc-webauthn-authenticator-label-' + i"
+                                [kcClass]="'kcSelectAuthListItemHeadingClass'"
                             >
-                                <i
-                                    [ngClass]="selectAuthListItemIconClass(authenticator.transports.iconClass)"
-                                    [kcClass]="'kcCommonLogoIdP'"
-                                    aria-hidden="true"
-                                ></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-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') }}
-                                            </span>
-                                            <span [id]="'kc-webauthn-authenticator-created-' + i">
-                                                {{ authenticator.createdAt }}
-                                            </span>
-                                        </div>
-                                        <div [kcClass]="'kcSelectAuthListItemFillClass'"></div>
+                                {{ 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>
-                        }
+                                <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 id="kc-form-wrapper">
-                @if (realm.password) {
-                    <form
-                        id="kc-form-passkey"
-                        [action]="url.loginAction"
-                        method="post"
-                        style="display: none"
-                    >
-                        @if (!usernameHidden) {
-                            <div [kcClass]="'kcFormGroupClass'">
-                                <label
-                                    for="username"
-                                    [kcClass]="'kcLabelClass'"
-                                >
-                                    {{ i18n.msgStr('passkey-autofill-select') }}
-                                </label>
-                                <input
-                                    tabIndex="1"
-                                    id="username"
-                                    [attr.aria-invalid]="messagesPerField.existsError('username')"
-                                    [kcClass]="'kcInputClass'"
-                                    name="username"
-                                    [value]="login.username ?? ''"
-                                    type="text"
-                                    autoFocus
-                                    autoComplete="off"
-                                />
-                                @if (messagesPerField.existsError('username')) {
-                                    <span
-                                        id="input-error-username"
-                                        [kcClass]="'kcInputErrorMessageClass'"
-                                        aria-live="polite"
-                                    >
-                                        {{ messagesPerField.get('username') }}
-                                    </span>
-                                }
-                            </div>
-                        }
-                    </form>
-                    <div
-                        id="kc-form-passkey-button"
-                        [kcClass]="'kcFormButtonsClass'"
-                        style="display: none"
-                    >
+            </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'"
+                        >
+                            {{ i18n.msgStr('passkey-autofill-select') }}
+                        </label>
                         <input
-                            id="authButtonId"
-                            type="button"
+                            tabIndex="1"
+                            id="username"
+                            name="username"
+                            type="text"
                             autoFocus
-                            [value]="i18n.msgStr('passkey-doAuthenticate')"
-                            [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
+                            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>
-    </ng-container>
-</kc-login-template>
+        }
+    </div>
+</div>

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

@@ -1,21 +1,20 @@
-import { ChangeDetectionStrategy, Component, forwardRef, inject } from '@angular/core';
-import { type Script } from '@keycloakify/angular/lib/models/script.model';
-import { USE_DEFAULT_CSS } from '@keycloakify/angular/lib/tokens/use-default-css.token';
-import { ComponentReference } from '@keycloakify/angular/login/classes/component-reference.class';
-import { TemplateComponent } from '@keycloakify/angular/login/containers/template.component';
-import { KcClassDirective } from '@keycloakify/angular/login/directives/kc-class.directive';
-import { LoginResourceInjectorService } from '@keycloakify/angular/login/services/login-resource-injector.service';
-import { LOGIN_CLASSES } from '@keycloakify/angular/login/tokens/classes.token';
-import { LOGIN_I18N } from '@keycloakify/angular/login/tokens/i18n.token';
-import { KC_LOGIN_CONTEXT } from '@keycloakify/angular/login/tokens/kc-context.token';
+import { ChangeDetectionStrategy, Component, forwardRef, inject, type TemplateRef, viewChild } from '@angular/core';
+import { type Script } from '@keycloakify/angular/lib/models/script';
+import { USE_DEFAULT_CSS } from '@keycloakify/angular/lib/tokens/use-default-css';
+import { ComponentReference } from '@keycloakify/angular/login/classes/component-reference';
+import { KcClassDirective } from '@keycloakify/angular/login/directives/kc-class';
+import type { I18n } from '@keycloakify/angular/login/i18n';
+import type { KcContext } from '@keycloakify/angular/login/KcContext';
+import { LoginResourceInjectorService } from '@keycloakify/angular/login/services/login-resource-injector';
+import { LOGIN_CLASSES } from '@keycloakify/angular/login/tokens/classes';
+import { LOGIN_I18N } from '@keycloakify/angular/login/tokens/i18n';
+import { KC_LOGIN_CONTEXT } from '@keycloakify/angular/login/tokens/kc-context';
 import { type ClassKey, getKcClsx } from 'keycloakify/login/lib/kcClsx';
-import { type I18n } from '../../i18n';
-import { type KcContext } from '../../KcContext';
 
 @Component({
     standalone: true,
-    imports: [TemplateComponent, KcClassDirective],
-    selector: 'kc-root',
+    imports: [KcClassDirective],
+    selector: 'kc-login-passkeys-conditional-authenticate',
     templateUrl: 'login-passkeys-conditional-authenticate.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
     providers: [
@@ -29,10 +28,20 @@ export class LoginPasskeysConditionalAuthenticateComponent extends ComponentRefe
     kcContext = inject<Extract<KcContext, { pageId: 'login-passkeys-conditional-authenticate.ftl' }>>(KC_LOGIN_CONTEXT);
     loginResourceInjectorService = inject(LoginResourceInjectorService);
     i18n = inject<I18n>(LOGIN_I18N);
+
     override doUseDefaultCss = inject<boolean>(USE_DEFAULT_CSS);
     override classes = inject<Partial<Record<ClassKey, string>>>(LOGIN_CLASSES);
-    displayInfo: boolean = true;
 
+    documentTitle: string | undefined;
+    bodyClassName: string | undefined;
+
+    displayRequiredFields = false;
+    displayInfo = true;
+    displayMessage = false;
+
+    headerNode = viewChild<TemplateRef<HTMLElement>>('headerNode');
+    infoNode = viewChild<TemplateRef<HTMLElement>>('infoNode');
+    socialProvidersNode = viewChild<TemplateRef<HTMLElement>>('socialProvidersNode');
     authButtonId = 'authenticateWebAuthnButton';
 
     constructor() {

package/src/login/pages/login-password/index.ts

@@ -0,0 +1 @@
+export * from './login-password.component';

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

@@ -1,90 +1,82 @@
 @let url = kcContext.url;
 @let messagesPerField = kcContext.messagesPerField;
 @let realm = kcContext.realm;
-<kc-login-template
-    [displayInfo]="displayInfo"
-    [bodyClassName]="bodyClassName()"
-    [displayMessage]="displayMessage"
-    [displayRequiredFields]="displayRequiredFields()"
-    [documentTitle]="documentTitle()"
->
-    <ng-container headerNode>
-        {{ i18n.msgStr('doLogIn') }}
-    </ng-container>
-    <ng-container content>
-        <div id="kc-form">
-            <div id="kc-form-wrapper">
-                <form
-                    id="kc-form-login"
-                    (onSubmit)="isLoginButtonDisabled.set(true)"
-                    [action]="url?.loginAction"
-                    method="post"
+
+<ng-template #headerNode>
+    {{ i18n.msgStr('doLogIn') }}
+</ng-template>
+
+<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'"
+            >
+                <hr />
+                <label
+                    for="password"
+                    [kcClass]="'kcLabelClass'"
                 >
-                    <div
-                        [kcClass]="'kcFormGroupClass'"
-                        class="no-bottom-margin"
-                    >
-                        <hr />
-                        <label
-                            for="password"
-                            [kcClass]="'kcLabelClass'"
-                        >
-                            {{ i18n.msgStr('password') }}
-                        </label>
-                        <kc-password-wrapper passwordInputId="password">
-                            <input
-                                type="password"
-                                id="password"
-                                name="password"
-                                [kcClass]="'kcInputClass'"
-                                [required]="true"
-                                [autofocus]="true"
-                                [tabindex]="1"
-                                aria-describedby="input-error-password"
-                            />
-                        </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"
-                                [kcClass]="'kcInputErrorMessageClass'"
-                                aria-live="polite"
-                                [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>
-                    <div
-                        id="kc-form-buttons"
-                        [kcClass]="'kcFormGroupClass'"
+                @if (messagesPerField.existsError('password')) {
+                    <span
+                        id="input-error-password"
+                        aria-live="polite"
+                        [kcClass]="'kcInputErrorMessageClass'"
+                        [innerHTML]="messagesPerField.getFirstError('password') | kcSanitize: 'html'"
                     >
-                        <input
-                            type="submit"
-                            id="kc-login"
-                            name="login"
-                            [value]="i18n.msgStr('doLogIn')"
-                            [disabled]="isLoginButtonDisabled()"
-                            [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
-                            [tabindex]="4"
-                        />
-                    </div>
-                </form>
+                    </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>
-        </div>
-    </ng-container>
-</kc-login-template>
+        </form>
+    </div>
+</div>