@keycloakify/angular 0.0.1-rc.23 → 0.0.1-rc.24

package/src/login/pages/login-recovery-authn-code-input/login-recovery-authn-code-input.component.html

@@ -6,63 +6,61 @@
     {{ i18n.msgStr('auth-recovery-code-header') }}
 </ng-template>
 
-<ng-container content>
-    <form
-        id="kc-recovery-code-login-form"
-        method="post"
-        [kcClass]="'kcFormClass'"
-        [action]="url.loginAction"
-    >
-        <div [kcClass]="'kcFormGroupClass'">
-            <div [kcClass]="'kcLabelWrapperClass'">
-                <label
-                    for="recoveryCodeInput"
-                    [kcClass]="'kcLabelClass'"
-                >
-                    {{ i18n.msgStr('auth-recovery-code-prompt', recoveryAuthnCodesInputBean.codeNumber.toString()) }}
-                </label>
-            </div>
-            <div [kcClass]="'kcInputWrapperClass'">
-                <input
-                    tabIndex="1"
-                    id="recoveryCodeInput"
-                    name="recoveryCodeInput"
-                    autoComplete="off"
-                    type="text"
-                    autoFocus
-                    [attr.aria-invalid]="messagesPerField.existsError('recoveryCodeInput')"
-                    [kcClass]="'kcInputClass'"
-                />
-                @if (messagesPerField.existsError('recoveryCodeInput')) {
-                    <span
-                        id="input-error"
-                        aria-live="polite"
-                        [kcClass]="'kcInputErrorMessageClass'"
-                        [innerHTML]="messagesPerField.get('recoveryCodeInput') | kcSanitize: 'html'"
-                    ></span>
-                }
-            </div>
+<form
+    id="kc-recovery-code-login-form"
+    method="post"
+    [kcClass]="'kcFormClass'"
+    [action]="url.loginAction"
+>
+    <div [kcClass]="'kcFormGroupClass'">
+        <div [kcClass]="'kcLabelWrapperClass'">
+            <label
+                for="recoveryCodeInput"
+                [kcClass]="'kcLabelClass'"
+            >
+                {{ i18n.msgStr('auth-recovery-code-prompt', recoveryAuthnCodesInputBean.codeNumber.toString()) }}
+            </label>
+        </div>
+        <div [kcClass]="'kcInputWrapperClass'">
+            <input
+                tabIndex="1"
+                id="recoveryCodeInput"
+                name="recoveryCodeInput"
+                autoComplete="off"
+                type="text"
+                autoFocus
+                [attr.aria-invalid]="messagesPerField.existsError('recoveryCodeInput')"
+                [kcClass]="'kcInputClass'"
+            />
+            @if (messagesPerField.existsError('recoveryCodeInput')) {
+                <span
+                    id="input-error"
+                    aria-live="polite"
+                    [kcClass]="'kcInputErrorMessageClass'"
+                    [innerHTML]="messagesPerField.get('recoveryCodeInput') | kcSanitize: 'html'"
+                ></span>
+            }
         </div>
+    </div>
 
-        <div [kcClass]="'kcFormGroupClass'">
-            <div
-                id="kc-form-options"
-                [kcClass]="'kcFormOptionsWrapperClass'"
-            >
-                <div [kcClass]="'kcFormOptionsWrapperClass'"></div>
-            </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 [kcClass]="'kcFormGroupClass'">
+        <div
+            id="kc-form-options"
+            [kcClass]="'kcFormOptionsWrapperClass'"
+        >
+            <div [kcClass]="'kcFormOptionsWrapperClass'"></div>
+        </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>
-    </form>
-</ng-container>
+    </div>
+</form>

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

@@ -4,57 +4,56 @@
 <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) {
+
+<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
-                        type="radio"
-                        name="selectedCredentialId"
-                        [id]="'kc-otp-credential-' + i"
-                        [kcClass]="'kcLoginOTPListInputClass'"
-                        [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
-                                    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-reset-form-submit"
-                            type="submit"
-                            [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
-                            [value]="i18n.msgStr('doSubmit')"
-                        />
-                    </div>
                 </div>
             </div>
         </div>
-    </form>
-</ng-container>
+    </div>
+</form>

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

@@ -7,6 +7,7 @@
     {{ i18n.msgStr('emailForgotTitle') }}
 </ng-template>
 <ng-template #infoNode>
+    @let realm = kcContext.realm;
     @if (realm.duplicateEmailsAllowed) {
         {{ i18n.msgStr('emailInstructionUsername') }}
     } @else {

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

@@ -10,7 +10,7 @@
     [kcClass]="'kcFormClass'"
     [action]="url.loginAction"
 >
-    <kc-user-profile-form-fields />
+    <ng-container [ngComponentOutlet]="userProfileFormFields() ?? null" />
     <div [kcClass]="'kcFormGroupClass'">
         <div
             id="kc-form-options"

package/src/login/pages/login-update-profile/login-update-profile.component.ts

@@ -1,5 +1,5 @@
 import { NgComponentOutlet } from '@angular/common';
-import { ChangeDetectionStrategy, Component, forwardRef, inject, signal, type TemplateRef, viewChild } from '@angular/core';
+import { ChangeDetectionStrategy, Component, forwardRef, inject, input, signal, type TemplateRef, Type, viewChild } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { USE_DEFAULT_CSS } from '@keycloakify/angular/lib/tokens/use-default-css';
 import { ComponentReference } from '@keycloakify/angular/login/classes/component-reference';
@@ -15,7 +15,7 @@ import type { ClassKey } from 'keycloakify/login/lib/kcClsx';
 
 @Component({
     standalone: true,
-    imports: [KcClassDirective, NgComponentOutlet, UserProfileFormFieldsComponent],
+    imports: [KcClassDirective, NgComponentOutlet],
     selector: 'kc-login-update-profile',
     templateUrl: 'login-update-profile.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
@@ -46,6 +46,7 @@ export class LoginUpdateProfileComponent extends ComponentReference {
     socialProvidersNode? = viewChild<TemplateRef<HTMLElement>>('socialProvidersNode');
 
     isFormSubmittable = signal(false);
+    userProfileFormFields = input<Type<UserProfileFormFieldsComponent>>();
 
     constructor() {
         super();

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

@@ -1,5 +1,4 @@
 @let realm = kcContext.realm;
-@let social = kcContext.social;
 @let usernameHidden = kcContext.usernameHidden;
 @let messagesPerField = kcContext.messagesPerField;
 @let url = kcContext.url;
@@ -8,7 +7,8 @@
 <ng-template #headerNode>
     {{ i18n.msgStr('doLogIn') }}
 </ng-template>
-<ng-container infoNode>
+<ng-template #infoNode>
+    @let url = kcContext.url;
     <div id="kc-registration">
         <span>
             {{ i18n.msgStr('noAccount') }}
@@ -20,8 +20,10 @@
             </a>
         </span>
     </div>
-</ng-container>
+</ng-template>
 <ng-template #socialProvidersNode>
+    @let realm = kcContext.realm;
+    @let social = kcContext.social;
     @if (!!realm?.password && !!social?.providers?.length) {
         <div
             id="kc-social-providers"

package/src/login/pages/login-verify-email/login-verify-email.component.html

@@ -1,10 +1,10 @@
-@let url = kcContext.url;
 @let user = kcContext.user;
 
 <ng-template #headerNode>
     {{ i18n.msgStr('emailVerifyTitle') }}
 </ng-template>
 <ng-template #infoNode>
+    @let url = kcContext.url;
     <p class="instruction">
         {{ i18n.msgStr('emailVerifyInstruction2') }}
         <br />

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

@@ -1,4 +1,3 @@
-@let messageHeader = kcContext.messageHeader;
 @let url = kcContext.url;
 @let messagesPerField = kcContext.messagesPerField;
 @let recaptchaRequired = kcContext.recaptchaRequired;
@@ -8,6 +7,7 @@
 @let termsAcceptanceRequired = kcContext.termsAcceptanceRequired;
 
 <ng-template #headerNode>
+    @let messageHeader = kcContext.messageHeader;
     {{ messageHeader ?? i18n.advancedMsgStr('registerTitle') }}
 </ng-template>
 <form
@@ -16,7 +16,7 @@
     [kcClass]="'kcFormClass'"
     [action]="url.registrationAction"
 >
-    <kc-user-profile-form-fields />
+    <ng-container [ngComponentOutlet]="userProfileFormFields() ?? null" />
     @if (termsAcceptanceRequired) {
         <div className="form-group">
             <div [kcClass]="'kcInputWrapperClass'">

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

@@ -1,5 +1,5 @@
 import { AsyncPipe, NgClass, NgComponentOutlet } from '@angular/common';
-import { ChangeDetectionStrategy, Component, forwardRef, inject, signal, type TemplateRef, viewChild } from '@angular/core';
+import { ChangeDetectionStrategy, Component, forwardRef, inject, input, signal, type TemplateRef, Type, viewChild } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { KcSanitizePipe } from '@keycloakify/angular/lib/pipes/kc-sanitize';
 import { USE_DEFAULT_CSS } from '@keycloakify/angular/lib/tokens/use-default-css';
@@ -19,7 +19,7 @@ import type { ClassKey } from 'keycloakify/login/lib/kcClsx';
     templateUrl: './register.component.html',
     standalone: true,
     changeDetection: ChangeDetectionStrategy.OnPush,
-    imports: [KcClassDirective, AsyncPipe, KcSanitizePipe, NgClass, NgComponentOutlet, UserProfileFormFieldsComponent],
+    imports: [KcClassDirective, AsyncPipe, KcSanitizePipe, NgClass, NgComponentOutlet],
     providers: [
         {
             provide: ComponentReference,
@@ -48,6 +48,7 @@ export class RegisterComponent extends ComponentReference {
 
     isFormSubmittable = signal(false);
     areTermsAccepted = signal(false);
+    userProfileFormFields = input<Type<UserProfileFormFieldsComponent>>();
 
     constructor() {
         super();

package/src/login/pages/select-authenticator/select-authenticator.component.html

@@ -4,37 +4,37 @@
 <ng-template #headerNode>
     {{ i18n.msgStr('loginChooseAuthenticator') }}
 </ng-template>
-<ng-container content>
-    <form
-        id="kc-select-credential-form"
-        method="post"
-        [kcClass]="'kcFormClass'"
-        [action]="url.loginAction"
-    >
-        <div [kcClass]="'kcSelectAuthListClass'">
-            @for (authenticationSelection of auth.authenticationSelections; track authenticationSelection; let i = $index) {
-                <button
-                    type="submit"
-                    name="authenticationExecution"
-                    [kcClass]="'kcSelectAuthListItemClass'"
-                    [value]="authenticationSelection.authExecId"
-                >
-                    <div [kcClass]="'kcSelectAuthListItemIconClass'">
-                        <i [kcClass]="['kcSelectAuthListItemIconPropertyClass', $any(authenticationSelection.iconCssClass)]"></i>
-                    </div>
-                    <div [kcClass]="'kcSelectAuthListItemBodyClass'">
-                        <div [kcClass]="'kcSelectAuthListItemHeadingClass'">
-                            {{ i18n.advancedMsgStr(authenticationSelection.displayName) }}
-                        </div>
-                        <div [kcClass]="'kcSelectAuthListItemDescriptionClass'">
-                            {{ i18n.advancedMsgStr(authenticationSelection.helpText) }}
-                        </div>
+
+<form
+    id="kc-select-credential-form"
+    method="post"
+    [kcClass]="'kcFormClass'"
+    [action]="url.loginAction"
+>
+    <div [kcClass]="'kcSelectAuthListClass'">
+        @for (authenticationSelection of auth.authenticationSelections; track authenticationSelection; let i = $index) {
+            <button
+                type="submit"
+                name="authenticationExecution"
+                [kcClass]="'kcSelectAuthListItemClass'"
+                [value]="authenticationSelection.authExecId"
+            >
+                <div [kcClass]="'kcSelectAuthListItemIconClass'">
+                    <i [kcClass]="['kcSelectAuthListItemIconPropertyClass', $any(authenticationSelection.iconCssClass)]"></i>
+                </div>
+                <div [kcClass]="'kcSelectAuthListItemBodyClass'">
+                    <div [kcClass]="'kcSelectAuthListItemHeadingClass'">
+                        {{ i18n.advancedMsgStr(authenticationSelection.displayName) }}
                     </div>
-                    <div [kcClass]="'kcSelectAuthListItemFillClass'"></div>
-                    <div [kcClass]="'kcSelectAuthListItemArrowClass'">
-                        <i [kcClass]="'kcSelectAuthListItemArrowIconClass'"></i>
+                    <div [kcClass]="'kcSelectAuthListItemDescriptionClass'">
+                        {{ i18n.advancedMsgStr(authenticationSelection.helpText) }}
                     </div>
-                </button>
-            }
-        </div></form
-></ng-container>
+                </div>
+                <div [kcClass]="'kcSelectAuthListItemFillClass'"></div>
+                <div [kcClass]="'kcSelectAuthListItemArrowClass'">
+                    <i [kcClass]="'kcSelectAuthListItemArrowIconClass'"></i>
+                </div>
+            </button>
+        }
+    </div>
+</form>

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

@@ -10,7 +10,7 @@
     [kcClass]="'kcFormClass'"
     [action]="url.loginAction"
 >
-    <kc-user-profile-form-fields />
+    <ng-container [ngComponentOutlet]="userProfileFormFields() ?? null" />
     <div [kcClass]="'kcFormGroupClass'">
         <div
             id="kc-form-options"

package/src/login/pages/update-email/update-email.component.ts

@@ -1,5 +1,5 @@
 import { NgComponentOutlet } from '@angular/common';
-import { ChangeDetectionStrategy, Component, forwardRef, inject, signal, type TemplateRef, viewChild } from '@angular/core';
+import { ChangeDetectionStrategy, Component, forwardRef, inject, input, signal, type TemplateRef, Type, viewChild } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { ComponentReference } from '@keycloakify/angular/login/classes/component-reference';
 import { LogoutOtherSessionsComponent } from '@keycloakify/angular/login/components/logout-other-sessions';
@@ -13,7 +13,7 @@ import { KC_LOGIN_CONTEXT } from '@keycloakify/angular/login/tokens/kc-context';
 
 @Component({
     standalone: true,
-    imports: [KcClassDirective, NgComponentOutlet, LogoutOtherSessionsComponent, UserProfileFormFieldsComponent],
+    imports: [KcClassDirective, NgComponentOutlet, LogoutOtherSessionsComponent],
     selector: 'kc-update-email',
     templateUrl: 'update-email.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
@@ -40,6 +40,7 @@ export class UpdateEmailComponent extends ComponentReference {
     infoNode? = viewChild<TemplateRef<HTMLElement>>('infoNode');
     socialProvidersNode? = viewChild<TemplateRef<HTMLElement>>('socialProvidersNode');
 
+    userProfileFormFields = input<Type<UserProfileFormFieldsComponent>>();
     isFormSubmittable = signal(false);
 
     constructor() {

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

@@ -6,6 +6,7 @@
     {{ i18n.msgStr('webauthn-login-title') }}
 </ng-template>
 <ng-template #infoNode>
+    @let url = kcContext.url;
     <div id="kc-registration">
         <span>
             {{ i18n.msgStr('noAccount') }}