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

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

@@ -2,102 +2,102 @@
 @let otpLogin = kcContext.otpLogin;
 @let messagesPerField = kcContext.messagesPerField;
 <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-login-form"
-      [kcClass]="['kcFormClass']"
-      [action]="url.loginAction"
-      method="post"
-    >
-      @if (otpLogin.userOtpCredentials.length > 1) {
-        <div [kcClass]="'kcFormGroupClass'">
-          <div [kcClass]="'kcInputWrapperClass'">
-            @for (otpCredential of otpLogin.userOtpCredentials; track otpCredential; let i = $index) {
-              <ng-container>
-                <input
-                  [id]="'kc-otp-credential-' + i"
-                  [kcClass]="'kcLoginOTPListClass'"
-                  type="radio"
-                  name="selectedCredentialId"
-                  [value]="otpCredential.id"
-                  [checked]="otpCredential.id === otpLogin.selectedCredentialId"
-                />
-                <label
-                  [for]="'kc-otp-credential-' + i"
-                  [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>
-              </ng-container>
-            }
-          </div>
-        </div>
-      }
-      <div [kcClass]="'kcFormGroupClass'">
-        <div [kcClass]="'kcLabelWrapperClass'">
-          <label
-            for="otp"
-            [kcClass]="'kcLabelClass'"
-          >
-            {{ 'loginOtpOneTime' | msgStr }}
-          </label>
-        </div>
-        <div [kcClass]="'kcInputWrapperClass'">
-          <input
-            id="otp"
-            name="otp"
-            autoComplete="off"
-            type="text"
-            [kcClass]="'kcInputClass'"
-            autoFocus
-            [attr.aria-invalid]="messagesPerField.existsError('totp')"
-          />
-          @if (messagesPerField.existsError('totp')) {
-            <span
-              id="input-error-otp-code"
-              [kcClass]="['kcInputErrorMessageClass']"
-              aria-live="polite"
-              [innerHTML]="messagesPerField.get('totp') | kcSanitize: 'html'"
-            ></span>
-          }
-        </div>
-      </div>
-      <div [kcClass]="'kcFormGroupClass'">
-        <div
-          id="kc-form-options"
-          [kcClass]="'kcFormOptionsClass'"
-        ></div>
-        <div
-          id="kc-form-buttons"
-          [kcClass]="'kcFormButtonsClass'"
+    <ng-container headerNode>
+        {{ i18n.msgStr('doLogIn') }}
+    </ng-container>
+    <ng-container content>
+        <form
+            id="kc-otp-login-form"
+            [kcClass]="['kcFormClass']"
+            [action]="url.loginAction"
+            method="post"
         >
-          <input
-            [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
-            name="login"
-            id="kc-login"
-            type="submit"
-            value="{{ 'doLogIn' | msgStr }}"
-          />
-        </div>
-      </div>
-    </form>
-  </ng-container>
+            @if (otpLogin.userOtpCredentials.length > 1) {
+                <div [kcClass]="'kcFormGroupClass'">
+                    <div [kcClass]="'kcInputWrapperClass'">
+                        @for (otpCredential of otpLogin.userOtpCredentials; track otpCredential; let i = $index) {
+                            <ng-container>
+                                <input
+                                    [id]="'kc-otp-credential-' + i"
+                                    [kcClass]="'kcLoginOTPListClass'"
+                                    type="radio"
+                                    name="selectedCredentialId"
+                                    [value]="otpCredential.id"
+                                    [checked]="otpCredential.id === otpLogin.selectedCredentialId"
+                                />
+                                <label
+                                    [for]="'kc-otp-credential-' + i"
+                                    [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>
+                            </ng-container>
+                        }
+                    </div>
+                </div>
+            }
+            <div [kcClass]="'kcFormGroupClass'">
+                <div [kcClass]="'kcLabelWrapperClass'">
+                    <label
+                        for="otp"
+                        [kcClass]="'kcLabelClass'"
+                    >
+                        {{ i18n.msgStr('loginOtpOneTime') }}
+                    </label>
+                </div>
+                <div [kcClass]="'kcInputWrapperClass'">
+                    <input
+                        id="otp"
+                        name="otp"
+                        autoComplete="off"
+                        type="text"
+                        [kcClass]="'kcInputClass'"
+                        autoFocus
+                        [attr.aria-invalid]="messagesPerField.existsError('totp')"
+                    />
+                    @if (messagesPerField.existsError('totp')) {
+                        <span
+                            id="input-error-otp-code"
+                            [kcClass]="['kcInputErrorMessageClass']"
+                            aria-live="polite"
+                            [innerHTML]="messagesPerField.get('totp') | kcSanitize: 'html'"
+                        ></span>
+                    }
+                </div>
+            </div>
+            <div [kcClass]="'kcFormGroupClass'">
+                <div
+                    id="kc-form-options"
+                    [kcClass]="'kcFormOptionsClass'"
+                ></div>
+                <div
+                    id="kc-form-buttons"
+                    [kcClass]="'kcFormButtonsClass'"
+                >
+                    <input
+                        [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
+                        name="login"
+                        id="kc-login"
+                        type="submit"
+                        [value]="i18n.msgStr('doLogIn')"
+                    />
+                </div>
+            </div>
+        </form>
+    </ng-container>
 </kc-login-template>

package/src/login/pages/login-otp/login-otp.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/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, KcClassDirective, MsgStrPipe, KcSanitizePipe],
+    imports: [TemplateComponent, KcClassDirective, KcSanitizePipe],
     selector: 'kc-root',
     templateUrl: 'login-otp.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
@@ -32,9 +25,10 @@ import { MsgStrPipe } from '@keycloakify/angular/login/pipes/msg-str.pipe';
     ]
 })
 export class LoginOtpComponent extends ComponentReference {
-    kcContext = inject<Extract<KcContext, { pageId: 'login-otp.ftl' }>>(KC_CONTEXT);
+    kcContext = inject<Extract<KcContext, { pageId: 'login-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-page-expired/login-page-expired.component.html

@@ -1,35 +1,35 @@
 @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>
-    {{ 'pageExpiredTitle' | msgStr }}
-  </ng-container>
-  <ng-container content>
-    <p
-      id="instruction1"
-      class="instruction"
-    >
-      {{ 'pageExpiredMsg1' | msgStr }}
-      <a
-        id="loginRestartLink"
-        [href]="url.loginRestartFlowUrl"
-      >
-        {{ 'doClickHere' | msgStr }}
-      </a>
-      .<br />
-      {{ 'pageExpiredMsg2' | msgStr }}
-      <a
-        id="loginContinueLink"
-        [href]="url.loginAction"
-      >
-        {{ 'doClickHere' | msgStr }}
-      </a>
-      .
-    </p>
-  </ng-container>
+    <ng-container headerNode>
+        {{ i18n.msgStr('pageExpiredTitle') }}
+    </ng-container>
+    <ng-container content>
+        <p
+            id="instruction1"
+            class="instruction"
+        >
+            {{ i18n.msgStr('pageExpiredMsg1') }}
+            <a
+                id="loginRestartLink"
+                [href]="url.loginRestartFlowUrl"
+            >
+                {{ i18n.msgStr('doClickHere') }}
+            </a>
+            .<br />
+            {{ i18n.msgStr('pageExpiredMsg2') }}
+            <a
+                id="loginContinueLink"
+                [href]="url.loginAction"
+            >
+                {{ i18n.msgStr('doClickHere') }}
+            </a>
+            .
+        </p>
+    </ng-container>
 </kc-login-template>

package/src/login/pages/login-page-expired/login-page-expired.component.ts

@@ -1,24 +1,17 @@
-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 { 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],
+    imports: [TemplateComponent],
     selector: 'kc-root',
     templateUrl: 'login-page-expired.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
@@ -30,10 +23,10 @@ import { MsgStrPipe } from '@keycloakify/angular/login/pipes/msg-str.pipe';
     ]
 })
 export class LoginPageExpiredComponent extends ComponentReference {
-    kcContext =
-        inject<Extract<KcContext, { pageId: 'login-page-expired.ftl' }>>(KC_CONTEXT);
+    kcContext = inject<Extract<KcContext, { pageId: 'login-page-expired.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>();