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

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

@@ -2,59 +2,59 @@
 @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>
-    {{ 'webauthn-error-title' | msgStr }}
-  </ng-container>
-  <ng-container content>
-    <form
-      id="kc-error-credential-form"
-      [kcClass]="'kcFormClass'"
-      [action]="url.loginAction"
-      method="post"
-    >
-      <input
-        type="hidden"
-        id="executionValue"
-        name="authenticationExecution"
-      />
-      <input
-        type="hidden"
-        id="isSetRetry"
-        name="isSetRetry"
-      />
-    </form>
-    <input
-      tabIndex="4"
-      (click)="onClick()"
-      type="button"
-      [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
-      name="try-again"
-      id="kc-try-again"
-      [value]="'doTryAgain' | msgStr"
-    />
-    @if (isAppInitiatedAction) {
-      <form
-        [action]="url.loginAction"
-        [kcClass]="'kcFormClass'"
-        id="kc-webauthn-settings-form"
-        method="post"
-      >
-        <button
-          type="submit"
-          [kcClass]="['kcButtonClass', 'kcButtonDefaultClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
-          id="cancelWebAuthnAIA"
-          name="cancel-aia"
-          value="true"
+    <ng-container headerNode>
+        {{ i18n.msgStr('webauthn-error-title') }}
+    </ng-container>
+    <ng-container content>
+        <form
+            id="kc-error-credential-form"
+            [kcClass]="'kcFormClass'"
+            [action]="url.loginAction"
+            method="post"
         >
-          {{ 'doCancel' | msgStr }}
-        </button>
-      </form>
-    }
-  </ng-container>
+            <input
+                type="hidden"
+                id="executionValue"
+                name="authenticationExecution"
+            />
+            <input
+                type="hidden"
+                id="isSetRetry"
+                name="isSetRetry"
+            />
+        </form>
+        <input
+            tabIndex="4"
+            (click)="onClick()"
+            type="button"
+            [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
+            name="try-again"
+            id="kc-try-again"
+            [value]="i18n.msgStr('doTryAgain')"
+        />
+        @if (isAppInitiatedAction) {
+            <form
+                [action]="url.loginAction"
+                [kcClass]="'kcFormClass'"
+                id="kc-webauthn-settings-form"
+                method="post"
+            >
+                <button
+                    type="submit"
+                    [kcClass]="['kcButtonClass', 'kcButtonDefaultClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
+                    id="cancelWebAuthnAIA"
+                    name="cancel-aia"
+                    value="true"
+                >
+                    {{ i18n.msgStr('doCancel') }}
+                </button>
+            </form>
+        }
+    </ng-container>
 </kc-login-template>

package/src/login/pages/webauthn-error/webauthn-error.component.ts

@@ -1,33 +1,21 @@
-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 { 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, 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 { TemplateComponent } from '@keycloakify/angular/login/containers/template.component';
+import { KcClassDirective } from '@keycloakify/angular/login/directives/kc-class.directive';
+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,
-        KcClassDirective,
-        LogoutOtherSessionsComponent
-    ],
-    selector: "kc-root",
-    templateUrl: "webauthn-error.component.html",
+    imports: [TemplateComponent, KcClassDirective, LogoutOtherSessionsComponent],
+    selector: 'kc-root',
+    templateUrl: 'webauthn-error.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
     providers: [
         {
@@ -37,9 +25,10 @@ import { MsgStrPipe } from "@keycloakify/angular/login/pipes/msg-str.pipe";
     ]
 })
 export class WebauthnErrorComponent extends ComponentReference {
-    kcContext = inject<Extract<KcContext, { pageId: "webauthn-error.ftl" }>>(KC_CONTEXT);
+    kcContext = inject<Extract<KcContext, { pageId: 'webauthn-error.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>();
@@ -48,10 +37,10 @@ export class WebauthnErrorComponent extends ComponentReference {
 
     onClick() {
         // @ts-expect-error: Trusted Keycloak's code
-        document.getElementById("isSetRetry").value = "retry";
+        document.getElementById('isSetRetry').value = 'retry';
         // @ts-expect-error: Trusted Keycloak's code
-        document.getElementById("executionValue").value = "${execution}";
+        document.getElementById('executionValue').value = '${execution}';
         // @ts-expect-error: Trusted Keycloak's code
-        document.getElementById("kc-error-credential-form").submit();
+        document.getElementById('kc-error-credential-form').submit();
     }
 }

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

@@ -3,80 +3,80 @@
 @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>
-    <span [kcClass]="'kcWebAuthnKeyIcon'"></span>
-    {{ 'webauthn-registration-title' | msgStr }}
-  </ng-container>
-  <ng-container content>
-    <form
-      id="register"
-      [kcClass]="'kcFormClass'"
-      [action]="url.loginAction"
-      method="post"
-    >
-      <div [kcClass]="'kcFormGroupClass'">
-        <input
-          type="hidden"
-          id="clientDataJSON"
-          name="clientDataJSON"
-        />
-        <input
-          type="hidden"
-          id="attestationObject"
-          name="attestationObject"
-        />
-        <input
-          type="hidden"
-          id="publicKeyCredentialId"
-          name="publicKeyCredentialId"
-        />
-        <input
-          type="hidden"
-          id="authenticatorLabel"
-          name="authenticatorLabel"
-        />
-        <input
-          type="hidden"
-          id="transports"
-          name="transports"
-        />
+    <ng-container headerNode>
+        <span [kcClass]="'kcWebAuthnKeyIcon'"></span>
+        {{ i18n.msgStr('webauthn-registration-title') }}
+    </ng-container>
+    <ng-container content>
+        <form
+            id="register"
+            [kcClass]="'kcFormClass'"
+            [action]="url.loginAction"
+            method="post"
+        >
+            <div [kcClass]="'kcFormGroupClass'">
+                <input
+                    type="hidden"
+                    id="clientDataJSON"
+                    name="clientDataJSON"
+                />
+                <input
+                    type="hidden"
+                    id="attestationObject"
+                    name="attestationObject"
+                />
+                <input
+                    type="hidden"
+                    id="publicKeyCredentialId"
+                    name="publicKeyCredentialId"
+                />
+                <input
+                    type="hidden"
+                    id="authenticatorLabel"
+                    name="authenticatorLabel"
+                />
+                <input
+                    type="hidden"
+                    id="transports"
+                    name="transports"
+                />
+                <input
+                    type="hidden"
+                    id="error"
+                    name="error"
+                />
+                <kc-logout-other-sessions />
+            </div>
+        </form>
         <input
-          type="hidden"
-          id="error"
-          name="error"
+            type="submit"
+            [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
+            [id]="authButtonId"
+            [value]="i18n.msgStr('doRegisterSecurityKey')"
         />
-        <kc-logout-other-sessions />
-      </div>
-    </form>
-    <input
-      type="submit"
-      [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
-      [id]="authButtonId"
-      [value]="'doRegisterSecurityKey' | msgStr"
-    />
-    @if (!isSetRetry && isAppInitiatedAction) {
-      <form
-        [action]="url.loginAction"
-        [kcClass]="'kcFormClass'"
-        id="kc-webauthn-settings-form"
-        method="post"
-      >
-        <button
-          type="submit"
-          [kcClass]="['kcButtonClass', 'kcButtonDefaultClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
-          id="cancelWebAuthnAIA"
-          name="cancel-aia"
-          value="true"
-        >
-          {{ 'doCancel' | msgStr }}
-        </button>
-      </form>
-    }
-  </ng-container>
+        @if (!isSetRetry && isAppInitiatedAction) {
+            <form
+                [action]="url.loginAction"
+                [kcClass]="'kcFormClass'"
+                id="kc-webauthn-settings-form"
+                method="post"
+            >
+                <button
+                    type="submit"
+                    [kcClass]="['kcButtonClass', 'kcButtonDefaultClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
+                    id="cancelWebAuthnAIA"
+                    name="cancel-aia"
+                    value="true"
+                >
+                    {{ i18n.msgStr('doCancel') }}
+                </button>
+            </form>
+        }
+    </ng-container>
 </kc-login-template>

package/src/login/pages/webauthn-register/webauthn-register.component.ts

@@ -1,38 +1,25 @@
-import {
-    ChangeDetectionStrategy,
-    Component,
-    forwardRef,
-    inject,
-    input
-} from "@angular/core";
-import {
-    CLASSES,
-    KC_CONTEXT,
-    USE_DEFAULT_CSS
-} from "@keycloakify/angular/lib/public-api";
-import { Script } from "@keycloakify/angular/lib/models";
-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 { 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 { LoginResourceInjectorService } from "@keycloakify/angular/login/services";
+import { ChangeDetectionStrategy, Component, forwardRef, inject, input } from '@angular/core';
+import { type Script } from '@keycloakify/angular/lib/models/script.model';
+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 { TemplateComponent } from '@keycloakify/angular/login/containers/template.component';
+import { KcClassDirective } from '@keycloakify/angular/login/directives/kc-class.directive';
+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 { type ClassKey } from 'keycloakify/login/lib/kcClsx';
+import { type I18n } from '../../i18n';
+import { type KcContext } from '../../KcContext';
 
 @Component({
     standalone: true,
-    imports: [
-        TemplateComponent,
-        MsgStrPipe,
-        KcClassDirective,
-        LogoutOtherSessionsComponent
-    ],
-    selector: "kc-root",
-    templateUrl: "webauthn-register.component.html",
+    imports: [TemplateComponent, KcClassDirective, LogoutOtherSessionsComponent],
+    selector: 'kc-root',
+    templateUrl: 'webauthn-register.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
     providers: [
-        MsgStrPipe,
         {
             provide: ComponentReference,
             useExisting: forwardRef(() => WebauthnRegisterComponent)
@@ -40,19 +27,18 @@ import { LoginResourceInjectorService } from "@keycloakify/angular/login/service
     ]
 })
 export class WebauthnRegisterComponent extends ComponentReference {
-    kcContext =
-        inject<Extract<KcContext, { pageId: "webauthn-register.ftl" }>>(KC_CONTEXT);
+    kcContext = inject<Extract<KcContext, { pageId: 'webauthn-register.ftl' }>>(KC_LOGIN_CONTEXT);
     loginResourceInjectorService = inject(LoginResourceInjectorService);
-    msgStr = inject(MsgStrPipe);
+    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: boolean = false;
     displayMessage: boolean = true;
 
-    authButtonId = "authenticateWebAuthnButton";
+    authButtonId = 'authenticateWebAuthnButton';
 
     constructor() {
         super();
@@ -73,8 +59,8 @@ export class WebauthnRegisterComponent extends ComponentReference {
         } = this.kcContext;
         const scripts: Script[] = [
             {
-                type: "module",
-                id: "WebAuthnRegisterScript",
+                type: 'module',
+                id: 'WebAuthnRegisterScript',
                 textContent: `
               import { registerByWebAuthn } from "${url.resourcesPath}/js/webauthnRegister.js";
               const registerButton = document.getElementById('${this.authButtonId}');
@@ -92,9 +78,9 @@ export class WebauthnRegisterComponent extends ComponentReference {
                       userVerificationRequirement : ${JSON.stringify(userVerificationRequirement)},
                       createTimeout : ${createTimeout},
                       excludeCredentialIds : ${JSON.stringify(excludeCredentialIds)},
-                      initLabel : ${JSON.stringify(this.msgStr.transform("webauthn-registration-init-label"))},
-                      initLabelPrompt : ${JSON.stringify(this.msgStr.transform("webauthn-registration-init-label-prompt"))},
-                      errmsg : ${JSON.stringify(this.msgStr.transform("webauthn-unsupported-browser-text"))}
+                      initLabel : ${JSON.stringify(this.i18n.msgStr('webauthn-registration-init-label'))},
+                      initLabelPrompt : ${JSON.stringify(this.i18n.msgStr('webauthn-registration-init-label-prompt'))},
+                      errmsg : ${JSON.stringify(this.i18n.msgStr('webauthn-unsupported-browser-text'))}
                   };
                   registerByWebAuthn(input);
               });

package/src/login/providers/keycloakify-angular.providers.ts

@@ -0,0 +1,68 @@
+import { DOCUMENT } from '@angular/common';
+import { APP_INITIALIZER, LOCALE_ID, makeEnvironmentProviders } from '@angular/core';
+import { USE_DEFAULT_CSS } from '@keycloakify/angular/lib/tokens/use-default-css.token';
+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 KcContextLike } from 'keycloakify/login/i18n/noJsx';
+import { type ClassKey } from 'keycloakify/login/lib/kcClsx';
+import { type KcContext } from '../KcContext';
+import { I18nService } from '@keycloakify/angular/login/services/i18n.service';
+
+export type KeycloakifyAngularLoginConfig = {
+    doMakeUserConfirmPassword?: boolean;
+    doUseDefaultCss?: boolean;
+    classes?: { [key in ClassKey]?: string };
+    getI18n: (params: { kcContext: KcContextLike }) => {
+        i18n: unknown;
+        prI18n_currentLanguage: Promise<unknown> | undefined;
+    };
+};
+
+export const provideKeycloakifyAngularLogin = (config: KeycloakifyAngularLoginConfig) =>
+    makeEnvironmentProviders([
+        {
+            provide: KC_LOGIN_CONTEXT,
+            // @ts-ignore
+            useValue: window.kcContext
+        },
+        {
+            provide: DO_MAKE_USER_CONFIRM_PASSWORD,
+            useValue: config?.doMakeUserConfirmPassword ?? true
+        },
+        {
+            provide: LOCALE_ID,
+            useFactory: (document: Document) => {
+                return document.documentElement.lang ?? 'en';
+            },
+            deps: [DOCUMENT]
+        },
+        {
+            provide: APP_INITIALIZER,
+            multi: true,
+            useFactory: (i18nService: I18nService, kcContext: KcContext) => async () => {
+                const getI18n = config.getI18n;
+
+                const { i18n, prI18n_currentLanguage } = getI18n({
+                    kcContext
+                });
+                let i18nPromise = new Promise<typeof i18n>(resolve => resolve(i18n));
+                if (prI18n_currentLanguage) {
+                    i18nPromise = prI18n_currentLanguage;
+                }
+                return i18nPromise.then(i18n => {
+                    i18nService.i18n = i18n;
+                    return true;
+                });
+            },
+            deps: [I18nService, KC_LOGIN_CONTEXT]
+        },
+        {
+            provide: LOGIN_I18N,
+            useFactory: (i18nService: I18nService) => i18nService.i18n,
+            deps: [I18nService]
+        },
+        { provide: USE_DEFAULT_CSS, useValue: config?.doUseDefaultCss ?? true },
+        { provide: LOGIN_CLASSES, useValue: config?.classes ?? {} }
+    ]);

package/src/login/services/i18n.service.ts

@@ -0,0 +1,7 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({ providedIn: 'root' })
+/** INTERNAL: DO NOT IMPORT THIS */
+export class I18nService {
+    i18n!: unknown;
+}

package/src/login/services/login-resource-injector.service.ts

@@ -1,14 +1,15 @@
-import { inject, Injectable } from "@angular/core";
-import { KC_CONTEXT } from "@keycloakify/angular/lib/public-api";
-import { ResourceInjectorService, Script } from "@keycloakify/angular/lib/public-api";
-import { KcContext } from "keycloakify/login/KcContext";
-import { catchError, forkJoin, of, switchMap } from "rxjs";
+import { inject, Injectable } from '@angular/core';
+import { KC_LOGIN_CONTEXT } from '@keycloakify/angular/login/tokens/kc-context.token';
+import { ResourceInjectorService } from '@keycloakify/angular/lib/services/resource-injector.service';
+import { type KcContext } from '../KcContext';
+import { catchError, forkJoin, of, switchMap } from 'rxjs';
+import { type Script } from '@keycloakify/angular/lib/models/script.model';
 
 @Injectable({
-    providedIn: "root"
+    providedIn: 'root'
 })
 export class LoginResourceInjectorService {
-    private kcContext: KcContext = inject<KcContext>(KC_CONTEXT);
+    private kcContext: KcContext = inject<KcContext>(KC_LOGIN_CONTEXT);
     private resourceInjectorService: ResourceInjectorService = inject(
         ResourceInjectorService
     );
@@ -34,7 +35,7 @@ export class LoginResourceInjectorService {
                 return of(true);
             }),
             catchError(error => {
-                console.error("Error loading styles:", error);
+                console.error('Error loading styles:', error);
                 return of(false);
             })
         );
@@ -47,18 +48,18 @@ export class LoginResourceInjectorService {
     private injectScripts() {
         const scripts: Script[] = [
             {
-                type: "module",
+                type: 'module',
                 id: `${this.kcContext.url.resourcesPath}/js/menu-button-links.js`,
                 src: `${this.kcContext.url.resourcesPath}/js/menu-button-links.js`
             },
             ...this.kcContext.scripts.map(script => ({
-                type: "text/javascript",
+                type: 'text/javascript',
                 src: script,
                 id: script
             })),
             {
-                type: "module",
-                id: "authenticationSession",
+                type: 'module',
+                id: 'authenticationSession',
                 textContent: `
         import { checkCookiesAndSetTimer } from "${this.kcContext.url.resourcesPath}/js/authChecker.js";
           

package/src/login/services/submit.service.ts

@@ -0,0 +1,12 @@
+import { Injectable } from '@angular/core';
+import { Observable, BehaviorSubject } from 'rxjs';
+
+@Injectable({ providedIn: 'root' })
+export class SubmitService {
+    #submittableSubj: BehaviorSubject<boolean> = new BehaviorSubject(false);
+    isSubmittable: Observable<boolean> = this.#submittableSubj.asObservable();
+
+    setIsSubmittable(submittable: boolean) {
+        this.#submittableSubj.next(submittable);
+    }
+}