@keycloakify/angular 0.0.1-rc.2 → 0.0.1-rc.20

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

@@ -1,36 +1,22 @@
-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, 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 { LogoutOtherSessionsComponent } from '@keycloakify/angular/login/components/logout-other-sessions';
+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 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';
 
 @Component({
     standalone: true,
-    imports: [
-        TemplateComponent,
-        MsgStrPipe,
-        KcClassDirective,
-        PasswordWrapperComponent,
-        KcSanitizePipe,
-        LogoutOtherSessionsComponent
-    ],
-    selector: 'kc-root',
+    imports: [TemplateComponent, KcClassDirective, PasswordWrapperComponent, KcSanitizePipe, LogoutOtherSessionsComponent],
+    selector: 'kc-login-update-password',
     templateUrl: 'login-update-password.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
     providers: [
@@ -41,16 +27,20 @@ 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);
-    displayRequiredFields = input(false);
-    documentTitle = input<string>();
-    bodyClassName = input<string>();
+    override classes = inject<Partial<Record<ClassKey, string>>>(LOGIN_CLASSES);
+
+    documentTitle: string | undefined;
+    bodyClassName: string | undefined;
+
+    displayRequiredFields = false;
     displayInfo = false;
-    displayMessage = !this.kcContext.messagesPerField.existsError(
-        'password',
-        'password-confirm'
-    );
+    displayMessage = !this.kcContext.messagesPerField.existsError('password', 'password-confirm');
+
+    headerNode? = viewChild<TemplateRef<HTMLElement>>('headerNode');
+    infoNode? = viewChild<TemplateRef<HTMLElement>>('infoNode');
+    socialProvidersNode? = viewChild<TemplateRef<HTMLElement>>('socialProvidersNode');
 }

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

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

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

@@ -1,33 +1,23 @@
-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, 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';
+import { UserProfileFormFieldsComponent } from '@keycloakify/angular/login/components/user-profile-form-fields';
+import { TemplateComponent } from '@keycloakify/angular/login/containers/template';
+import { KcClassDirective } from '@keycloakify/angular/login/directives/kc-class';
+import type { I18n } from '../../i18n';
+import type { KcContext } from '../../KcContext';
+import { SubmitService } from '@keycloakify/angular/login/services/submit';
+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';
 
 @Component({
     standalone: true,
-    imports: [
-        TemplateComponent,
-        KcClassDirective,
-        MsgStrPipe,
-        UserProfileFormFieldsComponent
-    ],
-    selector: 'kc-root',
+    imports: [TemplateComponent, KcClassDirective, NgComponentOutlet],
+    selector: 'kc-login-update-profile',
     templateUrl: 'login-update-profile.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
     providers: [
@@ -38,15 +28,31 @@ 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);
-    displayRequiredFields = input(true);
-    documentTitle = input<string>();
-    bodyClassName = input<string>();
-    displayInfo: boolean = false;
+    override classes = inject<Partial<Record<ClassKey, string>>>(LOGIN_CLASSES);
+
+    documentTitle: string | undefined;
+    bodyClassName: string | undefined;
+
+    displayRequiredFields = true;
+    displayInfo = false;
     displayMessage: boolean = this.kcContext.messagesPerField.exists('global');
 
+    headerNode? = viewChild<TemplateRef<HTMLElement>>('headerNode');
+    infoNode? = viewChild<TemplateRef<HTMLElement>>('infoNode');
+    socialProvidersNode? = viewChild<TemplateRef<HTMLElement>>('socialProvidersNode');
+
     isFormSubmittable = signal(false);
+    userProfileFormFields = input<Type<UserProfileFormFieldsComponent>>();
+
+    constructor() {
+        super();
+        this.#submitService.isSubmittable.pipe(takeUntilDestroyed()).subscribe(submittable => {
+            this.isFormSubmittable.set(submittable);
+        });
+    }
 }

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

@@ -5,157 +5,147 @@
 @let url = kcContext.url;
 @let login = kcContext.login;
 
-<kc-login-template
-  [displayInfo]="displayInfo"
-  [bodyClassName]="bodyClassName()"
-  [displayMessage]="displayMessage"
-  [displayRequiredFields]="displayRequiredFields()"
-  [documentTitle]="documentTitle()"
->
-  <ng-container headerNode>
-    {{ 'doLogIn' | msgStr }}
-  </ng-container>
-  <ng-container infoNode>
+<ng-template #headerNode>
+    {{ i18n.msgStr('doLogIn') }}
+</ng-template>
+<ng-container infoNode>
     <div id="kc-registration">
-      <span>
-        {{ 'noAccount' | msgStr }}
-        <a
-          tabindex="6"
-          [href]="url?.registrationUrl"
-        >
-          {{ 'doRegister' | msgStr }}
-        </a>
-      </span>
+        <span>
+            {{ i18n.msgStr('noAccount') }}
+            <a
+                tabindex="6"
+                [href]="url?.registrationUrl"
+            >
+                {{ i18n.msgStr('doRegister') }}
+            </a>
+        </span>
     </div>
-  </ng-container>
-  <ng-container socialProvidersNode>
+</ng-container>
+<ng-template #socialProvidersNode>
     @if (!!realm?.password && !!social?.providers?.length) {
-      <div
-        id="kc-social-providers"
-        [kcClass]="'kcFormSocialAccountSectionClass'"
-      >
-        <hr />
-        <h2>{{ 'identity-provider-login-label' | msgStr }}</h2>
-        <ul
-          [kcClass]="{
-            kcFormSocialAccountListClass: true,
-            kcFormSocialAccountListGridClass: (social?.providers?.length ?? 0) > 3,
-          }"
+        <div
+            id="kc-social-providers"
+            [kcClass]="'kcFormSocialAccountSectionClass'"
         >
-          @for (provider of social?.providers; track provider.alias; let idx = $index) {
-            <li>
-              <a
-                [id]="provider.alias"
+            <hr />
+            <h2>{{ i18n.msgStr('identity-provider-login-label') }}</h2>
+            <ul
                 [kcClass]="{
-                  kcFormSocialAccountListButtonClass: true,
-                  kcFormSocialAccountGridItem: (social?.providers?.length ?? 0) > 3,
+                    kcFormSocialAccountListClass: true,
+                    kcFormSocialAccountListGridClass: (social?.providers?.length ?? 0) > 3
                 }"
-                type="button"
-                [href]="provider.loginUrl"
-              >
-                @if (provider.iconClasses) {
-                  <i
-                    [ngClass]="provider.iconClasses"
-                    [kcClass]="'kcCommonLogoIdP'"
-                    aria-hidden="true"
-                  ></i>
+            >
+                @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
+                                }"
+                                [kcClass]="'kcFormSocialAccountNameClass'"
+                                [innerHTML]="provider.displayName | kcSanitize: 'html'"
+                            ></span>
+                        </a>
+                    </li>
                 }
-                <span
-                  [ngClass]="{
-                    'kc-social-icon-text': provider.iconClasses,
-                  }"
-                  [kcClass]="'kcFormSocialAccountNameClass'"
-                  [innerHTML]="provider.displayName | kcSanitize: 'html'"
-                ></span>
-              </a>
-            </li>
-          }
-        </ul>
-      </div>
+            </ul>
+        </div>
     }
-  </ng-container>
-  <ng-container content>
-    <div id="kc-form">
-      <div id="kc-form-wrapper">
+</ng-template>
+<div id="kc-form">
+    <div id="kc-form-wrapper">
         @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) {
-                    {{ 'username' | msgStr }}
-                  } @else if (!realm?.registrationEmailAsUsername) {
-                    {{ 'usernameOrEmail' | msgStr }}
-                  } @else {
-                    {{ 'email' | msgStr }}
-                  }
-                </label>
-                <input
-                  tabindex="2"
-                  id="username"
-                  [kcClass]="'kcInputClass'"
-                  name="username"
-                  type="text"
-                  autofocus
-                  autoComplete="off"
-                  [defaultValue]="login?.username || ''"
-                  [attr.aria-invalid]="messagesPerField?.existsError('username')"
-                />
-                @if (messagesPerField?.existsError('username')) {
-                  <span
-                    id="input-error"
-                    [kcClass]="'kcInputErrorMessageClass'"
-                    aria-live="polite"
-                    [innerHTML]="messagesPerField?.getFirstError('username') | kcSanitize: 'html'"
-                  >
-                  </span>
+            <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
+                            autoComplete="off"
+                            [kcClass]="'kcInputClass'"
+                            [defaultValue]="login?.username || ''"
+                            [attr.aria-invalid]="messagesPerField?.existsError('username')"
+                        />
+                        @if (messagesPerField?.existsError('username')) {
+                            <span
+                                id="input-error"
+                                aria-live="polite"
+                                [kcClass]="'kcInputErrorMessageClass'"
+                                [innerHTML]="messagesPerField.getFirstError('username') | kcSanitize: 'html'"
+                            >
+                            </span>
+                        }
+                        <!---->
+                    </div>
                 }
-                <!---->
-              </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"
-                      />
-                      {{ 'rememberMe' | msgStr }}
-                    </label>
-                  </div>
-                }
-              </div>
-            </div>
-            <div
-              id="kc-form-buttons"
-              [kcClass]="'kcFormGroupClass'"
-            >
-              <input
-                tabindex="4"
-                [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
-                name="login"
-                id="kc-login"
-                type="submit"
-                [value]="'doLogIn' | msgStr"
-              />
-            </div>
-          </form>
+                <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>
+                <div
+                    id="kc-form-buttons"
+                    [kcClass]="'kcFormGroupClass'"
+                >
+                    <input
+                        tabindex="4"
+                        name="login"
+                        id="kc-login"
+                        type="submit"
+                        [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
+                        [value]="i18n.msgStr('doLogIn')"
+                    />
+                </div>
+            </form>
         }
-      </div>
     </div>
-  </ng-container>
-</kc-login-template>
+</div>