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

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

@@ -1,103 +1,94 @@
 @let url = kcContext.url;
 @let otpLogin = kcContext.otpLogin;
 @let messagesPerField = kcContext.messagesPerField;
-<kc-login-template
-    [displayInfo]="displayInfo"
-    [bodyClassName]="bodyClassName()"
-    [displayMessage]="displayMessage"
-    [displayRequiredFields]="displayRequiredFields()"
-    [documentTitle]="documentTitle()"
+
+<ng-template #headerNode>
+    {{ i18n.msgStr('doLogIn') }}
+</ng-template>
+<form
+    id="kc-otp-login-form"
+    method="post"
+    [kcClass]="['kcFormClass']"
+    [action]="url.loginAction"
 >
-    <ng-container headerNode>
-        {{ i18n.msgStr('doLogIn') }}
-    </ng-container>
-    <ng-container content>
-        <form
-            id="kc-otp-login-form"
-            method="post"
-            [kcClass]="['kcFormClass']"
-            [action]="url.loginAction"
-        >
-            @if (otpLogin.userOtpCredentials.length > 1) {
-                <div [kcClass]="'kcFormGroupClass'">
-                    <div [kcClass]="'kcInputWrapperClass'">
-                        @for (otpCredential of otpLogin.userOtpCredentials; track otpCredential; let i = $index) {
-                            <ng-container>
-                                <input
-                                    type="radio"
-                                    name="selectedCredentialId"
-                                    [id]="'kc-otp-credential-' + i"
-                                    [kcClass]="'kcLoginOTPListClass'"
-                                    [value]="otpCredential.id"
-                                    [checked]="otpCredential.id === otpLogin.selectedCredentialId"
-                                />
-                                <label
-                                    [for]="'kc-otp-credential-' + i"
-                                    [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>
-                            </ng-container>
-                        }
-                    </div>
-                </div>
-            }
-            <div [kcClass]="'kcFormGroupClass'">
-                <div [kcClass]="'kcLabelWrapperClass'">
-                    <label
-                        for="otp"
-                        [kcClass]="'kcLabelClass'"
-                    >
-                        {{ i18n.msgStr('loginOtpOneTime') }}
-                    </label>
-                </div>
-                <div [kcClass]="'kcInputWrapperClass'">
-                    <input
-                        id="otp"
-                        name="otp"
-                        autoComplete="off"
-                        type="text"
-                        autoFocus
-                        [kcClass]="'kcInputClass'"
-                        [attr.aria-invalid]="messagesPerField.existsError('totp')"
-                    />
-                    @if (messagesPerField.existsError('totp')) {
-                        <span
-                            id="input-error-otp-code"
-                            aria-live="polite"
-                            [kcClass]="['kcInputErrorMessageClass']"
-                            [innerHTML]="messagesPerField.get('totp') | kcSanitize: 'html'"
-                        ></span>
-                    }
-                </div>
-            </div>
-            <div [kcClass]="'kcFormGroupClass'">
-                <div
-                    id="kc-form-options"
-                    [kcClass]="'kcFormOptionsClass'"
-                ></div>
-                <div
-                    id="kc-form-buttons"
-                    [kcClass]="'kcFormButtonsClass'"
-                >
-                    <input
-                        name="login"
-                        id="kc-login"
-                        type="submit"
-                        [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
-                        [value]="i18n.msgStr('doLogIn')"
-                    />
-                </div>
+    @if (otpLogin.userOtpCredentials.length > 1) {
+        <div [kcClass]="'kcFormGroupClass'">
+            <div [kcClass]="'kcInputWrapperClass'">
+                @for (otpCredential of otpLogin.userOtpCredentials; track otpCredential; let i = $index) {
+                    <ng-container>
+                        <input
+                            type="radio"
+                            name="selectedCredentialId"
+                            [id]="'kc-otp-credential-' + i"
+                            [kcClass]="'kcLoginOTPListClass'"
+                            [value]="otpCredential.id"
+                            [checked]="otpCredential.id === otpLogin.selectedCredentialId"
+                        />
+                        <label
+                            [for]="'kc-otp-credential-' + i"
+                            [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>
+                    </ng-container>
+                }
             </div>
-        </form>
-    </ng-container>
-</kc-login-template>
+        </div>
+    }
+    <div [kcClass]="'kcFormGroupClass'">
+        <div [kcClass]="'kcLabelWrapperClass'">
+            <label
+                for="otp"
+                [kcClass]="'kcLabelClass'"
+            >
+                {{ i18n.msgStr('loginOtpOneTime') }}
+            </label>
+        </div>
+        <div [kcClass]="'kcInputWrapperClass'">
+            <input
+                id="otp"
+                name="otp"
+                autoComplete="off"
+                type="text"
+                autoFocus
+                [kcClass]="'kcInputClass'"
+                [attr.aria-invalid]="messagesPerField.existsError('totp')"
+            />
+            @if (messagesPerField.existsError('totp')) {
+                <span
+                    id="input-error-otp-code"
+                    aria-live="polite"
+                    [kcClass]="['kcInputErrorMessageClass']"
+                    [innerHTML]="messagesPerField.get('totp') | kcSanitize: 'html'"
+                ></span>
+            }
+        </div>
+    </div>
+    <div [kcClass]="'kcFormGroupClass'">
+        <div
+            id="kc-form-options"
+            [kcClass]="'kcFormOptionsClass'"
+        ></div>
+        <div
+            id="kc-form-buttons"
+            [kcClass]="'kcFormButtonsClass'"
+        >
+            <input
+                name="login"
+                id="kc-login"
+                type="submit"
+                [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
+                [value]="i18n.msgStr('doLogIn')"
+            />
+        </div>
+    </div>
+</form>

package/src/login/pages/login-otp/login-otp.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-otp',
     templateUrl: 'login-otp.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
     providers: [
@@ -27,11 +27,18 @@ import type { KcContext } from '../../KcContext';
 export class LoginOtpComponent extends ComponentReference {
     kcContext = inject<Extract<KcContext, { pageId: 'login-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 = false;
     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-page-expired/login-page-expired.component.html

@@ -1,35 +1,28 @@
 @let url = kcContext.url;
-<kc-login-template
-    [displayInfo]="displayInfo"
-    [bodyClassName]="bodyClassName()"
-    [displayMessage]="displayMessage"
-    [displayRequiredFields]="displayRequiredFields()"
-    [documentTitle]="documentTitle()"
->
-    <ng-container headerNode>
-        {{ i18n.msgStr('pageExpiredTitle') }}
-    </ng-container>
-    <ng-container content>
-        <p
-            id="instruction1"
-            class="instruction"
+
+<ng-container #headerNode>
+    {{ i18n.msgStr('pageExpiredTitle') }}
+</ng-container>
+<ng-container content>
+    <p
+        id="instruction1"
+        class="instruction"
+    >
+        {{ i18n.msgStr('pageExpiredMsg1') }}
+        <a
+            id="loginRestartLink"
+            [href]="url.loginRestartFlowUrl"
         >
-            {{ i18n.msgStr('pageExpiredMsg1') }}
-            <a
-                id="loginRestartLink"
-                [href]="url.loginRestartFlowUrl"
-            >
-                {{ i18n.msgStr('doClickHere') }}
-            </a>
-            .<br />
-            {{ i18n.msgStr('pageExpiredMsg2') }}
-            <a
-                id="loginContinueLink"
-                [href]="url.loginAction"
-            >
-                {{ i18n.msgStr('doClickHere') }}
-            </a>
-            .
-        </p>
-    </ng-container>
-</kc-login-template>
+            {{ i18n.msgStr('doClickHere') }}
+        </a>
+        .<br />
+        {{ i18n.msgStr('pageExpiredMsg2') }}
+        <a
+            id="loginContinueLink"
+            [href]="url.loginAction"
+        >
+            {{ i18n.msgStr('doClickHere') }}
+        </a>
+        .
+    </p>
+</ng-container>

package/src/login/pages/login-page-expired/login-page-expired.component.ts

@@ -1,18 +1,18 @@
-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 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],
-    selector: 'kc-root',
+    selector: 'kc-login-page-expired',
     templateUrl: 'login-page-expired.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
     providers: [
@@ -27,9 +27,15 @@ export class LoginPageExpiredComponent extends ComponentReference {
     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 = false;
+
+    documentTitle: string | undefined;
+    bodyClassName: string | undefined;
+
+    displayRequiredFields = false;
+    displayInfo = false;
+    displayMessage = false;
+
+    headerNode? = viewChild<TemplateRef<HTMLElement>>('headerNode');
+    infoNode? = viewChild<TemplateRef<HTMLElement>>('infoNode');
+    socialProvidersNode? = viewChild<TemplateRef<HTMLElement>>('socialProvidersNode');
 }