@keycloakify/angular 0.0.1-rc.18 → 0.0.1-rc.19

package/src/login/pages/webauthn-authenticate/webauthn-authenticate.component.html

@@ -2,158 +2,148 @@
 @let authenticators = kcContext.authenticators;
 @let shouldDisplayAuthenticators = kcContext.shouldDisplayAuthenticators;
 
-<kc-login-template
-    [displayInfo]="displayInfo"
-    [bodyClassName]="bodyClassName()"
-    [displayMessage]="displayMessage"
-    [displayRequiredFields]="displayRequiredFields()"
-    [documentTitle]="documentTitle()"
->
-    <ng-container headerNode>
-        {{ i18n.msgStr('webauthn-login-title') }}
-    </ng-container>
-    <ng-container infoNode>
-        <div id="kc-registration">
-            <span>
-                {{ i18n.msgStr('noAccount') }}
-                <a
-                    tabIndex="6"
-                    [href]="url.registrationUrl"
-                >
-                    {{ i18n.msgStr('doRegister') }}
-                </a>
-            </span>
-        </div>
-    </ng-container>
-    <ng-container content>
-        <div
-            id="kc-form-webauthn"
-            [kcClass]="'kcFormClass'"
-        >
-            <form
-                id="webauth"
-                method="post"
-                [action]="url.loginAction"
+<ng-template #headerNode>
+    {{ i18n.msgStr('webauthn-login-title') }}
+</ng-template>
+<ng-template #infoNode>
+    <div id="kc-registration">
+        <span>
+            {{ i18n.msgStr('noAccount') }}
+            <a
+                tabIndex="6"
+                [href]="url.registrationUrl"
             >
-                <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>
+                {{ i18n.msgStr('doRegister') }}
+            </a>
+        </span>
+    </div>
+</ng-template>
+<div
+    id="kc-form-webauthn"
+    [kcClass]="'kcFormClass'"
+>
+    <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
-                class="no-bottom-margin"
-                [kcClass]="'kcFormGroupClass'"
+    <div
+        class="no-bottom-margin"
+        [kcClass]="'kcFormGroupClass'"
+    >
+        @if (authenticators) {
+            <form
+                id="authn_select"
+                [kcClass]="'kcFormClass'"
             >
-                @if (authenticators) {
-                    <form
-                        id="authn_select"
-                        [kcClass]="'kcFormClass'"
-                    >
-                        @for (authenticator of authenticators.authenticators; track authenticator.credentialId) {
-                            <input
-                                type="hidden"
-                                name="authn_use_chk"
-                                [value]="authenticator.credentialId"
-                            />
-                        }
-                        @if (shouldDisplayAuthenticators) {
-                            @if (authenticators.authenticators.length > 1) {
-                                <p [kcClass]="'kcSelectAuthListItemTitle'">
-                                    {{ i18n.msgStr('webauthn-available-authenticators') }}
-                                </p>
-                            }
-                            <div [kcClass]="'kcFormOptionsClass'">
-                                @for (authenticator of authenticators.authenticators; track authenticator.credentialId; let i = $index) {
-                                    <div
-                                        [id]="'kc-webauthn-authenticator-item-' + i"
-                                        [kcClass]="'kcSelectAuthListItemClass'"
-                                    >
-                                        <div [kcClass]="'kcSelectAuthListItemIconClass'">
-                                            <i
-                                                [ngClass]="selectAuthListItemIconClass(authenticator.transports.iconClass)"
-                                                [kcClass]="'kcSelectAuthListItemIconPropertyClass'"
-                                            ></i>
-                                            <div [kcClass]="'kcSelectAuthListItemArrowIconClass'">
-                                                <div
-                                                    [id]="'kc-webauthn-authenticator-label-' + i"
-                                                    [kcClass]="'kcSelectAuthListItemHeadingClass'"
-                                                >
-                                                    {{ i18n.advancedMsgStr(authenticator.label) }}
-                                                </div>
-                                                @if (authenticator.transports.displayNameProperties?.length) {
-                                                    <div
-                                                        [id]="'kc-webauthn-authenticator-transport-' + i"
-                                                        [kcClass]="'kcSelectAuthListItemDescriptionClass'"
-                                                    >
-                                                        @for (
-                                                            displayNameProperty of authenticator.transports.displayNameProperties;
-                                                            track displayNameProperty;
-                                                            let last = $last
-                                                        ) {
-                                                            {{ i18n.advancedMsgStr(displayNameProperty) }}
-                                                            @if (!last) {
-                                                                <span>, </span>
-                                                            }
-                                                        }
-                                                    </div>
-                                                    <div [kcClass]="'kcSelectAuthListItemDescriptionClass'">
-                                                        <span [id]="'kc-webauthn-authenticator-createdlabel-' + i">
-                                                            {{ i18n.msgStr('webauthn-createdAt-label') }}
-                                                        </span>
-                                                        <span [id]="'kc-webauthn-authenticator-created-' + i">{{ authenticator.createdAt }}</span>
-                                                    </div>
-                                                    <div [kcClass]="'kcSelectAuthListItemFillClass'"></div>
+                @for (authenticator of authenticators.authenticators; track authenticator.credentialId) {
+                    <input
+                        type="hidden"
+                        name="authn_use_chk"
+                        [value]="authenticator.credentialId"
+                    />
+                }
+                @if (shouldDisplayAuthenticators) {
+                    @if (authenticators.authenticators.length > 1) {
+                        <p [kcClass]="'kcSelectAuthListItemTitle'">
+                            {{ i18n.msgStr('webauthn-available-authenticators') }}
+                        </p>
+                    }
+                    <div [kcClass]="'kcFormOptionsClass'">
+                        @for (authenticator of authenticators.authenticators; track authenticator.credentialId; let i = $index) {
+                            <div
+                                [id]="'kc-webauthn-authenticator-item-' + i"
+                                [kcClass]="'kcSelectAuthListItemClass'"
+                            >
+                                <div [kcClass]="'kcSelectAuthListItemIconClass'">
+                                    <i
+                                        [ngClass]="selectAuthListItemIconClass(authenticator.transports.iconClass)"
+                                        [kcClass]="'kcSelectAuthListItemIconPropertyClass'"
+                                    ></i>
+                                    <div [kcClass]="'kcSelectAuthListItemArrowIconClass'">
+                                        <div
+                                            [id]="'kc-webauthn-authenticator-label-' + i"
+                                            [kcClass]="'kcSelectAuthListItemHeadingClass'"
+                                        >
+                                            {{ i18n.advancedMsgStr(authenticator.label) }}
+                                        </div>
+                                        @if (authenticator.transports.displayNameProperties?.length) {
+                                            <div
+                                                [id]="'kc-webauthn-authenticator-transport-' + i"
+                                                [kcClass]="'kcSelectAuthListItemDescriptionClass'"
+                                            >
+                                                @for (
+                                                    displayNameProperty of authenticator.transports.displayNameProperties;
+                                                    track displayNameProperty;
+                                                    let last = $last
+                                                ) {
+                                                    {{ i18n.advancedMsgStr(displayNameProperty) }}
+                                                    @if (!last) {
+                                                        <span>, </span>
+                                                    }
                                                 }
                                             </div>
-                                        </div>
+                                            <div [kcClass]="'kcSelectAuthListItemDescriptionClass'">
+                                                <span [id]="'kc-webauthn-authenticator-createdlabel-' + i">
+                                                    {{ i18n.msgStr('webauthn-createdAt-label') }}
+                                                </span>
+                                                <span [id]="'kc-webauthn-authenticator-created-' + i">{{ authenticator.createdAt }}</span>
+                                            </div>
+                                            <div [kcClass]="'kcSelectAuthListItemFillClass'"></div>
+                                        }
                                     </div>
-                                }
+                                </div>
                             </div>
                         }
-                    </form>
+                    </div>
                 }
+            </form>
+        }
 
-                <div
-                    id="kc-form-buttons"
-                    [kcClass]="'kcFormButtonsClass'"
-                >
-                    <input
-                        type="button"
-                        autofocus
-                        name="cancel-aia"
-                        [id]="authButtonId"
-                        [kcClass]="['kcButtonClass', 'kcButtonDefaultClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
-                        [value]="i18n.msgStr('webauthn-doAuthenticate')"
-                    />
-                </div>
-            </div>
+        <div
+            id="kc-form-buttons"
+            [kcClass]="'kcFormButtonsClass'"
+        >
+            <input
+                type="button"
+                autofocus
+                name="cancel-aia"
+                [id]="authButtonId"
+                [kcClass]="['kcButtonClass', 'kcButtonDefaultClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
+                [value]="i18n.msgStr('webauthn-doAuthenticate')"
+            />
         </div>
-    </ng-container>
-</kc-login-template>
+    </div>
+</div>

package/src/login/pages/webauthn-authenticate/webauthn-authenticate.component.ts

@@ -1,22 +1,22 @@
-import { ChangeDetectionStrategy, Component, forwardRef, inject, input } from '@angular/core';
+import { ChangeDetectionStrategy, Component, forwardRef, inject, 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 { LogoutOtherSessionsComponent } from '@keycloakify/angular/login/components/logout-other-sessions';
 import { TemplateComponent } from '@keycloakify/angular/login/containers/template';
 import { KcClassDirective } from '@keycloakify/angular/login/directives/kc-class';
+import type { I18n } from '../../i18n';
+import type { KcContext } from '../../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, LogoutOtherSessionsComponent],
-    selector: 'kc-root',
+    selector: 'kc-webauthn-authenticate',
     templateUrl: 'webauthn-authenticate.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
     providers: [
@@ -30,13 +30,20 @@ export class WebauthnAuthenticateComponent extends ComponentReference {
     kcContext = inject<Extract<KcContext, { pageId: 'webauthn-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);
-    displayRequiredFields = input(false);
-    documentTitle = input<string>();
-    bodyClassName = input<string>();
-    displayInfo: boolean = false;
-    displayMessage: boolean = true;
+
+    documentTitle: string | undefined;
+    bodyClassName: string | undefined;
+
+    displayRequiredFields = false;
+    displayInfo = false;
+    displayMessage = true;
+
+    headerNode? = viewChild<TemplateRef<HTMLElement>>('headerNode');
+    infoNode? = viewChild<TemplateRef<HTMLElement>>('infoNode');
+    socialProvidersNode? = viewChild<TemplateRef<HTMLElement>>('socialProvidersNode');
 
     authButtonId = 'authenticateWebAuthnButton';
 

package/src/login/pages/webauthn-error/webauthn-error.component.html

@@ -1,60 +1,50 @@
 @let url = kcContext.url;
 @let isAppInitiatedAction = kcContext.isAppInitiatedAction;
 
-<kc-login-template
-    [displayInfo]="displayInfo"
-    [bodyClassName]="bodyClassName()"
-    [displayMessage]="displayMessage"
-    [displayRequiredFields]="displayRequiredFields()"
-    [documentTitle]="documentTitle()"
+<ng-template #headerNode>
+    {{ i18n.msgStr('webauthn-error-title') }}
+</ng-template>
+<form
+    id="kc-error-credential-form"
+    method="post"
+    [kcClass]="'kcFormClass'"
+    [action]="url.loginAction"
 >
-    <ng-container headerNode>
-        {{ i18n.msgStr('webauthn-error-title') }}
-    </ng-container>
-    <ng-container content>
-        <form
-            id="kc-error-credential-form"
-            method="post"
-            [kcClass]="'kcFormClass'"
-            [action]="url.loginAction"
+    <input
+        type="hidden"
+        id="executionValue"
+        name="authenticationExecution"
+    />
+    <input
+        type="hidden"
+        id="isSetRetry"
+        name="isSetRetry"
+    />
+</form>
+<input
+    tabIndex="4"
+    type="button"
+    name="try-again"
+    id="kc-try-again"
+    [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
+    [value]="i18n.msgStr('doTryAgain')"
+    (click)="onClick()"
+/>
+@if (isAppInitiatedAction) {
+    <form
+        id="kc-webauthn-settings-form"
+        method="post"
+        [action]="url.loginAction"
+        [kcClass]="'kcFormClass'"
+    >
+        <button
+            type="submit"
+            id="cancelWebAuthnAIA"
+            name="cancel-aia"
+            value="true"
+            [kcClass]="['kcButtonClass', 'kcButtonDefaultClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
         >
-            <input
-                type="hidden"
-                id="executionValue"
-                name="authenticationExecution"
-            />
-            <input
-                type="hidden"
-                id="isSetRetry"
-                name="isSetRetry"
-            />
-        </form>
-        <input
-            tabIndex="4"
-            type="button"
-            name="try-again"
-            id="kc-try-again"
-            [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
-            [value]="i18n.msgStr('doTryAgain')"
-            (click)="onClick()"
-        />
-        @if (isAppInitiatedAction) {
-            <form
-                id="kc-webauthn-settings-form"
-                method="post"
-                [action]="url.loginAction"
-                [kcClass]="'kcFormClass'"
-            >
-                <button
-                    type="submit"
-                    id="cancelWebAuthnAIA"
-                    name="cancel-aia"
-                    value="true"
-                    [kcClass]="['kcButtonClass', 'kcButtonDefaultClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
-                >
-                    {{ i18n.msgStr('doCancel') }}
-                </button>
-            </form>
-        }
-    </ng-container>
-</kc-login-template>
+            {{ i18n.msgStr('doCancel') }}
+        </button>
+    </form>
+}

package/src/login/pages/webauthn-error/webauthn-error.component.ts

@@ -1,20 +1,20 @@
-import { ChangeDetectionStrategy, Component, forwardRef, inject, input } from '@angular/core';
+import { ChangeDetectionStrategy, Component, forwardRef, inject, TemplateRef, viewChild } from '@angular/core';
 import { USE_DEFAULT_CSS } from '@keycloakify/angular/lib/tokens/use-default-css';
 import { ComponentReference } from '@keycloakify/angular/login/classes/component-reference';
 import { LogoutOtherSessionsComponent } from '@keycloakify/angular/login/components/logout-other-sessions';
 import { TemplateComponent } from '@keycloakify/angular/login/containers/template';
 import { KcClassDirective } from '@keycloakify/angular/login/directives/kc-class';
-import { LOGIN_I18N } from '@keycloakify/angular/login/tokens/i18n';
 import type { I18n } from '../../i18n';
+import type { KcContext } from '../../KcContext';
 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 } from 'keycloakify/login/lib/kcClsx';
-import type { KcContext } from '../../KcContext';
 
 @Component({
     standalone: true,
     imports: [TemplateComponent, KcClassDirective, LogoutOtherSessionsComponent],
-    selector: 'kc-root',
+    selector: 'kc-webauthn-error',
     templateUrl: 'webauthn-error.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
     providers: [
@@ -27,13 +27,20 @@ import type { KcContext } from '../../KcContext';
 export class WebauthnErrorComponent extends ComponentReference {
     kcContext = inject<Extract<KcContext, { pageId: 'webauthn-error.ftl' }>>(KC_LOGIN_CONTEXT);
     i18n = inject<I18n>(LOGIN_I18N);
+
     override doUseDefaultCss = inject<boolean>(USE_DEFAULT_CSS);
     override classes = inject<Partial<Record<ClassKey, string>>>(LOGIN_CLASSES);
-    displayRequiredFields = input(false);
-    documentTitle = input<string>();
-    bodyClassName = input<string>();
-    displayInfo: boolean = false;
-    displayMessage: boolean = true;
+
+    documentTitle: string | undefined;
+    bodyClassName: string | undefined;
+
+    displayRequiredFields = false;
+    displayInfo = false;
+    displayMessage = true;
+
+    headerNode? = viewChild<TemplateRef<HTMLElement>>('headerNode');
+    infoNode? = viewChild<TemplateRef<HTMLElement>>('infoNode');
+    socialProvidersNode? = viewChild<TemplateRef<HTMLElement>>('socialProvidersNode');
 
     onClick() {
         // @ts-expect-error: Trusted Keycloak's code

package/src/login/pages/webauthn-register/webauthn-register.component.html

@@ -2,81 +2,71 @@
 @let isSetRetry = kcContext.isSetRetry;
 @let isAppInitiatedAction = kcContext.isAppInitiatedAction;
 
-<kc-login-template
-    [displayInfo]="displayInfo"
-    [bodyClassName]="bodyClassName()"
-    [displayMessage]="displayMessage"
-    [displayRequiredFields]="displayRequiredFields()"
-    [documentTitle]="documentTitle()"
+<ng-template #headerNode>
+    <span [kcClass]="'kcWebAuthnKeyIcon'"></span>
+    {{ i18n.msgStr('webauthn-registration-title') }}
+</ng-template>
+<form
+    id="register"
+    method="post"
+    [kcClass]="'kcFormClass'"
+    [action]="url.loginAction"
 >
-    <ng-container headerNode>
-        <span [kcClass]="'kcWebAuthnKeyIcon'"></span>
-        {{ i18n.msgStr('webauthn-registration-title') }}
-    </ng-container>
-    <ng-container content>
-        <form
-            id="register"
-            method="post"
-            [kcClass]="'kcFormClass'"
-            [action]="url.loginAction"
-        >
-            <div [kcClass]="'kcFormGroupClass'">
-                <input
-                    type="hidden"
-                    id="clientDataJSON"
-                    name="clientDataJSON"
-                />
-                <input
-                    type="hidden"
-                    id="attestationObject"
-                    name="attestationObject"
-                />
-                <input
-                    type="hidden"
-                    id="publicKeyCredentialId"
-                    name="publicKeyCredentialId"
-                />
-                <input
-                    type="hidden"
-                    id="authenticatorLabel"
-                    name="authenticatorLabel"
-                />
-                <input
-                    type="hidden"
-                    id="transports"
-                    name="transports"
-                />
-                <input
-                    type="hidden"
-                    id="error"
-                    name="error"
-                />
-                <kc-logout-other-sessions />
-            </div>
-        </form>
+    <div [kcClass]="'kcFormGroupClass'">
         <input
-            type="submit"
-            [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
-            [id]="authButtonId"
-            [value]="i18n.msgStr('doRegisterSecurityKey')"
+            type="hidden"
+            id="clientDataJSON"
+            name="clientDataJSON"
+        />
+        <input
+            type="hidden"
+            id="attestationObject"
+            name="attestationObject"
+        />
+        <input
+            type="hidden"
+            id="publicKeyCredentialId"
+            name="publicKeyCredentialId"
+        />
+        <input
+            type="hidden"
+            id="authenticatorLabel"
+            name="authenticatorLabel"
+        />
+        <input
+            type="hidden"
+            id="transports"
+            name="transports"
         />
-        @if (!isSetRetry && isAppInitiatedAction) {
-            <form
-                id="kc-webauthn-settings-form"
-                method="post"
-                [action]="url.loginAction"
-                [kcClass]="'kcFormClass'"
-            >
-                <button
-                    type="submit"
-                    id="cancelWebAuthnAIA"
-                    name="cancel-aia"
-                    value="true"
-                    [kcClass]="['kcButtonClass', 'kcButtonDefaultClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
-                >
-                    {{ i18n.msgStr('doCancel') }}
-                </button>
-            </form>
-        }
-    </ng-container>
-</kc-login-template>
+        <input
+            type="hidden"
+            id="error"
+            name="error"
+        />
+        <kc-logout-other-sessions />
+    </div>
+</form>
+<input
+    type="submit"
+    [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
+    [id]="authButtonId"
+    [value]="i18n.msgStr('doRegisterSecurityKey')"
+/>
+@if (!isSetRetry && isAppInitiatedAction) {
+    <form
+        id="kc-webauthn-settings-form"
+        method="post"
+        [action]="url.loginAction"
+        [kcClass]="'kcFormClass'"
+    >
+        <button
+            type="submit"
+            id="cancelWebAuthnAIA"
+            name="cancel-aia"
+            value="true"
+            [kcClass]="['kcButtonClass', 'kcButtonDefaultClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
+        >
+            {{ i18n.msgStr('doCancel') }}
+        </button>
+    </form>
+}