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

package/src/login/components/user-profile-form-fields/user-profile-form-fields.component.ts

@@ -1,32 +1,20 @@
-import { NgTemplateOutlet } from "@angular/common";
-import {
-    ChangeDetectionStrategy,
-    Component,
-    ContentChild,
-    effect,
-    forwardRef,
-    inject,
-    output,
-    TemplateRef
-} from "@angular/core";
-import {
-    DO_MAKE_USER_CONFIRM_PASSWORD,
-    KC_CONTEXT,
-    CLASSES,
-    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 { KcClassDirective } from "@keycloakify/angular/login/directives/kc-class.directive";
-import { AdvancedMsgStrPipe } from "@keycloakify/angular/login/pipes/advanced-msg-str.pipe";
-import {
-    FormAction,
-    UserProfileFormService
-} from "@keycloakify/angular/login/services/user-profile-form.service";
-import { FieldErrorsComponent } from "@keycloakify/angular/login/components/field-errors/field-errors.component";
-import { GroupLabelComponent } from "@keycloakify/angular/login/components/group-label/group-label.component";
-import { InputFieldByTypeComponent } from "@keycloakify/angular/login/components/input-field-by-type/input-field-by-type.component";
+import { NgTemplateOutlet } from '@angular/common';
+import { ChangeDetectionStrategy, Component, ContentChild, effect, forwardRef, inject, output, TemplateRef } 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 { FieldErrorsComponent } from '@keycloakify/angular/login/components/field-errors/field-errors.component';
+import { GroupLabelComponent } from '@keycloakify/angular/login/components/group-label/group-label.component';
+import { InputFieldByTypeComponent } from '@keycloakify/angular/login/components/input-field-by-type/input-field-by-type.component';
+import { KcClassDirective } from '@keycloakify/angular/login/directives/kc-class.directive';
+import { type FormAction, UserProfileFormService } from '@keycloakify/angular/login/services/user-profile-form.service';
+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 { DO_MAKE_USER_CONFIRM_PASSWORD } from '@keycloakify/angular/login/tokens/make-user-confirm-password.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,
@@ -37,16 +25,9 @@ import { InputFieldByTypeComponent } from "@keycloakify/angular/login/components
             }
         `
     ],
-    imports: [
-        KcClassDirective,
-        FieldErrorsComponent,
-        InputFieldByTypeComponent,
-        GroupLabelComponent,
-        NgTemplateOutlet,
-        AdvancedMsgStrPipe
-    ],
-    selector: "kc-user-profile-form-fields",
-    templateUrl: "user-profile-form-fields.component.html",
+    imports: [KcClassDirective, FieldErrorsComponent, InputFieldByTypeComponent, GroupLabelComponent, NgTemplateOutlet],
+    selector: 'kc-user-profile-form-fields',
+    templateUrl: 'user-profile-form-fields.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
     providers: [
         UserProfileFormService,
@@ -57,25 +38,30 @@ import { InputFieldByTypeComponent } from "@keycloakify/angular/login/components
     ]
 })
 export class UserProfileFormFieldsComponent extends ComponentReference {
-    kcContext = inject<KcContext>(KC_CONTEXT);
+    i18n = inject<I18n>(LOGIN_I18N);
+    kcContext = inject<KcContext>(KC_LOGIN_CONTEXT);
     userProfileFormService = inject(UserProfileFormService);
+    #submitService = inject(SubmitService);
     doMakeUserConfirmPassword = inject(DO_MAKE_USER_CONFIRM_PASSWORD);
     override doUseDefaultCss = inject<boolean>(USE_DEFAULT_CSS);
-    override classes = inject<Partial<Record<ClassKey, string>>>(CLASSES);
+    override classes = inject<Partial<Record<ClassKey, string>>>(LOGIN_CLASSES);
 
     onIsFormSubmittable = output<boolean>();
 
     formState = this.userProfileFormService.formState;
 
-    @ContentChild("beforField") beforeField: TemplateRef<unknown> | undefined;
-    @ContentChild("afterField") afterField: TemplateRef<unknown> | undefined;
+    @ContentChild('beforField') beforeField: TemplateRef<unknown> | undefined;
+    @ContentChild('afterField') afterField: TemplateRef<unknown> | undefined;
 
     constructor() {
         super();
-        effect(() => {
-            const isFormSubmittable = this.formState().isFormSubmittable;
-            this.onIsFormSubmittable.emit(isFormSubmittable);
-        });
+        effect(
+            () => {
+                const isFormSubmittable = this.formState().isFormSubmittable;
+                this.#submitService.setIsSubmittable(isFormSubmittable);
+            },
+            { allowSignalWrites: true }
+        );
     }
 
     onDispatch(formAction: FormAction) {

package/src/login/containers/template.component.html

@@ -6,198 +6,198 @@
 @let isReadyToRender = isReadyToRender$ | async;
 
 @if (isReadyToRender) {
-  <div [kcClass]="'kcLoginClass'">
-    <div
-      id="kc-header"
-      [kcClass]="'kcHeaderClass'"
-    >
-      <div
-        id="kc-header-wrapper"
-        [kcClass]="'kcHeaderWrapperClass'"
-      >
-        <div [innerHTML]="realm?.displayNameHtml | kcSanitize: 'html'"></div>
-      </div>
-    </div>
-
-    <div [kcClass]="'kcFormCardClass'">
-      <header [kcClass]="'kcFormHeaderClass'">
-        <!-- Locale switcher -->
-        @if (i18n.enabledLanguages.length > 1) {
-          <div
-            id="kc-locale"
-            [kcClass]="'kcLocaleMainClass'"
-          >
+    <div [kcClass]="'kcLoginClass'">
+        <div
+            id="kc-header"
+            [kcClass]="'kcHeaderClass'"
+        >
             <div
-              id="kc-locale-wrapper"
-              [kcClass]="'kcLocaleWrapperClass'"
+                id="kc-header-wrapper"
+                [kcClass]="'kcHeaderWrapperClass'"
             >
-              <div
-                id="kc-locale-dropdown"
-                [kcClass]="'kcLocaleDropDownClass'"
-                class="menu-button-links"
-              >
-                <button
-                  tabindex="1"
-                  id="kc-current-locale-link"
-                  [attr.aria-label]="'languages' | msgStr"
-                  aria-haspopup="true"
-                  aria-expanded="false"
-                  aria-controls="language-switch1"
-                >
-                  {{ i18n.currentLanguage.label }}
-                </button>
-                <ul
-                  role="menu"
-                  tabindex="-1"
-                  aria-labelledby="kc-current-locale-link"
-                  aria-activedescendant=""
-                  id="language-switch1"
-                  [kcClass]="'kcLocaleListClass'"
-                >
-                  @for (entry of i18n.enabledLanguages; track entry; let idx = $index) {
-                    <li
-                      [kcClass]="'kcLocaleListItemClass'"
-                      role="none"
-                    >
-                      <a
-                        role="menuitem"
-                        tabindex="-1"
-                        [href]="entry.href"
-                        [kcClass]="'kcLocaleItemClass'"
-                        [id]="'language-' + idx"
-                      >
-                        {{ entry.label }}
-                      </a>
-                    </li>
-                  }
-                </ul>
-              </div>
+                <div [innerHTML]="realm?.displayNameHtml ?? '' | kcSanitize: 'html'"></div>
             </div>
-          </div>
-        }
+        </div>
 
-        <!-- Header content -->
-        <ng-template #node>
-          @if (auth && !auth.showUsername && !auth.showResetCredentials) {
-            <h1 id="kc-page-title">
-              <ng-content select="[headerNode]"></ng-content>
-            </h1>
-          } @else {
-            <div
-              id="kc-username"
-              [kcClass]="'kcFormGroupClass'"
-            >
-              <label id="kc-attempted-username">{{ auth?.attemptedUsername }}</label>
-              <a
-                id="reset-login"
-                [href]="url?.loginRestartFlowUrl"
-                [attr.aria-label]="'restartLoginTooltip' | msgStr"
-              >
-                <div class="kc-login-tooltip">
-                  <i [kcClass]="'kcResetFlowIcon'"></i>
-                  <span class="kc-tooltip-text">
-                    {{ 'restartLoginTooltip' | msgStr }}
-                  </span>
-                </div>
-              </a>
-            </div>
-          }
-        </ng-template>
+        <div [kcClass]="'kcFormCardClass'">
+            <header [kcClass]="'kcFormHeaderClass'">
+                <!-- Locale switcher -->
+                @if (i18n.enabledLanguages.length > 1) {
+                    <div
+                        id="kc-locale"
+                        [kcClass]="'kcLocaleMainClass'"
+                    >
+                        <div
+                            id="kc-locale-wrapper"
+                            [kcClass]="'kcLocaleWrapperClass'"
+                        >
+                            <div
+                                id="kc-locale-dropdown"
+                                [kcClass]="'kcLocaleDropDownClass'"
+                                class="menu-button-links"
+                            >
+                                <button
+                                    tabindex="1"
+                                    id="kc-current-locale-link"
+                                    [attr.aria-label]="i18n.msgStr('languages')"
+                                    aria-haspopup="true"
+                                    aria-expanded="false"
+                                    aria-controls="language-switch1"
+                                >
+                                    {{ i18n.currentLanguage.label }}
+                                </button>
+                                <ul
+                                    role="menu"
+                                    tabindex="-1"
+                                    aria-labelledby="kc-current-locale-link"
+                                    aria-activedescendant=""
+                                    id="language-switch1"
+                                    [kcClass]="'kcLocaleListClass'"
+                                >
+                                    @for (entry of i18n.enabledLanguages; track entry; let idx = $index) {
+                                        <li
+                                            [kcClass]="'kcLocaleListItemClass'"
+                                            role="none"
+                                        >
+                                            <a
+                                                role="menuitem"
+                                                tabindex="-1"
+                                                [href]="entry.href"
+                                                [kcClass]="'kcLocaleItemClass'"
+                                                [id]="'language-' + idx"
+                                            >
+                                                {{ entry.label }}
+                                            </a>
+                                        </li>
+                                    }
+                                </ul>
+                            </div>
+                        </div>
+                    </div>
+                }
 
-        @if (displayRequiredFields()) {
-          <div [kcClass]="'kcContentWrapperClass'">
-            <div
-              [kcClass]="'kcLabelWrapperClass'"
-              class="subtitle"
-            >
-              <span class="subtitle">
-                <span class="required">*</span>
-                {{ 'requiredFields' | msgStr }}
-              </span>
-            </div>
-            <div class="col-md-10">
-              <ng-container [ngTemplateOutlet]="node"></ng-container>
-            </div>
-          </div>
-        } @else {
-          <ng-container [ngTemplateOutlet]="node"></ng-container>
-        }
-      </header>
+                <!-- Header content -->
+                <ng-template #node>
+                    @if (auth && !auth.showUsername && !auth.showResetCredentials) {
+                        <h1 id="kc-page-title">
+                            <ng-content select="[headerNode]"></ng-content>
+                        </h1>
+                    } @else {
+                        <div
+                            id="kc-username"
+                            [kcClass]="'kcFormGroupClass'"
+                        >
+                            <label id="kc-attempted-username">{{ auth?.attemptedUsername }}</label>
+                            <a
+                                id="reset-login"
+                                [href]="url?.loginRestartFlowUrl"
+                                [attr.aria-label]="i18n.msgStr('restartLoginTooltip')"
+                            >
+                                <div class="kc-login-tooltip">
+                                    <i [kcClass]="'kcResetFlowIcon'"></i>
+                                    <span class="kc-tooltip-text">
+                                        {{ i18n.msgStr('restartLoginTooltip') }}
+                                    </span>
+                                </div>
+                            </a>
+                        </div>
+                    }
+                </ng-template>
 
-      <div id="kc-content">
-        <div id="kc-content-wrapper">
-          <!-- Message display -->
-          @if (displayMessage() && message && (message.type !== 'warning' || !isAppInitiatedAction)) {
-            <div
-              [kcClass]="'kcAlertClass'"
-              [ngClass]="message.type === 'error' ? 'pf-m-danger' : 'pf-m-' + message.type"
-              [class]="'alert-' + message.type"
-            >
-              <div class="pf-c-alert__icon">
-                @switch (message.type) {
-                  @case ('success') {
-                    <span [kcClass]="'kcFeedbackSuccessIcon'"></span>
-                  }
-                  @case ('warning') {
-                    <span [kcClass]="'kcFeedbackWarningIcon'"></span>
-                  }
-                  @case ('info') {
-                    <span [kcClass]="'kcFeedbackInfoIcon'"></span>
-                  }
-                  @case ('error') {
-                    <span [kcClass]="'kcFeedbackErrorIcon'"></span>
-                  }
+                @if (displayRequiredFields()) {
+                    <div [kcClass]="'kcContentWrapperClass'">
+                        <div
+                            [kcClass]="'kcLabelWrapperClass'"
+                            class="subtitle"
+                        >
+                            <span class="subtitle">
+                                <span class="required">*</span>
+                                {{ i18n.msgStr('requiredFields') }}
+                            </span>
+                        </div>
+                        <div class="col-md-10">
+                            <ng-container [ngTemplateOutlet]="node"></ng-container>
+                        </div>
+                    </div>
+                } @else {
+                    <ng-container [ngTemplateOutlet]="node"></ng-container>
                 }
-              </div>
-              <span
-                [kcClass]="'kcAlertTitleClass'"
-                [innerHTML]="message.summary | kcSanitize: 'html'"
-              ></span>
-            </div>
-          }
-          <!-- Content -->
-          <ng-content select="[content]"></ng-content>
-          @if (!!auth && auth?.showTryAnotherWayLink) {
-            <form
-              id="kc-select-try-another-way-form"
-              [action]="url?.loginAction"
-              method="post"
-            >
-              <div [kcClass]="'kcFormGroupClass'">
-                <div [kcClass]="'kcFormGroupClass'">
-                  <input
-                    type="hidden"
-                    name="tryAnotherWay"
-                    value="on"
-                  />
-                  <a
-                    id="try-another-way"
-                    (click)="tryAnotherWay()"
-                  >
-                    {{ 'doTryAnotherWay' | msgStr }}
-                  </a>
-                </div>
-              </div>
-            </form>
-          }
+            </header>
 
-          <ng-content select="[socialProvidersNode]"></ng-content>
-          <!-- Info display -->
-          @if (displayInfo()) {
-            <div
-              id="kc-info"
-              [kcClass]="'kcSignUpClass'"
-            >
-              <div
-                id="kc-info-wrapper"
-                [kcClass]="'kcInfoAreaWrapperClass'"
-              >
-                <ng-content select="[infoNode]"></ng-content>
-              </div>
+            <div id="kc-content">
+                <div id="kc-content-wrapper">
+                    <!-- Message display -->
+                    @if (displayMessage() && message && (message.type !== 'warning' || !isAppInitiatedAction)) {
+                        <div
+                            [kcClass]="'kcAlertClass'"
+                            [ngClass]="message.type === 'error' ? 'pf-m-danger' : 'pf-m-' + message.type"
+                            [class]="'alert-' + message.type"
+                        >
+                            <div class="pf-c-alert__icon">
+                                @switch (message.type) {
+                                    @case ('success') {
+                                        <span [kcClass]="'kcFeedbackSuccessIcon'"></span>
+                                    }
+                                    @case ('warning') {
+                                        <span [kcClass]="'kcFeedbackWarningIcon'"></span>
+                                    }
+                                    @case ('info') {
+                                        <span [kcClass]="'kcFeedbackInfoIcon'"></span>
+                                    }
+                                    @case ('error') {
+                                        <span [kcClass]="'kcFeedbackErrorIcon'"></span>
+                                    }
+                                }
+                            </div>
+                            <span
+                                [kcClass]="'kcAlertTitleClass'"
+                                [innerHTML]="message.summary | kcSanitize: 'html'"
+                            ></span>
+                        </div>
+                    }
+                    <!-- Content -->
+                    <ng-content select="[content]"></ng-content>
+                    @if (!!auth && auth?.showTryAnotherWayLink) {
+                        <form
+                            id="kc-select-try-another-way-form"
+                            [action]="url?.loginAction"
+                            method="post"
+                        >
+                            <div [kcClass]="'kcFormGroupClass'">
+                                <div [kcClass]="'kcFormGroupClass'">
+                                    <input
+                                        type="hidden"
+                                        name="tryAnotherWay"
+                                        value="on"
+                                    />
+                                    <a
+                                        id="try-another-way"
+                                        (click)="tryAnotherWay()"
+                                    >
+                                        {{ i18n.msgStr('doTryAnotherWay') }}
+                                    </a>
+                                </div>
+                            </div>
+                        </form>
+                    }
+
+                    <ng-content select="[socialProvidersNode]"></ng-content>
+                    <!-- Info display -->
+                    @if (displayInfo()) {
+                        <div
+                            id="kc-info"
+                            [kcClass]="'kcSignUpClass'"
+                        >
+                            <div
+                                id="kc-info-wrapper"
+                                [kcClass]="'kcInfoAreaWrapperClass'"
+                            >
+                                <ng-content select="[infoNode]"></ng-content>
+                            </div>
+                        </div>
+                    }
+                </div>
             </div>
-          }
         </div>
-      </div>
     </div>
-  </div>
 }

package/src/login/containers/template.component.ts

@@ -1,35 +1,24 @@
-import { AsyncPipe, NgTemplateOutlet } from "@angular/common";
-import {
-    ChangeDetectionStrategy,
-    Component,
-    forwardRef,
-    inject,
-    input,
-    OnInit,
-    Renderer2
-} from "@angular/core";
-import { Meta, Title } from "@angular/platform-browser";
-import {
-    CLASSES,
-    I18N,
-    KC_CONTEXT,
-    USE_DEFAULT_CSS
-} from "@keycloakify/angular/lib/public-api";
-import type { I18n } from "@keycloakify/angular/login/i18n";
-import { KcContext } from "keycloakify/login/KcContext/KcContext";
-import { ClassKey, getKcClsx } from "keycloakify/login/lib/kcClsx";
-import { Observable } from "rxjs";
-import { ComponentReference } from "@keycloakify/angular/login/classes/component-reference.class";
-import { KcClassDirective } from "@keycloakify/angular/login/directives/kc-class.directive";
-import { KcSanitizePipe } from "@keycloakify/angular/login/pipes";
-import { MsgStrPipe } from "@keycloakify/angular/login/pipes/msg-str.pipe";
-import { LoginResourceInjectorService } from "@keycloakify/angular/login/services/login-resource-injector.service";
+import { AsyncPipe, NgTemplateOutlet } from '@angular/common';
+import { ChangeDetectionStrategy, Component, forwardRef, inject, input, OnInit, Renderer2 } from '@angular/core';
+import { Meta, Title } from '@angular/platform-browser';
+import { USE_DEFAULT_CSS } from '@keycloakify/angular/lib/tokens/use-default-css.token';
+import { ComponentReference } from '@keycloakify/angular/login/classes/component-reference.class';
+import { KcClassDirective } from '@keycloakify/angular/login/directives/kc-class.directive';
+import type { I18n } from '@keycloakify/angular/login/i18n';
+import { KcSanitizePipe } from '@keycloakify/angular/lib/pipes/kc-sanitize.pipe';
+import { LoginResourceInjectorService } from '@keycloakify/angular/login/services/login-resource-injector.service';
+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 { KcContext } from 'keycloakify/login/KcContext/KcContext';
+import { type ClassKey, getKcClsx } from 'keycloakify/login/lib/kcClsx';
+import { Observable } from 'rxjs';
 
 @Component({
-    selector: "kc-login-template",
-    templateUrl: "./template.component.html",
+    selector: 'kc-login-template',
+    templateUrl: './template.component.html',
     standalone: true,
-    imports: [AsyncPipe, KcSanitizePipe, NgTemplateOutlet, KcClassDirective, MsgStrPipe],
+    imports: [AsyncPipe, KcSanitizePipe, NgTemplateOutlet, KcClassDirective],
     changeDetection: ChangeDetectionStrategy.OnPush,
     providers: [
         {
@@ -39,13 +28,13 @@ import { LoginResourceInjectorService } from "@keycloakify/angular/login/service
     ]
 })
 export class TemplateComponent extends ComponentReference implements OnInit {
-    i18n = inject<I18n>(I18N);
+    i18n = inject<I18n>(LOGIN_I18N);
     renderer = inject(Renderer2);
     meta = inject(Meta);
     title = inject(Title);
-    kcContext = inject<KcContext>(KC_CONTEXT);
+    kcContext = inject<KcContext>(KC_LOGIN_CONTEXT);
     override doUseDefaultCss = inject<boolean>(USE_DEFAULT_CSS);
-    override classes = inject<Partial<Record<ClassKey, string>>>(CLASSES);
+    override classes = inject<Partial<Record<ClassKey, string>>>(LOGIN_CLASSES);
     loginResourceInjectorService = inject(LoginResourceInjectorService);
 
     displayInfo = input(false);
@@ -58,13 +47,8 @@ export class TemplateComponent extends ComponentReference implements OnInit {
 
     constructor() {
         super();
-        this.title.setTitle(
-            this.documentTitle() ??
-                this.i18n.msgStr("loginTitle", this.kcContext.realm.displayName)
-        );
-        this.isReadyToRender$ = this.loginResourceInjectorService.injectResource(
-            this.doUseDefaultCss
-        );
+        this.title.setTitle(this.documentTitle() ?? this.i18n.msgStr('loginTitle', this.kcContext.realm.displayName));
+        this.isReadyToRender$ = this.loginResourceInjectorService.injectResource(this.doUseDefaultCss);
     }
 
     ngOnInit() {
@@ -76,8 +60,8 @@ export class TemplateComponent extends ComponentReference implements OnInit {
             doUseDefaultCss: this.doUseDefaultCss,
             classes: this.classes
         }).kcClsx;
-        const kcBodyClass = this.bodyClassName() ?? kcClsx("kcBodyClass");
-        const kcHtmlClass = kcClsx("kcHtmlClass");
+        const kcBodyClass = this.bodyClassName() ?? kcClsx('kcBodyClass');
+        const kcHtmlClass = kcClsx('kcHtmlClass');
         const kcBodyClasses = kcBodyClass.split(/\s+/);
         const kcHtmlClasses = kcHtmlClass.split(/\s+/);
         kcBodyClasses.forEach(klass => {
@@ -89,6 +73,6 @@ export class TemplateComponent extends ComponentReference implements OnInit {
     }
 
     tryAnotherWay() {
-        document.forms["kc-select-try-another-way-form" as never].submit();
+        document.forms['kc-select-try-another-way-form' as never].submit();
     }
 }