@keycloakify/angular 0.0.1-rc.0 → 0.0.1-rc.11

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

@@ -3,114 +3,114 @@
 @let isAppInitiatedAction = kcContext.isAppInitiatedAction;
 
 <kc-login-template
-  [displayInfo]="displayInfo"
-  [bodyClassName]="bodyClassName()"
-  [displayMessage]="displayMessage"
-  [displayRequiredFields]="displayRequiredFields()"
-  [documentTitle]="documentTitle()"
+    [displayInfo]="displayInfo"
+    [bodyClassName]="bodyClassName()"
+    [displayMessage]="displayMessage"
+    [displayRequiredFields]="displayRequiredFields()"
+    [documentTitle]="documentTitle()"
 >
-  <ng-container headerNode>
-    {{ 'updatePasswordTitle' | msgStr }}
-  </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'"
-          >
-            {{ 'passwordNew' | msgStr }}
-          </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>
+    <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>
 
-          @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"
+                            [kcClass]="'kcInputErrorMessageClass'"
+                            aria-live="polite"
+                            [innerHtml]="messagesPerField.get('password') | kcSanitize: 'html'"
+                        ></span>
+                    }
+                </div>
+            </div>
 
-      <div [kcClass]="'kcFormGroupClass'">
-        <div [kcClass]="'kcLabelWrapperClass'">
-          <label
-            for="password-confirm"
-            [kcClass]="'kcLabelClass'"
-          >
-            {{ 'passwordConfirm' | msgStr }}
-          </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'"
-        >
-          <input
-            [kcClass]="{
-              kcButtonClass: true,
-              kcButtonPrimaryClass: true,
-              kcButtonBlockClass: !isAppInitiatedAction,
-              kcButtonLargeClass: true,
-            }"
-            type="submit"
-            value="{{ 'doSubmit' | msgStr }}"
-          />
-          @if (isAppInitiatedAction) {
-            <button
-              [kcClass]="['kcButtonClass', 'kcButtonDefaultClass', 'kcButtonLargeClass']"
-              type="submit"
-              name="cancel-aia"
-              value="true"
-            >
-              {{ 'doCancel' | msgStr }}
-            </button>
-          }
-        </div>
-      </div>
-    </form>
-  </ng-container>
+            <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'"
+                >
+                    <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>

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

@@ -1,37 +1,23 @@
-import {
-    ChangeDetectionStrategy,
-    Component,
-    forwardRef,
-    inject,
-    input
-} from "@angular/core";
-import {
-    CLASSES,
-    KC_CONTEXT,
-    USE_DEFAULT_CSS
-} from "@keycloakify/angular/lib/public-api";
-import { ClassKey } from "keycloakify/login/lib/kcClsx";
-import { KcContext } from "keycloakify/login/KcContext";
-import { ComponentReference } from "@keycloakify/angular/login/classes/component-reference.class";
-import { LogoutOtherSessionsComponent } from "@keycloakify/angular/login/components/logout-other-sessions/logout-other-sessions.component";
-import { PasswordWrapperComponent } from "@keycloakify/angular/login/components/password-wrapper/password-wrapper.component";
-import { TemplateComponent } from "@keycloakify/angular/login/containers/template.component";
-import { KcClassDirective } from "@keycloakify/angular/login/directives";
-import { KcSanitizePipe } from "@keycloakify/angular/login/pipes/kc-sanitize.pipe";
-import { MsgStrPipe } from "@keycloakify/angular/login/pipes/msg-str.pipe";
+import { ChangeDetectionStrategy, Component, forwardRef, inject, input } from '@angular/core';
+import { USE_DEFAULT_CSS } from '@keycloakify/angular/lib/tokens/use-default-css.token';
+import { ComponentReference } from '@keycloakify/angular/login/classes/component-reference.class';
+import { LogoutOtherSessionsComponent } from '@keycloakify/angular/login/components/logout-other-sessions/logout-other-sessions.component';
+import { PasswordWrapperComponent } from '@keycloakify/angular/login/components/password-wrapper/password-wrapper.component';
+import { TemplateComponent } from '@keycloakify/angular/login/containers/template.component';
+import { KcClassDirective } from '@keycloakify/angular/login/directives/kc-class.directive';
+import { KcSanitizePipe } from '@keycloakify/angular/lib/pipes/kc-sanitize.pipe';
+import { LOGIN_CLASSES } from '@keycloakify/angular/login/tokens/classes.token';
+import { LOGIN_I18N } from '@keycloakify/angular/login/tokens/i18n.token';
+import { KC_LOGIN_CONTEXT } from '@keycloakify/angular/login/tokens/kc-context.token';
+import { type ClassKey } from 'keycloakify/login/lib/kcClsx';
+import { type I18n } from '../../i18n';
+import { type KcContext } from '../../KcContext';
 
 @Component({
     standalone: true,
-    imports: [
-        TemplateComponent,
-        MsgStrPipe,
-        KcClassDirective,
-        PasswordWrapperComponent,
-        KcSanitizePipe,
-        LogoutOtherSessionsComponent
-    ],
-    selector: "kc-root",
-    templateUrl: "login-update-password.component.html",
+    imports: [TemplateComponent, KcClassDirective, PasswordWrapperComponent, KcSanitizePipe, LogoutOtherSessionsComponent],
+    selector: 'kc-root',
+    templateUrl: 'login-update-password.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
     providers: [
         {
@@ -41,16 +27,13 @@ import { MsgStrPipe } from "@keycloakify/angular/login/pipes/msg-str.pipe";
     ]
 })
 export class LoginUpdatePasswordComponent extends ComponentReference {
-    kcContext =
-        inject<Extract<KcContext, { pageId: "login-update-password.ftl" }>>(KC_CONTEXT);
+    kcContext = inject<Extract<KcContext, { pageId: 'login-update-password.ftl' }>>(KC_LOGIN_CONTEXT);
+    i18n = inject<I18n>(LOGIN_I18N);
     override doUseDefaultCss = inject<boolean>(USE_DEFAULT_CSS);
-    override classes = inject<Partial<Record<ClassKey, string>>>(CLASSES);
+    override classes = inject<Partial<Record<ClassKey, string>>>(LOGIN_CLASSES);
     displayRequiredFields = input(false);
     documentTitle = input<string>();
     bodyClassName = input<string>();
     displayInfo = false;
-    displayMessage = !this.kcContext.messagesPerField.existsError(
-        "password",
-        "password-confirm"
-    );
+    displayMessage = !this.kcContext.messagesPerField.existsError('password', 'password-confirm');
 }

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

@@ -1,59 +1,58 @@
 @let url = kcContext.url;
 @let isAppInitiatedAction = kcContext.isAppInitiatedAction;
 <kc-login-template
-  [displayInfo]="displayInfo"
-  [bodyClassName]="bodyClassName()"
-  [displayMessage]="displayMessage"
-  [displayRequiredFields]="displayRequiredFields()"
-  [documentTitle]="documentTitle()"
+    [displayInfo]="displayInfo"
+    [bodyClassName]="bodyClassName()"
+    [displayMessage]="displayMessage"
+    [displayRequiredFields]="displayRequiredFields()"
+    [documentTitle]="documentTitle()"
 >
-  <ng-container headerNode>
-    {{ 'loginProfileTitle' | msgStr }}
-  </ng-container>
-  <ng-container content>
-    <form
-      id="kc-update-profile-form"
-      [kcClass]="'kcFormClass'"
-      [action]="url.loginAction"
-      method="post"
-    >
-      <kc-user-profile-form-fields (onIsFormSubmittable)="isFormSubmittable.set($event)"></kc-user-profile-form-fields>
-
-      <div [kcClass]="'kcFormGroupClass'">
-        <div
-          id="kc-form-options"
-          [kcClass]="'kcFormOptionsClass'"
+    <ng-container headerNode>
+        {{ i18n.msgStr('loginProfileTitle') }}
+    </ng-container>
+    <ng-container content>
+        <form
+            id="kc-update-profile-form"
+            [kcClass]="'kcFormClass'"
+            [action]="url.loginAction"
+            method="post"
         >
-          <div [kcClass]="'kcFormOptionsWrapperClass'"></div>
-        </div>
-        <div
-          id="kc-form-buttons"
-          [kcClass]="'kcFormButtonsClass'"
-        >
-          <input
-            [disabled]="!isFormSubmittable"
-            [kcClass]="{
-              kcButtonClass: true,
-              kcButtonPrimaryClass: true,
-              kcButtonBlockClass: !isAppInitiatedAction,
-              kcButtonLargeClass: true,
-            }"
-            type="submit"
-            value="{{ 'doSubmit' | msgStr }}"
-          />
-          @if (isAppInitiatedAction) {
-            <button
-              [kcClass]="['kcButtonClass', 'kcButtonDefaultClass', 'kcButtonLargeClass']"
-              type="submit"
-              name="cancel-aia"
-              value="true"
-              formNoValidate
-            >
-              {{ 'doCancel' | msgStr }}
-            </button>
-          }
-        </div>
-      </div>
-    </form>
-  </ng-container>
+            <ng-container [ngComponentOutlet]="userProfileFormFields() ?? null"></ng-container>
+            <div [kcClass]="'kcFormGroupClass'">
+                <div
+                    id="kc-form-options"
+                    [kcClass]="'kcFormOptionsClass'"
+                >
+                    <div [kcClass]="'kcFormOptionsWrapperClass'"></div>
+                </div>
+                <div
+                    id="kc-form-buttons"
+                    [kcClass]="'kcFormButtonsClass'"
+                >
+                    <input
+                        [disabled]="!isFormSubmittable()"
+                        [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"
+                            formNoValidate
+                        >
+                            {{ i18n.msgStr('doCancel') }}
+                        </button>
+                    }
+                </div>
+            </div>
+        </form>
+    </ng-container>
 </kc-login-template>

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

@@ -1,34 +1,24 @@
-import {
-    ChangeDetectionStrategy,
-    Component,
-    forwardRef,
-    inject,
-    input,
-    signal
-} from "@angular/core";
-import {
-    CLASSES,
-    KC_CONTEXT,
-    USE_DEFAULT_CSS
-} from "@keycloakify/angular/lib/public-api";
-import { ClassKey } from "keycloakify/login/lib/kcClsx";
-import { KcContext } from "keycloakify/login/KcContext";
-import { ComponentReference } from "@keycloakify/angular/login/classes/component-reference.class";
-import { UserProfileFormFieldsComponent } from "@keycloakify/angular/login/components/user-profile-form-fields/user-profile-form-fields.component";
-import { TemplateComponent } from "@keycloakify/angular/login/containers/template.component";
-import { KcClassDirective } from "@keycloakify/angular/login/directives";
-import { MsgStrPipe } from "@keycloakify/angular/login/pipes/msg-str.pipe";
+import { NgComponentOutlet } from '@angular/common';
+import { ChangeDetectionStrategy, Component, forwardRef, inject, input, signal, Type } from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { USE_DEFAULT_CSS } from '@keycloakify/angular/lib/tokens/use-default-css.token';
+import { ComponentReference } from '@keycloakify/angular/login/classes/component-reference.class';
+import { UserProfileFormFieldsComponent } from '@keycloakify/angular/login/components/user-profile-form-fields/user-profile-form-fields.component';
+import { TemplateComponent } from '@keycloakify/angular/login/containers/template.component';
+import { KcClassDirective } from '@keycloakify/angular/login/directives/kc-class.directive';
+import { LOGIN_CLASSES } from '@keycloakify/angular/login/tokens/classes.token';
+import { LOGIN_I18N } from '@keycloakify/angular/login/tokens/i18n.token';
+import { KC_LOGIN_CONTEXT } from '@keycloakify/angular/login/tokens/kc-context.token';
+import { type ClassKey } from 'keycloakify/login/lib/kcClsx';
+import { type I18n } from '../../i18n';
+import { type KcContext } from '../../KcContext';
+import { SubmitService } from '@keycloakify/angular/login/services/submit.service';
 
 @Component({
     standalone: true,
-    imports: [
-        TemplateComponent,
-        KcClassDirective,
-        MsgStrPipe,
-        UserProfileFormFieldsComponent
-    ],
-    selector: "kc-root",
-    templateUrl: "login-update-profile.component.html",
+    imports: [TemplateComponent, KcClassDirective, NgComponentOutlet],
+    selector: 'kc-root',
+    templateUrl: 'login-update-profile.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
     providers: [
         {
@@ -38,15 +28,24 @@ import { MsgStrPipe } from "@keycloakify/angular/login/pipes/msg-str.pipe";
     ]
 })
 export class LoginUpdateProfileComponent extends ComponentReference {
-    kcContext =
-        inject<Extract<KcContext, { pageId: "login-update-profile.ftl" }>>(KC_CONTEXT);
+    #submitService = inject(SubmitService);
+    kcContext = inject<Extract<KcContext, { pageId: 'login-update-profile.ftl' }>>(KC_LOGIN_CONTEXT);
+    i18n = inject<I18n>(LOGIN_I18N);
     override doUseDefaultCss = inject<boolean>(USE_DEFAULT_CSS);
-    override classes = inject<Partial<Record<ClassKey, string>>>(CLASSES);
+    override classes = inject<Partial<Record<ClassKey, string>>>(LOGIN_CLASSES);
     displayRequiredFields = input(true);
     documentTitle = input<string>();
     bodyClassName = input<string>();
     displayInfo: boolean = false;
-    displayMessage: boolean = this.kcContext.messagesPerField.exists("global");
+    displayMessage: boolean = this.kcContext.messagesPerField.exists('global');
 
     isFormSubmittable = signal(false);
+
+    userProfileFormFields = input<Type<UserProfileFormFieldsComponent>>();
+    constructor() {
+        super();
+        this.#submitService.isSubmittable.pipe(takeUntilDestroyed()).subscribe(submittable => {
+            this.isFormSubmittable.set(submittable);
+        });
+    }
 }