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

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

@@ -1,36 +1,27 @@
 @let url = kcContext.url;
-<kc-login-template
-  [displayInfo]="displayInfo"
-  [bodyClassName]="bodyClassName()"
-  [displayMessage]="displayMessage"
-  [displayRequiredFields]="displayRequiredFields()"
-  [documentTitle]="documentTitle()"
+
+<ng-template #headerNode>
+    {{ i18n.msgStr('termsTitle') }}
+</ng-template>
+<div id="kc-terms-text">{{ i18n.msgStr('termsText') }}</div>
+<form
+    class="form-actions"
+    method="POST"
+    [action]="url.loginAction"
 >
-  <ng-container headerNode>
-    {{ 'termsTitle' | msgStr }}
-  </ng-container>
-  <ng-container content>
-    <div id="kc-terms-text">{{ 'termsText' | msgStr }}</div>
-    <form
-      class="form-actions"
-      [action]="url.loginAction"
-      method="POST"
-    >
-      <input
-        [kcClass]="['kcButtonClass', 'kcButtonClass', 'kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonLargeClass']"
+    <input
         name="accept"
         id="kc-accept"
         type="submit"
-        [value]="'doAccept' | msgStr"
-      />
-      <input
-        [kcClass]="['kcButtonClass', 'kcButtonDefaultClass', 'kcButtonLargeClass']"
+        [kcClass]="['kcButtonClass', 'kcButtonClass', 'kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonLargeClass']"
+        [value]="i18n.msgStr('doAccept')"
+    />
+    <input
         name="cancel"
         id="kc-decline"
         type="submit"
-        [value]="'doDecline' | msgStr"
-      />
-    </form>
-    <div className="clearfix"></div>
-  </ng-container>
-</kc-login-template>
+        [kcClass]="['kcButtonClass', 'kcButtonDefaultClass', 'kcButtonLargeClass']"
+        [value]="i18n.msgStr('doDecline')"
+    />
+</form>
+<div className="clearfix"></div>

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

@@ -1,26 +1,19 @@
-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 { 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 { 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 { 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: [MsgStrPipe, TemplateComponent, KcClassDirective],
-    selector: 'kc-root',
+    imports: [TemplateComponent, KcClassDirective],
+    selector: 'kc-terms',
     templateUrl: 'terms.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
     providers: [
@@ -31,12 +24,20 @@ import { MsgStrPipe } from '@keycloakify/angular/login/pipes/msg-str.pipe';
     ]
 })
 export class TermsComponent extends ComponentReference {
-    kcContext = inject<Extract<KcContext, { pageId: 'terms.ftl' }>>(KC_CONTEXT);
+    kcContext = inject<Extract<KcContext, { pageId: 'terms.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>();
-    displayInfo: boolean = false;
-    displayMessage: boolean = false;
+    override classes = inject<Partial<Record<ClassKey, string>>>(LOGIN_CLASSES);
+
+    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');
 }

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

@@ -1,58 +1,49 @@
 @let url = kcContext.url;
 @let isAppInitiatedAction = kcContext.isAppInitiatedAction;
-<kc-login-template
-  [displayInfo]="displayInfo"
-  [bodyClassName]="bodyClassName()"
-  [displayMessage]="displayMessage"
-  [displayRequiredFields]="displayRequiredFields()"
-  [documentTitle]="documentTitle()"
+
+<ng-template #headerNode>
+    {{ i18n.msgStr('updateEmailTitle') }}
+</ng-template>
+<form
+    id="kc-update-email-form"
+    method="post"
+    [kcClass]="'kcFormClass'"
+    [action]="url.loginAction"
 >
-  <ng-container headerNode>
-    {{ 'updateEmailTitle' | msgStr }}
-  </ng-container>
-  <ng-container content>
-    <form
-      id="kc-update-email-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-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>
-        <kc-logout-other-sessions></kc-logout-other-sessions>
+        <kc-logout-other-sessions />
         <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"
-            >
-              {{ '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"
+                    [kcClass]="['kcButtonClass', 'kcButtonDefaultClass', 'kcButtonLargeClass']"
+                >
+                    {{ i18n.msgStr('doCancel') }}
+                </button>
+            }
         </div>
-      </div>
-    </form>
-  </ng-container>
-</kc-login-template>
+    </div>
+</form>

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

@@ -1,35 +1,21 @@
-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 { LogoutOtherSessionsComponent } from '@keycloakify/angular/login/components/logout-other-sessions/logout-other-sessions.component';
-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 { ComponentReference } from '@keycloakify/angular/login/classes/component-reference';
+import { LogoutOtherSessionsComponent } from '@keycloakify/angular/login/components/logout-other-sessions';
+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_I18N } from '@keycloakify/angular/login/tokens/i18n';
+import { KC_LOGIN_CONTEXT } from '@keycloakify/angular/login/tokens/kc-context';
 
 @Component({
     standalone: true,
-    imports: [
-        TemplateComponent,
-        MsgStrPipe,
-        KcClassDirective,
-        UserProfileFormFieldsComponent,
-        LogoutOtherSessionsComponent
-    ],
-    selector: 'kc-root',
+    imports: [TemplateComponent, KcClassDirective, NgComponentOutlet, LogoutOtherSessionsComponent],
+    selector: 'kc-update-email',
     templateUrl: 'update-email.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
     providers: [
@@ -40,13 +26,28 @@ import { MsgStrPipe } from '@keycloakify/angular/login/pipes/msg-str.pipe';
     ]
 })
 export class UpdateEmailComponent extends ComponentReference {
-    kcContext = inject<Extract<KcContext, { pageId: 'update-email.ftl' }>>(KC_CONTEXT);
-    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;
-    displayMessage: boolean = this.kcContext.messagesPerField.exists('global');
+    #submitService = inject(SubmitService);
+    kcContext = inject<Extract<KcContext, { pageId: 'update-email.ftl' }>>(KC_LOGIN_CONTEXT);
+    i18n = inject<I18n>(LOGIN_I18N);
+
+    documentTitle: string | undefined;
+    bodyClassName: string | undefined;
+
+    displayRequiredFields = true;
+    displayInfo = false;
+    displayMessage = this.kcContext.messagesPerField.exists('global');
+
+    headerNode? = viewChild<TemplateRef<HTMLElement>>('headerNode');
+    infoNode? = viewChild<TemplateRef<HTMLElement>>('infoNode');
+    socialProvidersNode? = viewChild<TemplateRef<HTMLElement>>('socialProvidersNode');
+
+    userProfileFormFields = input<Type<UserProfileFormFieldsComponent>>();
     isFormSubmittable = signal(false);
+
+    constructor() {
+        super();
+        this.#submitService.isSubmittable.pipe(takeUntilDestroyed()).subscribe(submittable => {
+            this.isFormSubmittable.set(submittable);
+        });
+    }
 }

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

@@ -2,161 +2,148 @@
 @let authenticators = kcContext.authenticators;
 @let shouldDisplayAuthenticators = kcContext.shouldDisplayAuthenticators;
 
-<kc-login-template
-  [displayInfo]="displayInfo"
-  [bodyClassName]="bodyClassName()"
-  [displayMessage]="displayMessage"
-  [displayRequiredFields]="displayRequiredFields()"
-  [documentTitle]="documentTitle()"
->
-  <ng-container headerNode>
-    {{ 'webauthn-login-title' | msgStr }}
-  </ng-container>
-  <ng-container infoNode>
+<ng-template #headerNode>
+    {{ i18n.msgStr('webauthn-login-title') }}
+</ng-template>
+<ng-template #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 content>
-    <div
-      id="kc-form-webauthn"
-      [kcClass]="'kcFormClass'"
-    >
-      <form
+</ng-template>
+<div
+    id="kc-form-webauthn"
+    [kcClass]="'kcFormClass'"
+>
+    <form
         id="webauth"
-        [action]="url.loginAction"
         method="post"
-      >
+        [action]="url.loginAction"
+    >
         <input
-          type="hidden"
-          id="clientDataJSON"
-          name="clientDataJSON"
+            type="hidden"
+            id="clientDataJSON"
+            name="clientDataJSON"
         />
         <input
-          type="hidden"
-          id="authenticatorData"
-          name="authenticatorData"
+            type="hidden"
+            id="authenticatorData"
+            name="authenticatorData"
         />
         <input
-          type="hidden"
-          id="signature"
-          name="signature"
+            type="hidden"
+            id="signature"
+            name="signature"
         />
         <input
-          type="hidden"
-          id="credentialId"
-          name="credentialId"
+            type="hidden"
+            id="credentialId"
+            name="credentialId"
         />
         <input
-          type="hidden"
-          id="userHandle"
-          name="userHandle"
+            type="hidden"
+            id="userHandle"
+            name="userHandle"
         />
         <input
-          type="hidden"
-          id="error"
-          name="error"
+            type="hidden"
+            id="error"
+            name="error"
         />
-      </form>
+    </form>
 
-      <div
+    <div
         class="no-bottom-margin"
         [kcClass]="'kcFormGroupClass'"
-      >
+    >
         @if (authenticators) {
-          <form
-            id="authn_select"
-            [kcClass]="'kcFormClass'"
-          >
-            @for (authenticator of authenticators.authenticators; track authenticator.credentialId) {
-              <input
-                type="hidden"
-                name="authn_use_chk"
-                [value]="authenticator.credentialId"
-              />
-            }
-            @if (shouldDisplayAuthenticators) {
-              @if (authenticators.authenticators.length > 1) {
-                <p [kcClass]="'kcSelectAuthListItemTitle'">{{ 'webauthn-available-authenticators' | msgStr }}</p>
-              }
-              <div [kcClass]="'kcFormOptionsClass'">
-                @for (
-                  authenticator of authenticators.authenticators;
-                  track authenticator.credentialId;
-                  let i = $index
-                ) {
-                  <div
-                    [id]="'kc-webauthn-authenticator-item-' + i"
-                    [kcClass]="'kcSelectAuthListItemClass'"
-                  >
-                    <div [kcClass]="'kcSelectAuthListItemIconClass'">
-                      <i
-                        [ngClass]="selectAuthListItemIconClass(authenticator.transports.iconClass)"
-                        [kcClass]="'kcSelectAuthListItemIconPropertyClass'"
-                      ></i>
-                      <div [kcClass]="'kcSelectAuthListItemArrowIconClass'">
-                        <div
-                          [id]="'kc-webauthn-authenticator-label-' + i"
-                          [kcClass]="'kcSelectAuthListItemHeadingClass'"
-                        >
-                          {{ authenticator.label | advancedMsgStr }}
-                        </div>
-                        @if (authenticator.transports.displayNameProperties?.length) {
-                          <div
-                            [id]="'kc-webauthn-authenticator-transport-' + i"
-                            [kcClass]="'kcSelectAuthListItemDescriptionClass'"
-                          >
-                            @for (
-                              displayNameProperty of authenticator.transports.displayNameProperties;
-                              track displayNameProperty;
-                              let last = $last
-                            ) {
-                              {{ displayNameProperty | advancedMsgStr }}
-                              @if (!last) {
-                                <span>, </span>
-                              }
-                            }
-                          </div>
-                          <div [kcClass]="'kcSelectAuthListItemDescriptionClass'">
-                            <span [id]="'kc-webauthn-authenticator-createdlabel-' + i">
-                              {{ 'webauthn-createdAt-label' | msgStr }}
-                            </span>
-                            <span [id]="'kc-webauthn-authenticator-created-' + i">{{ authenticator.createdAt }}</span>
-                          </div>
-                          <div [kcClass]="'kcSelectAuthListItemFillClass'"></div>
+            <form
+                id="authn_select"
+                [kcClass]="'kcFormClass'"
+            >
+                @for (authenticator of authenticators.authenticators; track authenticator.credentialId) {
+                    <input
+                        type="hidden"
+                        name="authn_use_chk"
+                        [value]="authenticator.credentialId"
+                    />
+                }
+                @if (shouldDisplayAuthenticators) {
+                    @if (authenticators.authenticators.length > 1) {
+                        <p [kcClass]="'kcSelectAuthListItemTitle'">
+                            {{ i18n.msgStr('webauthn-available-authenticators') }}
+                        </p>
+                    }
+                    <div [kcClass]="'kcFormOptionsClass'">
+                        @for (authenticator of authenticators.authenticators; track authenticator.credentialId; let i = $index) {
+                            <div
+                                [id]="'kc-webauthn-authenticator-item-' + i"
+                                [kcClass]="'kcSelectAuthListItemClass'"
+                            >
+                                <div [kcClass]="'kcSelectAuthListItemIconClass'">
+                                    <i
+                                        [ngClass]="selectAuthListItemIconClass(authenticator.transports.iconClass)"
+                                        [kcClass]="'kcSelectAuthListItemIconPropertyClass'"
+                                    ></i>
+                                    <div [kcClass]="'kcSelectAuthListItemArrowIconClass'">
+                                        <div
+                                            [id]="'kc-webauthn-authenticator-label-' + i"
+                                            [kcClass]="'kcSelectAuthListItemHeadingClass'"
+                                        >
+                                            {{ i18n.advancedMsgStr(authenticator.label) }}
+                                        </div>
+                                        @if (authenticator.transports.displayNameProperties?.length) {
+                                            <div
+                                                [id]="'kc-webauthn-authenticator-transport-' + i"
+                                                [kcClass]="'kcSelectAuthListItemDescriptionClass'"
+                                            >
+                                                @for (
+                                                    displayNameProperty of authenticator.transports.displayNameProperties;
+                                                    track displayNameProperty;
+                                                    let last = $last
+                                                ) {
+                                                    {{ i18n.advancedMsgStr(displayNameProperty) }}
+                                                    @if (!last) {
+                                                        <span>, </span>
+                                                    }
+                                                }
+                                            </div>
+                                            <div [kcClass]="'kcSelectAuthListItemDescriptionClass'">
+                                                <span [id]="'kc-webauthn-authenticator-createdlabel-' + i">
+                                                    {{ i18n.msgStr('webauthn-createdAt-label') }}
+                                                </span>
+                                                <span [id]="'kc-webauthn-authenticator-created-' + i">{{ authenticator.createdAt }}</span>
+                                            </div>
+                                            <div [kcClass]="'kcSelectAuthListItemFillClass'"></div>
+                                        }
+                                    </div>
+                                </div>
+                            </div>
                         }
-                      </div>
                     </div>
-                  </div>
                 }
-              </div>
-            }
-          </form>
+            </form>
         }
 
         <div
-          [kcClass]="'kcFormButtonsClass'"
-          id="kc-form-buttons"
+            id="kc-form-buttons"
+            [kcClass]="'kcFormButtonsClass'"
         >
-          <input
-            [id]="authButtonId"
-            type="button"
-            autofocus
-            [kcClass]="['kcButtonClass', 'kcButtonDefaultClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
-            id="cancelWebAuthnAIA"
-            name="cancel-aia"
-            [value]="'webauthn-doAuthenticate' | msgStr"
-          />
+            <input
+                type="button"
+                autofocus
+                name="cancel-aia"
+                [id]="authButtonId"
+                [kcClass]="['kcButtonClass', 'kcButtonDefaultClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
+                [value]="i18n.msgStr('webauthn-doAuthenticate')"
+            />
         </div>
-      </div>
     </div>
-  </ng-container>
-</kc-login-template>
+</div>