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

package/src/login/pages/login-passkeys-conditional-authenticate/login-passkeys-conditional-authenticate.component.html

@@ -7,197 +7,199 @@
 @let usernameHidden = kcContext.usernameHidden;
 @let registrationDisabled = kcContext.registrationDisabled;
 <kc-login-template [displayInfo]="displayInfo">
-  <ng-container headerNode>
-    {{ 'passkey-login-title' | msgStr }}
-  </ng-container>
-  <ng-container infoNode>
-    @if (realm.registrationAllowed && !registrationDisabled) {
-      <div id="kc-registration">
-        <span>
-          {{ 'noAccount' | msgStr }}
-          <a
-            tabIndex="6"
-            [href]="url.registrationUrl"
-          >
-            {{ 'doRegister' | msgStr }}
-          </a>
-        </span>
-      </div>
-    }
-  </ng-container>
+    <ng-container headerNode>
+        {{ i18n.msgStr('passkey-login-title') }}
+    </ng-container>
+    <ng-container infoNode>
+        @if (realm.registrationAllowed && !registrationDisabled) {
+            <div id="kc-registration">
+                <span>
+                    {{ i18n.msgStr('noAccount') }}
+                    <a
+                        tabIndex="6"
+                        [href]="url.registrationUrl"
+                    >
+                        {{ i18n.msgStr('doRegister') }}
+                    </a>
+                </span>
+            </div>
+        }
+    </ng-container>
 
-  <ng-container content>
-    <form
-      id="webauth"
-      [action]="url.loginAction"
-      method="post"
-    >
-      <input
-        type="hidden"
-        id="clientDataJSON"
-        name="clientDataJSON"
-      />
-      <input
-        type="hidden"
-        id="authenticatorData"
-        name="authenticatorData"
-      />
-      <input
-        type="hidden"
-        id="signature"
-        name="signature"
-      />
-      <input
-        type="hidden"
-        id="credentialId"
-        name="credentialId"
-      />
-      <input
-        type="hidden"
-        id="userHandle"
-        name="userHandle"
-      />
-      <input
-        type="hidden"
-        id="error"
-        name="error"
-      />
-    </form>
-    <div
-      [kcClass]="'kcFormGroupClass'"
-      no-bottom-margin="true"
-      style="margin-bottom: 0"
-    >
-      @if (authenticators !== undefined && authenticators.authenticators.length !== 0) {
+    <ng-container content>
         <form
-          id="authn_select"
-          [kcClass]="'kcFormClass'"
+            id="webauth"
+            [action]="url.loginAction"
+            method="post"
         >
-          @for (authenticator of authenticators.authenticators; track authenticator; let i = $index) {
             <input
-              type="hidden"
-              name="authn_use_chk"
-              readOnly
-              [value]="authenticator.credentialId"
+                type="hidden"
+                id="clientDataJSON"
+                name="clientDataJSON"
+            />
+            <input
+                type="hidden"
+                id="authenticatorData"
+                name="authenticatorData"
+            />
+            <input
+                type="hidden"
+                id="signature"
+                name="signature"
+            />
+            <input
+                type="hidden"
+                id="credentialId"
+                name="credentialId"
+            />
+            <input
+                type="hidden"
+                id="userHandle"
+                name="userHandle"
+            />
+            <input
+                type="hidden"
+                id="error"
+                name="error"
             />
-          }
         </form>
+        <div
+            [kcClass]="'kcFormGroupClass'"
+            no-bottom-margin="true"
+            style="margin-bottom: 0"
+        >
+            @if (authenticators !== undefined && authenticators.authenticators.length !== 0) {
+                <form
+                    id="authn_select"
+                    [kcClass]="'kcFormClass'"
+                >
+                    @for (authenticator of authenticators.authenticators; track authenticator; let i = $index) {
+                        <input
+                            type="hidden"
+                            name="authn_use_chk"
+                            readOnly
+                            [value]="authenticator.credentialId"
+                        />
+                    }
+                </form>
 
-        @if (shouldDisplayAuthenticators) {
-          @if (authenticators.authenticators.length > 1) {
-            <p [kcClass]="'kcSelectAuthListItemTitle'">
-              {{ 'passkey-available-authenticators' | msgStr }}
-            </p>
-          }
+                @if (shouldDisplayAuthenticators) {
+                    @if (authenticators.authenticators.length > 1) {
+                        <p [kcClass]="'kcSelectAuthListItemTitle'">
+                            {{ i18n.msgStr('passkey-available-authenticators') }}
+                        </p>
+                    }
 
-          <div [kcClass]="'kcFormClass'">
-            @for (authenticator of authenticators.authenticators; track authenticator; let i = $index) {
-              <div
-                id="'kc-webauthn-authenticator-item-' + i"
-                [kcClass]="'kcSelectAuthListItemClass'"
-              >
-                <i
-                  [ngClass]="selectAuthListItemIconClass(authenticator.transports.iconClass)"
-                  [kcClass]="'kcCommonLogoIdP'"
-                  aria-hidden="true"
-                ></i>
-                <div [kcClass]="'kcSelectAuthListItemBodyClass'">
-                  <div
-                    [id]="'kc-webauthn-authenticator-label-' + i"
-                    [kcClass]="'kcSelectAuthListItemHeadingClass'"
-                  >
-                    {{ authenticator.label | advancedMsgStr }}
-                  </div>
-                  @if (
-                    authenticator.transports !== undefined &&
-                    authenticator.transports.displayNameProperties !== undefined &&
-                    authenticator.transports.displayNameProperties.length !== 0
-                  ) {
-                    <div
-                      [id]="'kc-webauthn-authenticator-transport-' + i"
-                      [kcClass]="'kcSelectAuthListItemDescriptionClass'"
-                    >
-                      @for (
-                        nameProperty of authenticator.transports.displayNameProperties;
-                        track nameProperty;
-                        let i = $index
-                      ) {
-                        <span> {{ nameProperty | advancedMsgStr }} </span>
-                        @if (i !== authenticator.transports.displayNameProperties.length - 1) {
-                          <span>, </span>
+                    <div [kcClass]="'kcFormClass'">
+                        @for (authenticator of authenticators.authenticators; track authenticator; let i = $index) {
+                            <div
+                                id="'kc-webauthn-authenticator-item-' + i"
+                                [kcClass]="'kcSelectAuthListItemClass'"
+                            >
+                                <i
+                                    [ngClass]="selectAuthListItemIconClass(authenticator.transports.iconClass)"
+                                    [kcClass]="'kcCommonLogoIdP'"
+                                    aria-hidden="true"
+                                ></i>
+                                <div [kcClass]="'kcSelectAuthListItemBodyClass'">
+                                    <div
+                                        [id]="'kc-webauthn-authenticator-label-' + i"
+                                        [kcClass]="'kcSelectAuthListItemHeadingClass'"
+                                    >
+                                        {{ i18n.advancedMsgStr(authenticator.label) }}
+                                    </div>
+                                    @if (
+                                        authenticator.transports !== undefined &&
+                                        authenticator.transports.displayNameProperties !== undefined &&
+                                        authenticator.transports.displayNameProperties.length !== 0
+                                    ) {
+                                        <div
+                                            [id]="'kc-webauthn-authenticator-transport-' + i"
+                                            [kcClass]="'kcSelectAuthListItemDescriptionClass'"
+                                        >
+                                            @for (
+                                                nameProperty of authenticator.transports.displayNameProperties;
+                                                track nameProperty;
+                                                let i = $index
+                                            ) {
+                                                <span>
+                                                    {{ i18n.advancedMsgStr(nameProperty) }}
+                                                </span>
+                                                @if (i !== authenticator.transports.displayNameProperties.length - 1) {
+                                                    <span>, </span>
+                                                }
+                                            }
+                                        </div>
+                                        <div [kcClass]="'kcSelectAuthListItemDescriptionClass'">
+                                            <span [id]="'kc-webauthn-authenticator-createdlabel-' + i">
+                                                {{ i18n.msgStr('passkey-createdAt-label') }}
+                                            </span>
+                                            <span [id]="'kc-webauthn-authenticator-created-' + i">
+                                                {{ authenticator.createdAt }}
+                                            </span>
+                                        </div>
+                                        <div [kcClass]="'kcSelectAuthListItemFillClass'"></div>
+                                    }
+                                </div>
+                            </div>
                         }
-                      }
-                    </div>
-                    <div [kcClass]="'kcSelectAuthListItemDescriptionClass'">
-                      <span [id]="'kc-webauthn-authenticator-createdlabel-' + i">
-                        {{ 'passkey-createdAt-label' | msgStr }}
-                      </span>
-                      <span [id]="'kc-webauthn-authenticator-created-' + i">
-                        {{ authenticator.createdAt }}
-                      </span>
                     </div>
-                    <div [kcClass]="'kcSelectAuthListItemFillClass'"></div>
-                  }
-                </div>
-              </div>
-            }
-          </div>
-        }
-      }
-      <div id="kc-form-wrapper">
-        @if (realm.password) {
-          <form
-            id="kc-form-passkey"
-            [action]="url.loginAction"
-            method="post"
-            style="display: none"
-          >
-            @if (!usernameHidden) {
-              <div [kcClass]="'kcFormGroupClass'">
-                <label
-                  for="username"
-                  [kcClass]="'kcLabelClass'"
-                >
-                  {{ 'passkey-autofill-select' | msgStr }}
-                </label>
-                <input
-                  tabIndex="1"
-                  id="username"
-                  [attr.aria-invalid]="messagesPerField.existsError('username')"
-                  [kcClass]="'kcInputClass'"
-                  name="username"
-                  [value]="login.username ?? ''"
-                  type="text"
-                  autoFocus
-                  autoComplete="off"
-                />
-                @if (messagesPerField.existsError('username')) {
-                  <span
-                    id="input-error-username"
-                    [kcClass]="'kcInputErrorMessageClass'"
-                    aria-live="polite"
-                  >
-                    {{ messagesPerField.get('username') }}
-                  </span>
                 }
-              </div>
             }
-          </form>
-          <div
-            id="kc-form-passkey-button"
-            [kcClass]="'kcFormButtonsClass'"
-            style="display: none"
-          >
-            <input
-              id="authButtonId"
-              type="button"
-              autoFocus
-              value="{{ 'passkey-doAuthenticate' | msgStr }}"
-              [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
-            />
-          </div>
-        }
-      </div>
-    </div>
-  </ng-container>
+            <div id="kc-form-wrapper">
+                @if (realm.password) {
+                    <form
+                        id="kc-form-passkey"
+                        [action]="url.loginAction"
+                        method="post"
+                        style="display: none"
+                    >
+                        @if (!usernameHidden) {
+                            <div [kcClass]="'kcFormGroupClass'">
+                                <label
+                                    for="username"
+                                    [kcClass]="'kcLabelClass'"
+                                >
+                                    {{ i18n.msgStr('passkey-autofill-select') }}
+                                </label>
+                                <input
+                                    tabIndex="1"
+                                    id="username"
+                                    [attr.aria-invalid]="messagesPerField.existsError('username')"
+                                    [kcClass]="'kcInputClass'"
+                                    name="username"
+                                    [value]="login.username ?? ''"
+                                    type="text"
+                                    autoFocus
+                                    autoComplete="off"
+                                />
+                                @if (messagesPerField.existsError('username')) {
+                                    <span
+                                        id="input-error-username"
+                                        [kcClass]="'kcInputErrorMessageClass'"
+                                        aria-live="polite"
+                                    >
+                                        {{ messagesPerField.get('username') }}
+                                    </span>
+                                }
+                            </div>
+                        }
+                    </form>
+                    <div
+                        id="kc-form-passkey-button"
+                        [kcClass]="'kcFormButtonsClass'"
+                        style="display: none"
+                    >
+                        <input
+                            id="authButtonId"
+                            type="button"
+                            autoFocus
+                            [value]="i18n.msgStr('passkey-doAuthenticate')"
+                            [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
+                        />
+                    </div>
+                }
+            </div>
+        </div>
+    </ng-container>
 </kc-login-template>

package/src/login/pages/login-passkeys-conditional-authenticate/login-passkeys-conditional-authenticate.component.ts

@@ -1,28 +1,24 @@
 import { ChangeDetectionStrategy, Component, forwardRef, inject } 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 { getKcClsx } from 'keycloakify/login/lib/kcClsx';
+import { 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 { TemplateComponent } from '@keycloakify/angular/login/containers/template.component';
 import { KcClassDirective } from '@keycloakify/angular/login/directives/kc-class.directive';
-import { AdvancedMsgStrPipe } from '@keycloakify/angular/login/pipes/advanced-msg-str.pipe';
-import { MsgStrPipe } from '@keycloakify/angular/login/pipes/msg-str.pipe';
-import { LoginResourceInjectorService } from '@keycloakify/angular/login/services';
+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 { ClassKey, getKcClsx } from 'keycloakify/login/lib/kcClsx';
+import { I18n } from '../../i18n';
+import { KcContext } from '../../KcContext';
 
 @Component({
     standalone: true,
-    imports: [TemplateComponent, MsgStrPipe, KcClassDirective, AdvancedMsgStrPipe],
+    imports: [TemplateComponent, KcClassDirective],
     selector: 'kc-root',
     templateUrl: 'login-passkeys-conditional-authenticate.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
     providers: [
-        MsgStrPipe,
         {
             provide: ComponentReference,
             useExisting: forwardRef(() => LoginPasskeysConditionalAuthenticateComponent)
@@ -30,14 +26,11 @@ import { LoginResourceInjectorService } from '@keycloakify/angular/login/service
     ]
 })
 export class LoginPasskeysConditionalAuthenticateComponent extends ComponentReference {
-    kcContext =
-        inject<
-            Extract<KcContext, { pageId: 'login-passkeys-conditional-authenticate.ftl' }>
-        >(KC_CONTEXT);
+    kcContext = inject<Extract<KcContext, { pageId: 'login-passkeys-conditional-authenticate.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);
     displayInfo: boolean = true;
 
     authButtonId = 'authenticateWebAuthnButton';
@@ -72,13 +65,13 @@ export class LoginPasskeysConditionalAuthenticateComponent extends ComponentRefe
                     authButton.addEventListener("click", () => {
                         authenticateByWebAuthn({
                             ...input,
-                            errmsg : ${JSON.stringify(this.msgStr.transform('webauthn-unsupported-browser-text'))}
+                            errmsg : ${JSON.stringify(this.i18n.msgStr('webauthn-unsupported-browser-text'))}
                         });
                     });
 
                     initAuthenticate({
                         ...input,
-                        errmsg : ${JSON.stringify(this.msgStr.transform('passkey-unsupported-browser-text'))}
+                        errmsg : ${JSON.stringify(this.i18n.msgStr('passkey-unsupported-browser-text'))}
                     });
           `
             }

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

@@ -2,89 +2,89 @@
 @let messagesPerField = kcContext.messagesPerField;
 @let realm = kcContext.realm;
 <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>
-    {{ 'doLogIn' | msgStr }}
-  </ng-container>
-  <ng-container content>
-    <div id="kc-form">
-      <div id="kc-form-wrapper">
-        <form
-          id="kc-form-login"
-          (onSubmit)="isLoginButtonDisabled.set(true)"
-          [action]="url?.loginAction"
-          method="post"
-        >
-          <div
-            [kcClass]="'kcFormGroupClass'"
-            class="no-bottom-margin"
-          >
-            <hr />
-            <label
-              for="password"
-              [kcClass]="'kcLabelClass'"
-            >
-              {{ 'password' | msgStr }}
-            </label>
-            <kc-password-wrapper passwordInputId="password">
-              <input
-                type="password"
-                id="password"
-                name="password"
-                [kcClass]="'kcInputClass'"
-                [required]="true"
-                [autofocus]="true"
-                [tabindex]="1"
-                aria-describedby="input-error-password"
-              />
-            </kc-password-wrapper>
+    <ng-container headerNode>
+        {{ i18n.msgStr('doLogIn') }}
+    </ng-container>
+    <ng-container content>
+        <div id="kc-form">
+            <div id="kc-form-wrapper">
+                <form
+                    id="kc-form-login"
+                    (onSubmit)="isLoginButtonDisabled.set(true)"
+                    [action]="url?.loginAction"
+                    method="post"
+                >
+                    <div
+                        [kcClass]="'kcFormGroupClass'"
+                        class="no-bottom-margin"
+                    >
+                        <hr />
+                        <label
+                            for="password"
+                            [kcClass]="'kcLabelClass'"
+                        >
+                            {{ i18n.msgStr('password') }}
+                        </label>
+                        <kc-password-wrapper passwordInputId="password">
+                            <input
+                                type="password"
+                                id="password"
+                                name="password"
+                                [kcClass]="'kcInputClass'"
+                                [required]="true"
+                                [autofocus]="true"
+                                [tabindex]="1"
+                                aria-describedby="input-error-password"
+                            />
+                        </kc-password-wrapper>
 
-            @if (messagesPerField.existsError('password')) {
-              <span
-                id="input-error-password"
-                [kcClass]="'kcInputErrorMessageClass'"
-                aria-live="polite"
-                [innerHTML]="messagesPerField.getFirstError('password') | kcSanitize: 'html'"
-              >
-              </span>
-            }
-          </div>
-          <div [kcClass]="['kcFormGroupClass', 'kcFormSettingClass']">
-            <div id="kc-form-options"></div>
-            <div [kcClass]="'kcFormOptionsWrapperClass'">
-              @if (realm.resetPasswordAllowed) {
-                <span>
-                  <a
-                    tabindex="5"
-                    href="{{ url.loginResetCredentialsUrl }}"
-                  >
-                    {{ 'doForgotPassword' | msgStr }}
-                  </a>
-                </span>
-              }
+                        @if (messagesPerField.existsError('password')) {
+                            <span
+                                id="input-error-password"
+                                [kcClass]="'kcInputErrorMessageClass'"
+                                aria-live="polite"
+                                [innerHTML]="messagesPerField.getFirstError('password') | kcSanitize: 'html'"
+                            >
+                            </span>
+                        }
+                    </div>
+                    <div [kcClass]="['kcFormGroupClass', 'kcFormSettingClass']">
+                        <div id="kc-form-options"></div>
+                        <div [kcClass]="'kcFormOptionsWrapperClass'">
+                            @if (realm.resetPasswordAllowed) {
+                                <span>
+                                    <a
+                                        tabindex="5"
+                                        [href]="url.loginResetCredentialsUrl"
+                                    >
+                                        {{ i18n.msgStr('doForgotPassword') }}
+                                    </a>
+                                </span>
+                            }
+                        </div>
+                    </div>
+                    <div
+                        id="kc-form-buttons"
+                        [kcClass]="'kcFormGroupClass'"
+                    >
+                        <input
+                            type="submit"
+                            id="kc-login"
+                            name="login"
+                            [value]="i18n.msgStr('doLogIn')"
+                            [disabled]="isLoginButtonDisabled()"
+                            [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
+                            [tabindex]="4"
+                        />
+                    </div>
+                </form>
             </div>
-          </div>
-          <div
-            id="kc-form-buttons"
-            [kcClass]="'kcFormGroupClass'"
-          >
-            <input
-              type="submit"
-              id="kc-login"
-              name="login"
-              [value]="'doLogIn' | msgStr"
-              [disabled]="isLoginButtonDisabled()"
-              [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
-              [tabindex]="4"
-            />
-          </div>
-        </form>
-      </div>
-    </div>
-  </ng-container>
+        </div>
+    </ng-container>
 </kc-login-template>