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

package/src/login/pages/login-reset-otp/login-reset-otp.component.html

@@ -1,67 +1,60 @@
 @let url = kcContext.url;
 @let configuredOtpCredentials = kcContext.configuredOtpCredentials;
-<kc-login-template
-    [displayInfo]="displayInfo"
-    [bodyClassName]="bodyClassName()"
-    [displayMessage]="displayMessage"
-    [displayRequiredFields]="displayRequiredFields()"
-    [documentTitle]="documentTitle()"
->
-    <ng-container headerNode>
-        {{ i18n.msgStr('doLogIn') }}
-    </ng-container>
-    <ng-container content>
-        <form
-            id="kc-otp-reset-form"
-            [kcClass]="'kcFormClass'"
-            [action]="url.loginAction"
-            method="post"
-        >
-            <div [kcClass]="'kcInputWrapperClass'">
-                <div [kcClass]="'kcInfoAreaWrapperClass'">
-                    <p id="kc-otp-reset-form-description">
-                        {{ i18n.msgStr('otp-reset-description') }}
-                    </p>
-                    @for (otpCredential of configuredOtpCredentials.userOtpCredentials; track otpCredential; let i = $index) {
+
+<ng-template #headerNode>
+    {{ i18n.msgStr('doLogIn') }}
+</ng-template>
+<ng-container content>
+    <form
+        id="kc-otp-reset-form"
+        method="post"
+        [kcClass]="'kcFormClass'"
+        [action]="url.loginAction"
+    >
+        <div [kcClass]="'kcInputWrapperClass'">
+            <div [kcClass]="'kcInfoAreaWrapperClass'">
+                <p id="kc-otp-reset-form-description">
+                    {{ i18n.msgStr('otp-reset-description') }}
+                </p>
+                @for (otpCredential of configuredOtpCredentials.userOtpCredentials; track otpCredential; let i = $index) {
+                    <input
+                        type="radio"
+                        name="selectedCredentialId"
+                        [id]="'kc-otp-credential-' + i"
+                        [kcClass]="'kcLoginOTPListInputClass'"
+                        [value]="otpCredential.id"
+                        [defaultChecked]="otpCredential.id === configuredOtpCredentials.selectedCredentialId"
+                    />
+                    <label
+                        for="kc-otp-credential-0"
+                        [kcClass]="'kcLoginOTPListClass'"
+                        [tabIndex]="i"
+                    >
+                        <span [kcClass]="'kcLoginOTPListItemHeaderClass'">
+                            <span [kcClass]="'kcLoginOTPListItemIconBodyClass'">
+                                <i
+                                    aria-hidden="true"
+                                    [kcClass]="'kcLoginOTPListItemIconClass'"
+                                ></i>
+                            </span>
+                            <span [kcClass]="'kcLoginOTPListItemTitleClass'">{{ otpCredential.userLabel }}</span>
+                        </span>
+                    </label>
+                }
+                <div [kcClass]="'kcFormGroupClass'">
+                    <div
+                        id="kc-form-buttons"
+                        [kcClass]="'kcFormButtonsClass'"
+                    >
                         <input
-                            id="kc-otp-credential-{{ i }}"
-                            [kcClass]="'kcLoginOTPListInputClass'"
-                            type="radio"
-                            name="selectedCredentialId"
-                            [value]="otpCredential.id"
-                            [defaultChecked]="otpCredential.id === configuredOtpCredentials.selectedCredentialId"
+                            id="kc-otp-reset-form-submit"
+                            type="submit"
+                            [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
+                            [value]="i18n.msgStr('doSubmit')"
                         />
-                        <label
-                            for="kc-otp-credential-0"
-                            [kcClass]="'kcLoginOTPListClass'"
-                            [tabIndex]="i"
-                        >
-                            <span [kcClass]="'kcLoginOTPListItemHeaderClass'">
-                                <span [kcClass]="'kcLoginOTPListItemIconBodyClass'">
-                                    <i
-                                        [kcClass]="'kcLoginOTPListItemIconClass'"
-                                        aria-hidden="true"
-                                    ></i>
-                                </span>
-                                <span [kcClass]="'kcLoginOTPListItemTitleClass'">{{ otpCredential.userLabel }}</span>
-                            </span>
-                        </label>
-                    }
-                    <div [kcClass]="'kcFormGroupClass'">
-                        <div
-                            id="kc-form-buttons"
-                            [kcClass]="'kcFormButtonsClass'"
-                        >
-                            <input
-                                id="kc-otp-reset-form-submit"
-                                [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
-                                type="submit"
-                                [value]="i18n.msgStr('doSubmit')"
-                            />
-                        </div>
                     </div>
                 </div>
             </div>
-        </form>
-    </ng-container>
-</kc-login-template>
+        </div>
+    </form>
+</ng-container>

package/src/login/pages/login-reset-otp/login-reset-otp.component.ts

@@ -1,19 +1,19 @@
-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 { 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 { 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 { I18n } from '../../i18n';
-import type { KcContext } from '../../KcContext';
 
 @Component({
     standalone: true,
     imports: [KcClassDirective, TemplateComponent],
-    selector: 'kc-root',
+    selector: 'kc-login-reset-otp',
     templateUrl: 'login-reset-otp.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
     providers: [
@@ -26,11 +26,18 @@ import type { KcContext } from '../../KcContext';
 export class LoginResetOtpComponent extends ComponentReference {
     kcContext = inject<Extract<KcContext, { pageId: 'login-reset-otp.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;
+
+    documentTitle: string | undefined;
+    bodyClassName: string | undefined;
+
+    displayRequiredFields = false;
+    displayInfo = true;
     displayMessage: boolean = this.kcContext.messagesPerField.existsError('totp');
+
+    headerNode? = viewChild<TemplateRef<HTMLElement>>('headerNode');
+    infoNode? = viewChild<TemplateRef<HTMLElement>>('infoNode');
+    socialProvidersNode? = viewChild<TemplateRef<HTMLElement>>('socialProvidersNode');
 }

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

@@ -2,94 +2,85 @@
 @let messagesPerField = kcContext.messagesPerField;
 @let realm = kcContext.realm;
 @let auth = kcContext.auth;
-<kc-login-template
-    [displayInfo]="displayInfo"
-    [bodyClassName]="bodyClassName()"
-    [displayMessage]="displayMessage"
-    [displayRequiredFields]="displayRequiredFields()"
-    [documentTitle]="documentTitle()"
->
-    <ng-container headerNode>
-        {{ i18n.msgStr('emailForgotTitle') }}
-    </ng-container>
-    <ng-container infoNode>
-        @if (realm.duplicateEmailsAllowed) {
-            {{ i18n.msgStr('emailInstructionUsername') }}
-        } @else {
-            {{ i18n.msgStr('emailInstruction') }}
-        }
-    </ng-container>
 
-    <ng-container content>
-        <form
-            id="kc-passwd-update-form"
-            [kcClass]="'kcFormClass'"
-            [action]="url.loginAction"
-            method="post"
-        >
-            <div [kcClass]="'kcFormGroupClass'">
-                <div [kcClass]="'kcLabelWrapperClass'">
-                    <label
-                        for="password-new"
-                        [kcClass]="'kcLabelClass'"
-                    >
-                        @if (realm.loginWithEmailAllowed) {
-                            {{ i18n.msgStr('username') }}
-                        } @else if (!realm.registrationEmailAsUsername) {
-                            {{ i18n.msgStr('usernameOrEmail') }}
-                        } @else {
-                            {{ i18n.msgStr('email') }}
-                        }
-                    </label>
-                </div>
+<ng-template #headerNode>
+    {{ i18n.msgStr('emailForgotTitle') }}
+</ng-template>
+<ng-template #infoNode>
+    @if (realm.duplicateEmailsAllowed) {
+        {{ i18n.msgStr('emailInstructionUsername') }}
+    } @else {
+        {{ i18n.msgStr('emailInstruction') }}
+    }
+</ng-template>
 
-                <div [kcClass]="'kcInputWrapperClass'">
-                    <input
-                        type="text"
-                        id="username"
-                        name="username"
-                        [kcClass]="'kcInputClass'"
-                        autoFocus
-                        [attr.aria-invalid]="messagesPerField.existsError('username')"
-                        [defaultValue]="auth.attemptedUsername ?? ''"
-                    />
+<form
+    id="kc-passwd-update-form"
+    method="post"
+    [kcClass]="'kcFormClass'"
+    [action]="url.loginAction"
+>
+    <div [kcClass]="'kcFormGroupClass'">
+        <div [kcClass]="'kcLabelWrapperClass'">
+            <label
+                for="password-new"
+                [kcClass]="'kcLabelClass'"
+            >
+                @if (realm.loginWithEmailAllowed) {
+                    {{ i18n.msgStr('username') }}
+                } @else if (!realm.registrationEmailAsUsername) {
+                    {{ i18n.msgStr('usernameOrEmail') }}
+                } @else {
+                    {{ i18n.msgStr('email') }}
+                }
+            </label>
+        </div>
 
-                    @if (messagesPerField.existsError('username')) {
-                        <span
-                            id="input-error-username"
-                            [kcClass]="'kcInputErrorMessageClass'"
-                            aria-live="polite"
-                            [innerHtml]="messagesPerField.get('username') | kcSanitize: 'html'"
-                        ></span>
-                    }
-                </div>
-            </div>
+        <div [kcClass]="'kcInputWrapperClass'">
+            <input
+                type="text"
+                id="username"
+                name="username"
+                autoFocus
+                [kcClass]="'kcInputClass'"
+                [attr.aria-invalid]="messagesPerField.existsError('username')"
+                [defaultValue]="auth.attemptedUsername ?? ''"
+            />
 
-            <div [kcClass]="['kcFormGroupClass', 'kcFormSettingClass']">
-                <div
-                    id="kc-form-options"
-                    [kcClass]="'kcFormOptionsClass'"
-                >
-                    <div [kcClass]="'kcFormOptionsWrapperClass'">
-                        <span>
-                            <a
-                                [href]="url.loginUrl"
-                                [innerHTML]="i18n.msgStr('backToLogin') | kcSanitize: 'html'"
-                            ></a>
-                        </span>
-                    </div>
-                </div>
-                <div
-                    id="kc-form-buttons"
-                    [kcClass]="'kcFormButtonsClass'"
-                >
-                    <input
-                        [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
-                        type="submit"
-                        [value]="i18n.msgStr('doSubmit')"
-                    />
-                </div>
+            @if (messagesPerField.existsError('username')) {
+                <span
+                    id="input-error-username"
+                    aria-live="polite"
+                    [kcClass]="'kcInputErrorMessageClass'"
+                    [innerHtml]="messagesPerField.get('username') | kcSanitize: 'html'"
+                ></span>
+            }
+        </div>
+    </div>
+
+    <div [kcClass]="['kcFormGroupClass', 'kcFormSettingClass']">
+        <div
+            id="kc-form-options"
+            [kcClass]="'kcFormOptionsClass'"
+        >
+            <div [kcClass]="'kcFormOptionsWrapperClass'">
+                <span>
+                    <a
+                        [href]="url.loginUrl"
+                        [innerHTML]="i18n.msgStr('backToLogin') | kcSanitize: 'html'"
+                    ></a>
+                </span>
             </div>
-        </form>
-    </ng-container>
-</kc-login-template>
+        </div>
+        <div
+            id="kc-form-buttons"
+            [kcClass]="'kcFormButtonsClass'"
+        >
+            <input
+                type="submit"
+                [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
+                [value]="i18n.msgStr('doSubmit')"
+            />
+        </div>
+    </div>
+</form>

package/src/login/pages/login-reset-password/login-reset-password.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 { KcSanitizePipe } from '@keycloakify/angular/lib/pipes/kc-sanitize';
 import { USE_DEFAULT_CSS } from '@keycloakify/angular/lib/tokens/use-default-css';
 import { ComponentReference } from '@keycloakify/angular/login/classes/component-reference';
 import { TemplateComponent } from '@keycloakify/angular/login/containers/template';
 import { KcClassDirective } from '@keycloakify/angular/login/directives/kc-class';
-import { KcSanitizePipe } from '@keycloakify/angular/lib/pipes/kc-sanitize';
+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 { I18n } from '../../i18n';
-import type { KcContext } from '../../KcContext';
 
 @Component({
     standalone: true,
     imports: [TemplateComponent, KcClassDirective, KcSanitizePipe],
-    selector: 'kc-root',
+    selector: 'kc-login-reset-password',
     templateUrl: 'login-reset-password.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
     providers: [
@@ -27,11 +27,18 @@ import type { KcContext } from '../../KcContext';
 export class LoginResetPasswordComponent extends ComponentReference {
     kcContext = inject<Extract<KcContext, { pageId: 'login-reset-password.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;
+
+    documentTitle: string | undefined;
+    bodyClassName: string | undefined;
+
+    displayRequiredFields = false;
+    displayInfo = false;
     displayMessage: boolean = this.kcContext.messagesPerField.existsError('username');
+
+    headerNode? = viewChild<TemplateRef<HTMLElement>>('headerNode');
+    infoNode? = viewChild<TemplateRef<HTMLElement>>('infoNode');
+    socialProvidersNode? = viewChild<TemplateRef<HTMLElement>>('socialProvidersNode');
 }

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

@@ -2,115 +2,105 @@
 @let messagesPerField = kcContext.messagesPerField;
 @let isAppInitiatedAction = kcContext.isAppInitiatedAction;
 
-<kc-login-template
-    [displayInfo]="displayInfo"
-    [bodyClassName]="bodyClassName()"
-    [displayMessage]="displayMessage"
-    [displayRequiredFields]="displayRequiredFields()"
-    [documentTitle]="documentTitle()"
+<ng-template #headerNode>
+    {{ i18n.msgStr('updatePasswordTitle') }}
+</ng-template>
+<form
+    id="kc-passwd-update-form"
+    method="post"
+    [kcClass]="'kcFormClass'"
+    [action]="url.loginAction"
 >
-    <ng-container headerNode>
-        {{ i18n.msgStr('updatePasswordTitle') }}
-    </ng-container>
-    <ng-container content>
-        <form
-            id="kc-passwd-update-form"
-            [kcClass]="'kcFormClass'"
-            [action]="url.loginAction"
-            method="post"
-        >
-            <div [kcClass]="'kcFormGroupClass'">
-                <div [kcClass]="'kcLabelWrapperClass'">
-                    <label
-                        for="password-new"
-                        [kcClass]="'kcLabelClass'"
-                    >
-                        {{ i18n.msgStr('passwordNew') }}
-                    </label>
-                </div>
-                <div [kcClass]="'kcInputWrapperClass'">
-                    <kc-password-wrapper passwordInputId="password-new">
-                        <input
-                            type="password"
-                            id="password-new"
-                            name="password-new"
-                            [kcClass]="'kcInputClass'"
-                            autoFocus
-                            autoComplete="new-password"
-                            [attr.aria-invalid]="messagesPerField.existsError('password', 'password-confirm')"
-                        />
-                    </kc-password-wrapper>
+    <div [kcClass]="'kcFormGroupClass'">
+        <div [kcClass]="'kcLabelWrapperClass'">
+            <label
+                for="password-new"
+                [kcClass]="'kcLabelClass'"
+            >
+                {{ i18n.msgStr('passwordNew') }}
+            </label>
+        </div>
+        <div [kcClass]="'kcInputWrapperClass'">
+            <kc-password-wrapper passwordInputId="password-new">
+                <input
+                    type="password"
+                    id="password-new"
+                    name="password-new"
+                    autoFocus
+                    autoComplete="new-password"
+                    [kcClass]="'kcInputClass'"
+                    [attr.aria-invalid]="messagesPerField.existsError('password', 'password-confirm')"
+                />
+            </kc-password-wrapper>
 
-                    @if (messagesPerField.existsError('password')) {
-                        <span
-                            id="input-error-password"
-                            [kcClass]="'kcInputErrorMessageClass'"
-                            aria-live="polite"
-                            [innerHtml]="messagesPerField.get('password') | kcSanitize: 'html'"
-                        ></span>
-                    }
-                </div>
-            </div>
+            @if (messagesPerField.existsError('password')) {
+                <span
+                    id="input-error-password"
+                    aria-live="polite"
+                    [kcClass]="'kcInputErrorMessageClass'"
+                    [innerHtml]="messagesPerField.get('password') | kcSanitize: 'html'"
+                ></span>
+            }
+        </div>
+    </div>
 
-            <div [kcClass]="'kcFormGroupClass'">
-                <div [kcClass]="'kcLabelWrapperClass'">
-                    <label
-                        for="password-confirm"
-                        [kcClass]="'kcLabelClass'"
-                    >
-                        {{ i18n.msgStr('passwordConfirm') }}
-                    </label>
-                </div>
-                <div [kcClass]="'kcInputWrapperClass'">
-                    <kc-password-wrapper passwordInputId="password-confirm">
-                        <input
-                            type="password"
-                            id="password-confirm"
-                            name="password-confirm"
-                            [kcClass]="'kcInputClass'"
-                            autoFocus
-                            autoComplete="new-password"
-                            [attr.aria-invalid]="messagesPerField.existsError('password', 'password-confirm')"
-                        />
-                    </kc-password-wrapper>
-                    @if (messagesPerField.existsError('password-confirm')) {
-                        <span
-                            id="input-error-password-confirm"
-                            [kcClass]="'kcInputErrorMessageClass'"
-                            aria-live="polite"
-                            [innerHtml]="messagesPerField.get('password-confirm') | kcSanitize: 'html'"
-                        ></span>
-                    }
-                </div>
-            </div>
-            <div [kcClass]="'kcFormGroupClass'">
-                <kc-logout-other-sessions></kc-logout-other-sessions>
-                <div
-                    id="kc-form-buttons"
-                    [kcClass]="'kcFormButtonsClass'"
+    <div [kcClass]="'kcFormGroupClass'">
+        <div [kcClass]="'kcLabelWrapperClass'">
+            <label
+                for="password-confirm"
+                [kcClass]="'kcLabelClass'"
+            >
+                {{ i18n.msgStr('passwordConfirm') }}
+            </label>
+        </div>
+        <div [kcClass]="'kcInputWrapperClass'">
+            <kc-password-wrapper passwordInputId="password-confirm">
+                <input
+                    type="password"
+                    id="password-confirm"
+                    name="password-confirm"
+                    autoFocus
+                    autoComplete="new-password"
+                    [kcClass]="'kcInputClass'"
+                    [attr.aria-invalid]="messagesPerField.existsError('password', 'password-confirm')"
+                />
+            </kc-password-wrapper>
+            @if (messagesPerField.existsError('password-confirm')) {
+                <span
+                    id="input-error-password-confirm"
+                    aria-live="polite"
+                    [kcClass]="'kcInputErrorMessageClass'"
+                    [innerHtml]="messagesPerField.get('password-confirm') | kcSanitize: 'html'"
+                ></span>
+            }
+        </div>
+    </div>
+    <div [kcClass]="'kcFormGroupClass'">
+        <kc-logout-other-sessions />
+        <div
+            id="kc-form-buttons"
+            [kcClass]="'kcFormButtonsClass'"
+        >
+            <input
+                type="submit"
+                [kcClass]="{
+                    kcButtonClass: true,
+                    kcButtonPrimaryClass: true,
+                    kcButtonBlockClass: !isAppInitiatedAction,
+                    kcButtonLargeClass: true
+                }"
+                [value]="i18n.msgStr('doSubmit')"
+            />
+            @if (isAppInitiatedAction) {
+                <button
+                    type="submit"
+                    name="cancel-aia"
+                    value="true"
+                    [kcClass]="['kcButtonClass', 'kcButtonDefaultClass', 'kcButtonLargeClass']"
                 >
-                    <input
-                        [kcClass]="{
-                            kcButtonClass: true,
-                            kcButtonPrimaryClass: true,
-                            kcButtonBlockClass: !isAppInitiatedAction,
-                            kcButtonLargeClass: true
-                        }"
-                        type="submit"
-                        [value]="i18n.msgStr('doSubmit')"
-                    />
-                    @if (isAppInitiatedAction) {
-                        <button
-                            [kcClass]="['kcButtonClass', 'kcButtonDefaultClass', 'kcButtonLargeClass']"
-                            type="submit"
-                            name="cancel-aia"
-                            value="true"
-                        >
-                            {{ i18n.msgStr('doCancel') }}
-                        </button>
-                    }
-                </div>
-            </div>
-        </form>
-    </ng-container>
-</kc-login-template>
+                    {{ i18n.msgStr('doCancel') }}
+                </button>
+            }
+        </div>
+    </div>
+</form>