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

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

@@ -6,207 +6,197 @@
 @let url = kcContext.url;
 @let login = kcContext.login;
 
-<kc-login-template
-    [displayInfo]="displayInfo"
-    [bodyClassName]="bodyClassName()"
-    [displayMessage]="displayMessage"
-    [displayRequiredFields]="displayRequiredFields()"
-    [documentTitle]="documentTitle()"
->
-    <ng-container headerNode>
-        {{ i18n.msgStr('loginAccountTitle') }}
-    </ng-container>
-    <ng-container infoNode>
-        <div id="kc-registration-container">
-            <div id="kc-registration">
-                <span>
-                    {{ i18n.msgStr('noAccount') }}
-                    <a
-                        tabindex="8"
-                        [href]="url?.registrationUrl"
-                    >
-                        {{ i18n.msgStr('doRegister') }}
-                    </a>
-                </span>
-            </div>
+<ng-template #headerNode>
+    {{ i18n.msgStr('loginAccountTitle') }}
+</ng-template>
+<ng-template #infoNode>
+    <div id="kc-registration-container">
+        <div id="kc-registration">
+            <span>
+                {{ i18n.msgStr('noAccount') }}
+                <a
+                    tabindex="8"
+                    [href]="url?.registrationUrl"
+                >
+                    {{ i18n.msgStr('doRegister') }}
+                </a>
+            </span>
         </div>
-    </ng-container>
-    <ng-container socialProvidersNode>
-        @if (!!realm?.password && !!social?.providers?.length) {
-            <div
-                id="kc-social-providers"
-                [kcClass]="'kcFormSocialAccountSectionClass'"
+    </div>
+</ng-template>
+<ng-template #socialProvidersNode>
+    @if (!!realm?.password && !!social?.providers?.length) {
+        <div
+            id="kc-social-providers"
+            [kcClass]="'kcFormSocialAccountSectionClass'"
+        >
+            <hr />
+            <h2>{{ i18n.msgStr('identity-provider-login-label') }}</h2>
+            <ul
+                [kcClass]="{
+                    kcFormSocialAccountListClass: true,
+                    kcFormSocialAccountListGridClass: (social?.providers?.length ?? 0) > 3
+                }"
             >
-                <hr />
-                <h2>{{ i18n.msgStr('identity-provider-login-label') }}</h2>
-                <ul
-                    [kcClass]="{
-                        kcFormSocialAccountListClass: true,
-                        kcFormSocialAccountListGridClass: (social?.providers?.length ?? 0) > 3
-                    }"
-                >
-                    @for (provider of social?.providers; track provider.alias; let idx = $index) {
-                        <li>
-                            <a
-                                [id]="provider.alias"
-                                [kcClass]="{
-                                    kcFormSocialAccountListButtonClass: true,
-                                    kcFormSocialAccountGridItem: (social?.providers?.length ?? 0) > 3
+                @for (provider of social?.providers; track provider.alias; let idx = $index) {
+                    <li>
+                        <a
+                            type="button"
+                            [id]="provider.alias"
+                            [kcClass]="{
+                                kcFormSocialAccountListButtonClass: true,
+                                kcFormSocialAccountGridItem: (social?.providers?.length ?? 0) > 3
+                            }"
+                            [href]="provider.loginUrl"
+                        >
+                            @if (provider.iconClasses) {
+                                <i
+                                    aria-hidden="true"
+                                    [ngClass]="provider.iconClasses"
+                                    [kcClass]="'kcCommonLogoIdP'"
+                                ></i>
+                            }
+                            <span
+                                [ngClass]="{
+                                    'kc-social-icon-text': provider.iconClasses
                                 }"
-                                type="button"
-                                [href]="provider.loginUrl"
+                                [kcClass]="'kcFormSocialAccountNameClass'"
+                                [innerHTML]="provider.displayName | kcSanitize: 'html'"
+                            ></span>
+                        </a>
+                    </li>
+                }
+            </ul>
+        </div>
+    }
+</ng-template>
+<div id="kc-form">
+    <div id="kc-form-wrapper">
+        <!-- login.component.html -->
+        @if (realm?.password) {
+            <form
+                id="kc-form-login"
+                method="post"
+                [action]="url?.loginAction"
+                (onSubmit)="isLoginButtonDisabled.set(true)"
+            >
+                @if (!usernameHidden) {
+                    <div [kcClass]="'kcFormGroupClass'">
+                        <label
+                            for="username"
+                            [kcClass]="'kcLabelClass'"
+                        >
+                            @if (!realm?.loginWithEmailAllowed) {
+                                {{ i18n.msgStr('username') }}
+                            } @else if (!realm?.registrationEmailAsUsername) {
+                                {{ i18n.msgStr('usernameOrEmail') }}
+                            } @else {
+                                {{ i18n.msgStr('email') }}
+                            }
+                        </label>
+                        <input
+                            tabindex="2"
+                            id="username"
+                            name="username"
+                            type="text"
+                            autofocus
+                            [kcClass]="'kcInputClass'"
+                            [defaultValue]="login?.username || ''"
+                            [attr.aria-invalid]="messagesPerField?.existsError('username', 'password')"
+                        />
+                        @if (messagesPerField?.existsError('username', 'password')) {
+                            <span
+                                id="input-error"
+                                aria-live="polite"
+                                [kcClass]="'kcInputErrorMessageClass'"
+                                [innerHTML]="messagesPerField.getFirstError('username', 'password') | kcSanitize: 'html'"
                             >
-                                @if (provider.iconClasses) {
-                                    <i
-                                        [ngClass]="provider.iconClasses"
-                                        [kcClass]="'kcCommonLogoIdP'"
-                                        aria-hidden="true"
-                                    ></i>
-                                }
-                                <span
-                                    [ngClass]="{
-                                        'kc-social-icon-text': provider.iconClasses
-                                    }"
-                                    [kcClass]="'kcFormSocialAccountNameClass'"
-                                    [innerHTML]="provider.displayName | kcSanitize: 'html'"
-                                ></span>
-                            </a>
-                        </li>
-                    }
-                </ul>
-            </div>
-        }
-    </ng-container>
-    <ng-container content>
-        <div id="kc-form">
-            <div id="kc-form-wrapper">
-                <!-- login.component.html -->
-                @if (realm?.password) {
-                    <form
-                        id="kc-form-login"
-                        (onSubmit)="isLoginButtonDisabled.set(true)"
-                        [action]="url?.loginAction"
-                        method="post"
-                    >
-                        @if (!usernameHidden) {
-                            <div [kcClass]="'kcFormGroupClass'">
-                                <label
-                                    for="username"
-                                    [kcClass]="'kcLabelClass'"
-                                >
-                                    @if (!realm?.loginWithEmailAllowed) {
-                                        {{ i18n.msgStr('username') }}
-                                    } @else if (!realm?.registrationEmailAsUsername) {
-                                        {{ i18n.msgStr('usernameOrEmail') }}
-                                    } @else {
-                                        {{ i18n.msgStr('email') }}
-                                    }
-                                </label>
-                                <input
-                                    tabindex="2"
-                                    id="username"
-                                    [kcClass]="'kcInputClass'"
-                                    name="username"
-                                    type="text"
-                                    autofocus
-                                    [defaultValue]="login?.username || ''"
-                                    [attr.aria-invalid]="messagesPerField?.existsError('username', 'password')"
-                                />
-                                @if (messagesPerField?.existsError('username', 'password')) {
-                                    <span
-                                        id="input-error"
-                                        [kcClass]="'kcInputErrorMessageClass'"
-                                        aria-live="polite"
-                                        [innerHTML]="messagesPerField.getFirstError('username', 'password') | kcSanitize: 'html'"
-                                    >
-                                    </span>
-                                }
-                            </div>
+                            </span>
                         }
+                    </div>
+                }
 
-                        <div [kcClass]="'kcFormGroupClass'">
-                            <label
-                                for="password"
-                                [kcClass]="'kcLabelClass'"
-                            >
-                                {{ i18n.msgStr('password') }}
-                            </label>
+                <div [kcClass]="'kcFormGroupClass'">
+                    <label
+                        for="password"
+                        [kcClass]="'kcLabelClass'"
+                    >
+                        {{ i18n.msgStr('password') }}
+                    </label>
 
-                            <kc-password-wrapper passwordInputId="password">
-                                <input
-                                    tabindex="3"
-                                    id="password"
-                                    [kcClass]="'kcInputClass'"
-                                    name="password"
-                                    type="password"
-                                    autocomplete="off"
-                                    [attr.aria-invalid]="messagesPerField.existsError('username', 'password')"
-                                />
-                            </kc-password-wrapper>
-                            @if (usernameHidden && messagesPerField?.existsError('username', 'password')) {
-                                <span
-                                    id="input-error"
-                                    [kcClass]="'kcInputErrorMessageClass'"
-                                    aria-live="polite"
-                                    [innerHTML]="messagesPerField.getFirstError('username', 'password') | kcSanitize: 'html'"
-                                >
-                                </span>
-                            }
-                        </div>
+                    <kc-password-wrapper passwordInputId="password">
+                        <input
+                            tabindex="3"
+                            id="password"
+                            name="password"
+                            type="password"
+                            autocomplete="off"
+                            [kcClass]="'kcInputClass'"
+                            [attr.aria-invalid]="messagesPerField.existsError('username', 'password')"
+                        />
+                    </kc-password-wrapper>
+                    @if (usernameHidden && messagesPerField?.existsError('username', 'password')) {
+                        <span
+                            id="input-error"
+                            aria-live="polite"
+                            [kcClass]="'kcInputErrorMessageClass'"
+                            [innerHTML]="messagesPerField.getFirstError('username', 'password') | kcSanitize: 'html'"
+                        >
+                        </span>
+                    }
+                </div>
 
-                        <div [kcClass]="['kcFormGroupClass', 'kcFormSettingClass']">
-                            <div id="kc-form-options">
-                                @if (realm?.rememberMe && !usernameHidden) {
-                                    <div class="checkbox">
-                                        <label>
-                                            <input
-                                                tabindex="5"
-                                                id="rememberMe"
-                                                name="rememberMe"
-                                                type="checkbox"
-                                                [defaultChecked]="!!login?.rememberMe"
-                                            />
-                                            {{ i18n.msgStr('rememberMe') }}
-                                        </label>
-                                    </div>
-                                }
+                <div [kcClass]="['kcFormGroupClass', 'kcFormSettingClass']">
+                    <div id="kc-form-options">
+                        @if (realm?.rememberMe && !usernameHidden) {
+                            <div class="checkbox">
+                                <label>
+                                    <input
+                                        tabindex="5"
+                                        id="rememberMe"
+                                        name="rememberMe"
+                                        type="checkbox"
+                                        [defaultChecked]="!!login?.rememberMe"
+                                    />
+                                    {{ i18n.msgStr('rememberMe') }}
+                                </label>
                             </div>
+                        }
+                    </div>
 
-                            <div [kcClass]="'kcFormOptionsWrapperClass'">
-                                @if (realm?.resetPasswordAllowed) {
-                                    <span>
-                                        <a
-                                            tabindex="6"
-                                            [href]="url?.loginResetCredentialsUrl"
-                                            >{{ i18n.msgStr('doForgotPassword') }}</a
-                                        >
-                                    </span>
-                                }
-                            </div>
-                        </div>
-                        <div
-                            id="kc-form-buttons"
-                            [kcClass]="'kcFormGroupClass'"
-                        >
-                            <input
-                                type="hidden"
-                                id="id-hidden-input"
-                                name="credentialId"
-                                [value]="auth?.selectedCredential"
-                            />
-                            <input
-                                tabindex="7"
-                                [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
-                                name="login"
-                                id="kc-login"
-                                type="submit"
-                                [value]="i18n.msgStr('doLogIn')"
-                                [disabled]="isLoginButtonDisabled()"
-                            />
-                        </div>
-                    </form>
-                }
-            </div>
-        </div>
-    </ng-container>
-</kc-login-template>
+                    <div [kcClass]="'kcFormOptionsWrapperClass'">
+                        @if (realm?.resetPasswordAllowed) {
+                            <span>
+                                <a
+                                    tabindex="6"
+                                    [href]="url?.loginResetCredentialsUrl"
+                                    >{{ i18n.msgStr('doForgotPassword') }}</a
+                                >
+                            </span>
+                        }
+                    </div>
+                </div>
+                <div
+                    id="kc-form-buttons"
+                    [kcClass]="'kcFormGroupClass'"
+                >
+                    <input
+                        type="hidden"
+                        id="id-hidden-input"
+                        name="credentialId"
+                        [value]="auth?.selectedCredential"
+                    />
+                    <input
+                        tabindex="7"
+                        name="login"
+                        id="kc-login"
+                        type="submit"
+                        [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
+                        [value]="i18n.msgStr('doLogIn')"
+                        [disabled]="isLoginButtonDisabled()"
+                    />
+                </div>
+            </form>
+        }
+    </div>
+</div>

package/src/login/pages/login/login.component.ts

@@ -1,24 +1,24 @@
-import { AsyncPipe, NgClass } from '@angular/common';
-import { ChangeDetectionStrategy, Component, forwardRef, inject, input, signal } from '@angular/core';
+import { AsyncPipe, CommonModule, NgClass } from '@angular/common';
+import { ChangeDetectionStrategy, Component, forwardRef, inject, signal, 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 { PasswordWrapperComponent } from '@keycloakify/angular/login/components/password-wrapper';
 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({
-    selector: 'kc-root',
+    selector: 'kc-login',
     templateUrl: './login.component.html',
     standalone: true,
     changeDetection: ChangeDetectionStrategy.OnPush,
-    imports: [KcClassDirective, AsyncPipe, KcSanitizePipe, PasswordWrapperComponent, NgClass, TemplateComponent],
+    imports: [KcClassDirective, AsyncPipe, KcSanitizePipe, PasswordWrapperComponent, NgClass, TemplateComponent, CommonModule],
     providers: [
         {
             provide: ComponentReference,
@@ -28,13 +28,21 @@ import type { KcContext } from '../../KcContext';
 })
 export class LoginComponent extends ComponentReference {
     kcContext = inject<Extract<KcContext, { pageId: 'login.ftl' }>>(KC_LOGIN_CONTEXT);
-    displayRequiredFields = input(false);
-    documentTitle = input<string>();
-    bodyClassName = input<string>();
     i18n = inject<I18n>(LOGIN_I18N);
+
     override doUseDefaultCss = inject<boolean>(USE_DEFAULT_CSS);
     override classes = inject<Partial<Record<ClassKey, string>>>(LOGIN_CLASSES);
+
+    documentTitle: string | undefined;
+    bodyClassName: string | undefined;
+
+    displayRequiredFields = false;
+    displayInfo = !!this.kcContext?.realm?.password && !!this.kcContext?.realm?.registrationAllowed && !this.kcContext?.registrationDisabled;
+    displayMessage = !this.kcContext?.messagesPerField?.existsError('username', 'password');
+
+    headerNode? = viewChild<TemplateRef<HTMLElement>>('headerNode');
+    infoNode? = viewChild<TemplateRef<HTMLElement>>('infoNode');
+    socialProvidersNode? = viewChild<TemplateRef<HTMLElement>>('socialProvidersNode');
+
     isLoginButtonDisabled = signal(false);
-    displayInfo: boolean = !!this.kcContext?.realm?.password && !!this.kcContext?.realm?.registrationAllowed && !this.kcContext?.registrationDisabled;
-    displayMessage: boolean = !this.kcContext?.messagesPerField?.existsError('username', 'password');
 }