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

package/src/login/pages/login-reset-otp/login-reset-otp.component.html

@@ -1,65 +1,67 @@
 @let url = kcContext.url;
 @let configuredOtpCredentials = kcContext.configuredOtpCredentials;
 <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>
-    <form
-      id="kc-otp-reset-form"
-      [kcClass]="'kcFormClass'"
-      [action]="url.loginAction"
-      method="post"
-    >
-      <div [kcClass]="'kcInputWrapperClass'">
-        <div [kcClass]="'kcInfoAreaWrapperClass'">
-          <p id="kc-otp-reset-form-description">{{ 'otp-reset-description' | msgStr }}</p>
-          @for (otpCredential of configuredOtpCredentials.userOtpCredentials; track otpCredential; let i = $index) {
-            <input
-              id="kc-otp-credential-{{ i }}"
-              [kcClass]="'kcLoginOTPListInputClass'"
-              type="radio"
-              name="selectedCredentialId"
-              [value]="otpCredential.id"
-              [defaultChecked]="otpCredential.id === configuredOtpCredentials.selectedCredentialId"
-            />
-            <label
-              for="kc-otp-credential-0"
-              [kcClass]="'kcLoginOTPListClass'"
-              [tabIndex]="i"
-            >
-              <span [kcClass]="'kcLoginOTPListItemHeaderClass'">
-                <span [kcClass]="'kcLoginOTPListItemIconBodyClass'">
-                  <i
-                    [kcClass]="'kcLoginOTPListItemIconClass'"
-                    aria-hidden="true"
-                  ></i>
-                </span>
-                <span [kcClass]="'kcLoginOTPListItemTitleClass'">{{ otpCredential.userLabel }}</span>
-              </span>
-            </label>
-          }
-          <div [kcClass]="'kcFormGroupClass'">
-            <div
-              id="kc-form-buttons"
-              [kcClass]="'kcFormButtonsClass'"
-            >
-              <input
-                id="kc-otp-reset-form-submit"
-                [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
-                type="submit"
-                [value]="'doSubmit' | msgStr"
-              />
+    <ng-container headerNode>
+        {{ i18n.msgStr('doLogIn') }}
+    </ng-container>
+    <ng-container content>
+        <form
+            id="kc-otp-reset-form"
+            [kcClass]="'kcFormClass'"
+            [action]="url.loginAction"
+            method="post"
+        >
+            <div [kcClass]="'kcInputWrapperClass'">
+                <div [kcClass]="'kcInfoAreaWrapperClass'">
+                    <p id="kc-otp-reset-form-description">
+                        {{ i18n.msgStr('otp-reset-description') }}
+                    </p>
+                    @for (otpCredential of configuredOtpCredentials.userOtpCredentials; track otpCredential; let i = $index) {
+                        <input
+                            id="kc-otp-credential-{{ i }}"
+                            [kcClass]="'kcLoginOTPListInputClass'"
+                            type="radio"
+                            name="selectedCredentialId"
+                            [value]="otpCredential.id"
+                            [defaultChecked]="otpCredential.id === configuredOtpCredentials.selectedCredentialId"
+                        />
+                        <label
+                            for="kc-otp-credential-0"
+                            [kcClass]="'kcLoginOTPListClass'"
+                            [tabIndex]="i"
+                        >
+                            <span [kcClass]="'kcLoginOTPListItemHeaderClass'">
+                                <span [kcClass]="'kcLoginOTPListItemIconBodyClass'">
+                                    <i
+                                        [kcClass]="'kcLoginOTPListItemIconClass'"
+                                        aria-hidden="true"
+                                    ></i>
+                                </span>
+                                <span [kcClass]="'kcLoginOTPListItemTitleClass'">{{ otpCredential.userLabel }}</span>
+                            </span>
+                        </label>
+                    }
+                    <div [kcClass]="'kcFormGroupClass'">
+                        <div
+                            id="kc-form-buttons"
+                            [kcClass]="'kcFormButtonsClass'"
+                        >
+                            <input
+                                id="kc-otp-reset-form-submit"
+                                [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
+                                type="submit"
+                                [value]="i18n.msgStr('doSubmit')"
+                            />
+                        </div>
+                    </div>
+                </div>
             </div>
-          </div>
-        </div>
-      </div>
-    </form>
-  </ng-container>
+        </form>
+    </ng-container>
 </kc-login-template>

package/src/login/pages/login-reset-otp/login-reset-otp.component.ts

@@ -1,25 +1,18 @@
-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 { 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 { KcClassDirective } from '@keycloakify/angular/login/directives';
-import { MsgStrPipe } from '@keycloakify/angular/login/pipes/msg-str.pipe';
+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 { ClassKey } from 'keycloakify/login/lib/kcClsx';
+import { I18n } from '../../i18n';
+import { KcContext } from '../../KcContext';
 
 @Component({
     standalone: true,
-    imports: [KcClassDirective, MsgStrPipe, TemplateComponent],
+    imports: [KcClassDirective, TemplateComponent],
     selector: 'kc-root',
     templateUrl: 'login-reset-otp.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
@@ -31,9 +24,10 @@ import { MsgStrPipe } from '@keycloakify/angular/login/pipes/msg-str.pipe';
     ]
 })
 export class LoginResetOtpComponent extends ComponentReference {
-    kcContext = inject<Extract<KcContext, { pageId: 'login-reset-otp.ftl' }>>(KC_CONTEXT);
+    kcContext = inject<Extract<KcContext, { pageId: 'login-reset-otp.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>();

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

@@ -3,93 +3,93 @@
 @let realm = kcContext.realm;
 @let auth = kcContext.auth;
 <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>
-    {{ 'emailForgotTitle' | msgStr }}
-  </ng-container>
-  <ng-container infoNode>
-    @if (realm.duplicateEmailsAllowed) {
-      {{ 'emailInstructionUsername' | msgStr }}
-    } @else {
-      {{ 'emailInstruction' | msgStr }}
-    }
-  </ng-container>
+    <ng-container headerNode>
+        {{ i18n.msgStr('emailForgotTitle') }}
+    </ng-container>
+    <ng-container infoNode>
+        @if (realm.duplicateEmailsAllowed) {
+            {{ i18n.msgStr('emailInstructionUsername') }}
+        } @else {
+            {{ i18n.msgStr('emailInstruction') }}
+        }
+    </ng-container>
 
-  <ng-container content>
-    <form
-      id="kc-passwd-update-form"
-      [kcClass]="'kcFormClass'"
-      [action]="url.loginAction"
-      method="post"
-    >
-      <div [kcClass]="'kcFormGroupClass'">
-        <div [kcClass]="'kcLabelWrapperClass'">
-          <label
-            for="password-new"
-            [kcClass]="'kcLabelClass'"
-          >
-            @if (realm.loginWithEmailAllowed) {
-              {{ 'username' | msgStr }}
-            } @else if (!realm.registrationEmailAsUsername) {
-              {{ 'usernameOrEmail' | msgStr }}
-            } @else {
-              {{ 'email' | msgStr }}
-            }
-          </label>
-        </div>
+    <ng-container content>
+        <form
+            id="kc-passwd-update-form"
+            [kcClass]="'kcFormClass'"
+            [action]="url.loginAction"
+            method="post"
+        >
+            <div [kcClass]="'kcFormGroupClass'">
+                <div [kcClass]="'kcLabelWrapperClass'">
+                    <label
+                        for="password-new"
+                        [kcClass]="'kcLabelClass'"
+                    >
+                        @if (realm.loginWithEmailAllowed) {
+                            {{ i18n.msgStr('username') }}
+                        } @else if (!realm.registrationEmailAsUsername) {
+                            {{ i18n.msgStr('usernameOrEmail') }}
+                        } @else {
+                            {{ i18n.msgStr('email') }}
+                        }
+                    </label>
+                </div>
 
-        <div [kcClass]="'kcInputWrapperClass'">
-          <input
-            type="text"
-            id="username"
-            name="username"
-            [kcClass]="'kcInputClass'"
-            autoFocus
-            [attr.aria-invalid]="messagesPerField.existsError('username')"
-            [defaultValue]="auth.attemptedUsername ?? ''"
-          />
+                <div [kcClass]="'kcInputWrapperClass'">
+                    <input
+                        type="text"
+                        id="username"
+                        name="username"
+                        [kcClass]="'kcInputClass'"
+                        autoFocus
+                        [attr.aria-invalid]="messagesPerField.existsError('username')"
+                        [defaultValue]="auth.attemptedUsername ?? ''"
+                    />
 
-          @if (messagesPerField.existsError('username')) {
-            <span
-              id="input-error-username"
-              [kcClass]="'kcInputErrorMessageClass'"
-              aria-live="polite"
-              [innerHtml]="messagesPerField.get('username') | kcSanitize: 'html'"
-            ></span>
-          }
-        </div>
-      </div>
+                    @if (messagesPerField.existsError('username')) {
+                        <span
+                            id="input-error-username"
+                            [kcClass]="'kcInputErrorMessageClass'"
+                            aria-live="polite"
+                            [innerHtml]="messagesPerField.get('username') | kcSanitize: 'html'"
+                        ></span>
+                    }
+                </div>
+            </div>
 
-      <div [kcClass]="['kcFormGroupClass', 'kcFormSettingClass']">
-        <div
-          id="kc-form-options"
-          [kcClass]="'kcFormOptionsClass'"
-        >
-          <div [kcClass]="'kcFormOptionsWrapperClass'">
-            <span>
-              <a
-                [href]="url.loginUrl"
-                [innerHTML]="'backToLogin' | msgStr | kcSanitize: 'html'"
-              ></a>
-            </span>
-          </div>
-        </div>
-        <div
-          id="kc-form-buttons"
-          [kcClass]="'kcFormButtonsClass'"
-        >
-          <input
-            [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
-            type="submit"
-            [value]="'doSubmit' | msgStr"
-          />
-        </div>
-      </div>
-    </form>
-  </ng-container>
+            <div [kcClass]="['kcFormGroupClass', 'kcFormSettingClass']">
+                <div
+                    id="kc-form-options"
+                    [kcClass]="'kcFormOptionsClass'"
+                >
+                    <div [kcClass]="'kcFormOptionsWrapperClass'">
+                        <span>
+                            <a
+                                [href]="url.loginUrl"
+                                [innerHTML]="i18n.msgStr('backToLogin') | kcSanitize: 'html'"
+                            ></a>
+                        </span>
+                    </div>
+                </div>
+                <div
+                    id="kc-form-buttons"
+                    [kcClass]="'kcFormButtonsClass'"
+                >
+                    <input
+                        [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
+                        type="submit"
+                        [value]="i18n.msgStr('doSubmit')"
+                    />
+                </div>
+            </div>
+        </form>
+    </ng-container>
 </kc-login-template>

package/src/login/pages/login-reset-password/login-reset-password.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 { 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 { KcClassDirective } from '@keycloakify/angular/login/directives';
+import { KcClassDirective } from '@keycloakify/angular/login/directives/kc-class.directive';
 import { KcSanitizePipe } from '@keycloakify/angular/login/pipes/kc-sanitize.pipe';
-import { MsgStrPipe } from '@keycloakify/angular/login/pipes/msg-str.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 { ClassKey } from 'keycloakify/login/lib/kcClsx';
+import { I18n } from '../../i18n';
+import { KcContext } from '../../KcContext';
 
 @Component({
     standalone: true,
-    imports: [TemplateComponent, MsgStrPipe, KcClassDirective, KcSanitizePipe],
+    imports: [TemplateComponent, KcClassDirective, KcSanitizePipe],
     selector: 'kc-root',
     templateUrl: 'login-reset-password.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
@@ -32,10 +25,10 @@ import { MsgStrPipe } from '@keycloakify/angular/login/pipes/msg-str.pipe';
     ]
 })
 export class LoginResetPasswordComponent extends ComponentReference {
-    kcContext =
-        inject<Extract<KcContext, { pageId: 'login-reset-password.ftl' }>>(KC_CONTEXT);
+    kcContext = inject<Extract<KcContext, { pageId: 'login-reset-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);
+    override classes = inject<Partial<Record<ClassKey, string>>>(LOGIN_CLASSES);
     displayRequiredFields = input(false);
     documentTitle = input<string>();
     bodyClassName = input<string>();

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

@@ -3,114 +3,114 @@
 @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>
-    {{ 'updatePasswordTitle' | msgStr }}
-  </ng-container>
-  <ng-container content>
-    <form
-      id="kc-passwd-update-form"
-      [kcClass]="'kcFormClass'"
-      [action]="url.loginAction"
-      method="post"
-    >
-      <div [kcClass]="'kcFormGroupClass'">
-        <div [kcClass]="'kcLabelWrapperClass'">
-          <label
-            for="password-new"
-            [kcClass]="'kcLabelClass'"
-          >
-            {{ 'passwordNew' | msgStr }}
-          </label>
-        </div>
-        <div [kcClass]="'kcInputWrapperClass'">
-          <kc-password-wrapper passwordInputId="password-new">
-            <input
-              type="password"
-              id="password-new"
-              name="password-new"
-              [kcClass]="'kcInputClass'"
-              autoFocus
-              autoComplete="new-password"
-              [attr.aria-invalid]="messagesPerField.existsError('password', 'password-confirm')"
-            />
-          </kc-password-wrapper>
+    <ng-container headerNode>
+        {{ i18n.msgStr('updatePasswordTitle') }}
+    </ng-container>
+    <ng-container content>
+        <form
+            id="kc-passwd-update-form"
+            [kcClass]="'kcFormClass'"
+            [action]="url.loginAction"
+            method="post"
+        >
+            <div [kcClass]="'kcFormGroupClass'">
+                <div [kcClass]="'kcLabelWrapperClass'">
+                    <label
+                        for="password-new"
+                        [kcClass]="'kcLabelClass'"
+                    >
+                        {{ i18n.msgStr('passwordNew') }}
+                    </label>
+                </div>
+                <div [kcClass]="'kcInputWrapperClass'">
+                    <kc-password-wrapper passwordInputId="password-new">
+                        <input
+                            type="password"
+                            id="password-new"
+                            name="password-new"
+                            [kcClass]="'kcInputClass'"
+                            autoFocus
+                            autoComplete="new-password"
+                            [attr.aria-invalid]="messagesPerField.existsError('password', 'password-confirm')"
+                        />
+                    </kc-password-wrapper>
 
-          @if (messagesPerField.existsError('password')) {
-            <span
-              id="input-error-password"
-              [kcClass]="'kcInputErrorMessageClass'"
-              aria-live="polite"
-              [innerHtml]="messagesPerField.get('password') | kcSanitize: 'html'"
-            ></span>
-          }
-        </div>
-      </div>
+                    @if (messagesPerField.existsError('password')) {
+                        <span
+                            id="input-error-password"
+                            [kcClass]="'kcInputErrorMessageClass'"
+                            aria-live="polite"
+                            [innerHtml]="messagesPerField.get('password') | kcSanitize: 'html'"
+                        ></span>
+                    }
+                </div>
+            </div>
 
-      <div [kcClass]="'kcFormGroupClass'">
-        <div [kcClass]="'kcLabelWrapperClass'">
-          <label
-            for="password-confirm"
-            [kcClass]="'kcLabelClass'"
-          >
-            {{ 'passwordConfirm' | msgStr }}
-          </label>
-        </div>
-        <div [kcClass]="'kcInputWrapperClass'">
-          <kc-password-wrapper passwordInputId="password-confirm">
-            <input
-              type="password"
-              id="password-confirm"
-              name="password-confirm"
-              [kcClass]="'kcInputClass'"
-              autoFocus
-              autoComplete="new-password"
-              [attr.aria-invalid]="messagesPerField.existsError('password', 'password-confirm')"
-            />
-          </kc-password-wrapper>
-          @if (messagesPerField.existsError('password-confirm')) {
-            <span
-              id="input-error-password-confirm"
-              [kcClass]="'kcInputErrorMessageClass'"
-              aria-live="polite"
-              [innerHtml]="messagesPerField.get('password-confirm') | kcSanitize: 'html'"
-            ></span>
-          }
-        </div>
-      </div>
-      <div [kcClass]="'kcFormGroupClass'">
-        <kc-logout-other-sessions></kc-logout-other-sessions>
-        <div
-          id="kc-form-buttons"
-          [kcClass]="'kcFormButtonsClass'"
-        >
-          <input
-            [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>
-          }
-        </div>
-      </div>
-    </form>
-  </ng-container>
+            <div [kcClass]="'kcFormGroupClass'">
+                <div [kcClass]="'kcLabelWrapperClass'">
+                    <label
+                        for="password-confirm"
+                        [kcClass]="'kcLabelClass'"
+                    >
+                        {{ i18n.msgStr('passwordConfirm') }}
+                    </label>
+                </div>
+                <div [kcClass]="'kcInputWrapperClass'">
+                    <kc-password-wrapper passwordInputId="password-confirm">
+                        <input
+                            type="password"
+                            id="password-confirm"
+                            name="password-confirm"
+                            [kcClass]="'kcInputClass'"
+                            autoFocus
+                            autoComplete="new-password"
+                            [attr.aria-invalid]="messagesPerField.existsError('password', 'password-confirm')"
+                        />
+                    </kc-password-wrapper>
+                    @if (messagesPerField.existsError('password-confirm')) {
+                        <span
+                            id="input-error-password-confirm"
+                            [kcClass]="'kcInputErrorMessageClass'"
+                            aria-live="polite"
+                            [innerHtml]="messagesPerField.get('password-confirm') | kcSanitize: 'html'"
+                        ></span>
+                    }
+                </div>
+            </div>
+            <div [kcClass]="'kcFormGroupClass'">
+                <kc-logout-other-sessions></kc-logout-other-sessions>
+                <div
+                    id="kc-form-buttons"
+                    [kcClass]="'kcFormButtonsClass'"
+                >
+                    <input
+                        [kcClass]="{
+                            kcButtonClass: true,
+                            kcButtonPrimaryClass: true,
+                            kcButtonBlockClass: !isAppInitiatedAction,
+                            kcButtonLargeClass: true
+                        }"
+                        type="submit"
+                        [value]="i18n.msgStr('doSubmit')"
+                    />
+                    @if (isAppInitiatedAction) {
+                        <button
+                            [kcClass]="['kcButtonClass', 'kcButtonDefaultClass', 'kcButtonLargeClass']"
+                            type="submit"
+                            name="cancel-aia"
+                            value="true"
+                        >
+                            {{ i18n.msgStr('doCancel') }}
+                        </button>
+                    }
+                </div>
+            </div>
+        </form>
+    </ng-container>
 </kc-login-template>