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

package/src/login/pages/frontchannel-logout/frontchannel-logout.component.ts

@@ -1,28 +1,20 @@
-import {
-    ChangeDetectionStrategy,
-    Component,
-    forwardRef,
-    inject,
-    input,
-    OnInit
-} 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 { 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, OnInit } 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 { TemplateComponent } from '@keycloakify/angular/login/containers/template.component';
+import { KcSanitizePipe } from '@keycloakify/angular/lib/pipes/kc-sanitize.pipe';
+import { LOGIN_I18N } from '@keycloakify/angular/login/tokens/i18n.token';
+import { type I18n } from '../../i18n';
+import { LOGIN_CLASSES } from '@keycloakify/angular/login/tokens/classes.token';
+import { KC_LOGIN_CONTEXT } from '@keycloakify/angular/login/tokens/kc-context.token';
+import { type ClassKey } from 'keycloakify/login/lib/kcClsx';
+import { type KcContext } from '../../KcContext';
 
 @Component({
     standalone: true,
-    imports: [TemplateComponent, MsgStrPipe, KcSanitizePipe],
-    selector: "kc-root",
-    templateUrl: "frontchannel-logout.component.html",
+    imports: [TemplateComponent, KcSanitizePipe],
+    selector: 'kc-root',
+    templateUrl: 'frontchannel-logout.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
     providers: [
         {
@@ -32,10 +24,10 @@ import { MsgStrPipe } from "@keycloakify/angular/login/pipes/msg-str.pipe";
     ]
 })
 export class FrontchannelLogoutComponent extends ComponentReference implements OnInit {
-    kcContext =
-        inject<Extract<KcContext, { pageId: "frontchannel-logout.ftl" }>>(KC_CONTEXT);
+    kcContext = inject<Extract<KcContext, { pageId: 'frontchannel-logout.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);
     bodyClassName = input<string>();
     displayInfo: boolean = false;

package/src/login/pages/idp-review-user-profile/idp-review-user-profile.component.html

@@ -1,41 +1,41 @@
 @let url = kcContext.url;
 <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>
-    {{ 'loginIdpReviewProfileTitle' | msgStr }}
-  </ng-container>
-  <ng-container content>
-    <form
-      id="kc-idp-review-profile-form"
-      [kcClass]="'kcFormClass'"
-      [action]="url.loginAction"
-      method="post"
-    >
-      <kc-user-profile-form-fields (onIsFormSubmittable)="isFormSubmittable.set($event)" />
-      <div [kcClass]="'kcFormGroupClass'">
-        <div
-          id="kc-form-options"
-          [kcClass]="'kcFormOptionsClass'"
+    <ng-container headerNode>
+        {{ i18n.msgStr('loginIdpReviewProfileTitle') }}
+    </ng-container>
+    <ng-container content>
+        <form
+            id="kc-idp-review-profile-form"
+            [kcClass]="'kcFormClass'"
+            [action]="url.loginAction"
+            method="post"
         >
-          <div [kcClass]="'kcFormOptionsWrapperClass'"></div>
-        </div>
-        <div
-          id="kc-form-buttons"
-          [kcClass]="'kcFormButtonsClass'"
-        >
-          <input
-            [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
-            type="submit"
-            value="{{ 'doSubmit' | msgStr }}"
-            [disabled]="!isFormSubmittable"
-          />
-        </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
+                        [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
+                        type="submit"
+                        [value]="i18n.msgStr('doSubmit')"
+                        [disabled]="!isFormSubmittable()"
+                    />
+                </div>
+            </div>
+        </form>
+    </ng-container>
 </kc-login-template>

package/src/login/pages/idp-review-user-profile/idp-review-user-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/kc-class.directive";
-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,
-        MsgStrPipe,
-        UserProfileFormFieldsComponent,
-        KcClassDirective
-    ],
-    selector: "kc-root",
-    templateUrl: "idp-review-user-profile.component.html",
+    imports: [TemplateComponent, KcClassDirective, NgComponentOutlet],
+    selector: 'kc-root',
+    templateUrl: 'idp-review-user-profile.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
     providers: [
         {
@@ -38,18 +28,29 @@ import { MsgStrPipe } from "@keycloakify/angular/login/pipes/msg-str.pipe";
     ]
 })
 export class IdpReviewUserProfileComponent extends ComponentReference {
-    kcContext =
-        inject<Extract<KcContext, { pageId: "idp-review-user-profile.ftl" }>>(KC_CONTEXT);
+    #submitService = inject(SubmitService);
+
+    kcContext = inject<Extract<KcContext, { pageId: 'idp-review-user-profile.ftl' }>>(KC_LOGIN_CONTEXT);
     displayRequiredFields = input(true);
     documentTitle = input<string>();
     bodyClassName = input<string>();
+    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);
     isFormSubmittable = signal(false);
     displayInfo: boolean = false;
-    displayMessage: boolean = !this.kcContext?.messagesPerField?.existsError("global");
+    displayMessage: boolean = !this.kcContext?.messagesPerField?.existsError('global');
+
+    userProfileFormFields = input<Type<UserProfileFormFieldsComponent>>();
+
+    constructor() {
+        super();
+        this.#submitService.isSubmittable.pipe(takeUntilDestroyed()).subscribe(submittable => {
+            this.isFormSubmittable.set(submittable);
+        });
+    }
 
     onCallback() {
-        (document.getElementById("kc-register-form") as HTMLFormElement).submit();
+        (document.getElementById('kc-register-form') as HTMLFormElement).submit();
     }
 }

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

@@ -5,50 +5,50 @@
 @let messageHeader = kcContext.messageHeader;
 @let message = kcContext.message;
 <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>
-    <span [innerHTML]="messageHeader ?? message.summary | advancedMsgStr | kcSanitize: 'html'"> </span>
-  </ng-container>
-  <ng-container content>
-    <div id="kc-info-message">
-      <p
-        class="instruction"
-        [innerHTML]="infoMessage | kcSanitize: 'html'"
-      ></p>
-      @if (!skipLink) {
-        @if (pageRedirectUri) {
-          <p>
-            <a
-              [href]="pageRedirectUri"
-              [innerHTML]="'backToApplication' | msgStr | kcSanitize: 'html'"
-            >
-            </a>
-          </p>
-        }
-        @if (actionUri) {
-          <p>
-            <a
-              [href]="actionUri"
-              [innerHTML]="'proceedWithAction' | msgStr | kcSanitize: 'html'"
-            >
-            </a>
-          </p>
-        }
-        @if (client.baseUrl) {
-          <p>
-            <a
-              [href]="client.baseUrl"
-              [innerHTML]="'backToApplication' | msgStr | kcSanitize: 'html'"
-            >
-            </a>
-          </p>
-        }
-      }
-    </div>
-  </ng-container>
+    <ng-container headerNode>
+        <span [innerHTML]="messageHeader ?? i18n.advancedMsgStr(message.summary) | kcSanitize: 'html'"> </span>
+    </ng-container>
+    <ng-container content>
+        <div id="kc-info-message">
+            <p
+                class="instruction"
+                [innerHTML]="infoMessage | kcSanitize: 'html'"
+            ></p>
+            @if (!skipLink) {
+                @if (pageRedirectUri) {
+                    <p>
+                        <a
+                            [href]="pageRedirectUri"
+                            [innerHTML]="i18n.msgStr('backToApplication') | kcSanitize: 'html'"
+                        >
+                        </a>
+                    </p>
+                }
+                @if (actionUri) {
+                    <p>
+                        <a
+                            [href]="actionUri"
+                            [innerHTML]="i18n.msgStr('proceedWithAction') | kcSanitize: 'html'"
+                        >
+                        </a>
+                    </p>
+                }
+                @if (client.baseUrl) {
+                    <p>
+                        <a
+                            [href]="client.baseUrl"
+                            [innerHTML]="i18n.msgStr('backToApplication') | kcSanitize: 'html'"
+                        >
+                        </a>
+                    </p>
+                }
+            }
+        </div>
+    </ng-container>
 </kc-login-template>

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

@@ -1,33 +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 { TemplateComponent } from "@keycloakify/angular/login/containers/template.component";
-import { AdvancedMsgStrPipe } from "@keycloakify/angular/login/pipes/advanced-msg-str.pipe";
-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 { TemplateComponent } from '@keycloakify/angular/login/containers/template.component';
+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, KcSanitizePipe, AdvancedMsgStrPipe],
-    selector: "kc-root",
-    templateUrl: "info.component.html",
+    imports: [TemplateComponent, KcSanitizePipe],
+    selector: 'kc-root',
+    templateUrl: 'info.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
     providers: [
-        AdvancedMsgStrPipe,
-        MsgStrPipe,
-        KcSanitizePipe,
         {
             provide: ComponentReference,
             useExisting: forwardRef(() => InfoComponent)
@@ -35,12 +24,10 @@ import { MsgStrPipe } from "@keycloakify/angular/login/pipes/msg-str.pipe";
     ]
 })
 export class InfoComponent extends ComponentReference {
-    kcContext = inject<Extract<KcContext, { pageId: "info.ftl" }>>(KC_CONTEXT);
-    advancedMsgStr = inject(AdvancedMsgStrPipe);
-    kcSanitize = inject(KcSanitizePipe);
-    msgStr = inject(MsgStrPipe);
+    kcContext = inject<Extract<KcContext, { pageId: 'info.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>();
@@ -50,15 +37,11 @@ export class InfoComponent extends ComponentReference {
     get infoMessage() {
         let html = this.kcContext.message.summary;
         if (this.kcContext.requiredActions) {
-            html += "<b>";
+            html += '<b>';
 
-            html += this.kcContext.requiredActions
-                .map(requiredAction =>
-                    this.advancedMsgStr.transform(`requiredAction.${requiredAction}`)
-                )
-                .join(", ");
+            html += this.kcContext.requiredActions.map(requiredAction => this.i18n.advancedMsgStr(`requiredAction.${requiredAction}`)).join(', ');
 
-            html += "</b>";
+            html += '</b>';
         }
         return html;
     }