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

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

@@ -13,17 +13,17 @@
     [documentTitle]="documentTitle()"
 >
     <ng-container headerNode>
-        {{ 'doLogIn' | msgStr }}
+        {{ i18n.msgStr('doLogIn') }}
     </ng-container>
     <ng-container infoNode>
         <div id="kc-registration">
             <span>
-                {{ 'noAccount' | msgStr }}
+                {{ i18n.msgStr('noAccount') }}
                 <a
                     tabindex="6"
                     [href]="url?.registrationUrl"
                 >
-                    {{ 'doRegister' | msgStr }}
+                    {{ i18n.msgStr('doRegister') }}
                 </a>
             </span>
         </div>
@@ -35,7 +35,7 @@
                 [kcClass]="'kcFormSocialAccountSectionClass'"
             >
                 <hr />
-                <h2>{{ 'identity-provider-login-label' | msgStr }}</h2>
+                <h2>{{ i18n.msgStr('identity-provider-login-label') }}</h2>
                 <ul
                     [kcClass]="{
                         kcFormSocialAccountListClass: true,
@@ -91,11 +91,11 @@
                                     [kcClass]="'kcLabelClass'"
                                 >
                                     @if (!realm?.loginWithEmailAllowed) {
-                                        {{ 'username' | msgStr }}
+                                        {{ i18n.msgStr('username') }}
                                     } @else if (!realm?.registrationEmailAsUsername) {
-                                        {{ 'usernameOrEmail' | msgStr }}
+                                        {{ i18n.msgStr('usernameOrEmail') }}
                                     } @else {
-                                        {{ 'email' | msgStr }}
+                                        {{ i18n.msgStr('email') }}
                                     }
                                 </label>
                                 <input
@@ -114,7 +114,7 @@
                                         id="input-error"
                                         [kcClass]="'kcInputErrorMessageClass'"
                                         aria-live="polite"
-                                        [innerHTML]="messagesPerField?.getFirstError('username') | kcSanitize: 'html'"
+                                        [innerHTML]="messagesPerField.getFirstError('username') | kcSanitize: 'html'"
                                     >
                                     </span>
                                 }
@@ -134,7 +134,7 @@
                                                 type="checkbox"
                                                 [defaultChecked]="!!login?.rememberMe"
                                             />
-                                            {{ 'rememberMe' | msgStr }}
+                                            {{ i18n.msgStr('rememberMe') }}
                                         </label>
                                     </div>
                                 }
@@ -150,7 +150,7 @@
                                 name="login"
                                 id="kc-login"
                                 type="submit"
-                                [value]="'doLogIn' | msgStr"
+                                [value]="i18n.msgStr('doLogIn')"
                             />
                         </div>
                     </form>

package/src/login/pages/login-username/login-username.component.ts

@@ -1,20 +1,23 @@
 import { AsyncPipe, NgClass } from '@angular/common';
 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 { 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({
     selector: 'kc-root',
     templateUrl: './login-username.component.html',
     standalone: true,
     changeDetection: ChangeDetectionStrategy.OnPush,
-    imports: [KcClassDirective, AsyncPipe, KcSanitizePipe, NgClass, TemplateComponent, MsgStrPipe],
+    imports: [KcClassDirective, AsyncPipe, KcSanitizePipe, NgClass, TemplateComponent],
     providers: [
         {
             provide: ComponentReference,
@@ -23,12 +26,13 @@ import { MsgStrPipe } from '@keycloakify/angular/login/pipes/msg-str.pipe';
     ]
 })
 export class LoginUsernameComponent extends ComponentReference {
-    kcContext = inject<Extract<KcContext, { pageId: 'login-username.ftl' }>>(KC_CONTEXT);
+    kcContext = inject<Extract<KcContext, { pageId: 'login-username.ftl' }>>(KC_LOGIN_CONTEXT);
     displayRequiredFields = input(false);
     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);
     isLoginButtonDisabled = signal(false);
     displayInfo: boolean = !!this.kcContext?.realm?.password && !!this.kcContext?.realm?.registrationAllowed && !this.kcContext?.registrationDisabled;
     displayMessage: boolean = !this.kcContext?.messagesPerField?.existsError('username');

package/src/login/pages/login-verify-email/login-verify-email.component.html

@@ -8,20 +8,20 @@
     [documentTitle]="documentTitle()"
 >
     <ng-container headerNode>
-        {{ 'emailVerifyTitle' | msgStr }}
+        {{ i18n.msgStr('emailVerifyTitle') }}
     </ng-container>
     <ng-container infoNode>
         <p class="instruction">
-            {{ 'emailVerifyInstruction2' | msgStr }}
+            {{ i18n.msgStr('emailVerifyInstruction2') }}
             <br />
-            <a [href]="url.loginAction">{{ 'doClickHere' | msgStr }}</a>
+            <a [href]="url.loginAction">{{ i18n.msgStr('doClickHere') }}</a>
             &nbsp;
-            {{ 'emailVerifyInstruction3' | msgStr }}
+            {{ i18n.msgStr('emailVerifyInstruction3') }}
         </p>
     </ng-container>
     <ng-container content>
         <p class="instruction">
-            {{ 'emailVerifyInstruction1' | msgStr: user?.email ?? '' }}
+            {{ i18n.msgStr('emailVerifyInstruction1', user?.email ?? '') }}
         </p></ng-container
     >
 </kc-login-template>

package/src/login/pages/login-verify-email/login-verify-email.component.ts

@@ -1,15 +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 { 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, TemplateComponent, MsgStrPipe],
+    imports: [KcClassDirective, TemplateComponent],
     selector: 'kc-root',
     templateUrl: 'login-verify-email.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
@@ -21,9 +24,10 @@ import { MsgStrPipe } from '@keycloakify/angular/login/pipes/msg-str.pipe';
     ]
 })
 export class LoginVerifyEmailComponent extends ComponentReference {
-    kcContext = inject<Extract<KcContext, { pageId: 'login-verify-email.ftl' }>>(KC_CONTEXT);
+    kcContext = inject<Extract<KcContext, { pageId: 'login-verify-email.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-x509-info/login-x509-info.component.html

@@ -8,7 +8,7 @@
     [documentTitle]="documentTitle()"
 >
     <ng-container headerNode>
-        {{ 'doLogIn' | msgStr }}
+        {{ i18n.msgStr('doLogIn') }}
     </ng-container>
     <ng-container content>
         <form
@@ -23,7 +23,7 @@
                         for="certificate_subjectDN"
                         [kcClass]="'kcLabelClass'"
                     >
-                        {{ 'clientCertificate' | msgStr }}
+                        {{ i18n.msgStr('clientCertificate') }}
                     </label>
                 </div>
                 @if (x509.formData.subjectDN) {
@@ -41,7 +41,7 @@
                             id="certificate_subjectDN"
                             [kcClass]="'kcLabelClass'"
                         >
-                            {{ 'noCertificate' | msgStr }}
+                            {{ i18n.msgStr('noCertificate') }}
                         </label>
                     </div>
                 }
@@ -53,7 +53,7 @@
                             for="username"
                             [kcClass]="'kcLabelClass'"
                         >
-                            {{ 'doX509Login' | msgStr }}
+                            {{ i18n.msgStr('doX509Login') }}
                         </label>
                     </div>
                     <div [kcClass]="'kcLabelWrapperClass'">
@@ -83,7 +83,7 @@
                             name="login"
                             id="kc-login"
                             type="submit"
-                            [value]="'doContinue' | msgStr"
+                            [value]="i18n.msgStr('doContinue')"
                         />
                         @if (x509.formData.isUserEnabled) {
                             <input
@@ -91,7 +91,7 @@
                                 name="cancel"
                                 id="kc-cancel"
                                 type="submit"
-                                [value]="'doIgnore' | msgStr"
+                                [value]="i18n.msgStr('doIgnore')"
                             />
                         }
                     </div>

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

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

package/src/login/pages/logout-confirm/logout-confirm.component.html

@@ -10,14 +10,14 @@
     [documentTitle]="documentTitle()"
 >
     <ng-container headerNode>
-        {{ 'logoutConfirmTitle' | msgStr }}
+        {{ i18n.msgStr('logoutConfirmTitle') }}
     </ng-container>
     <ng-container content>
         <div
             id="kc-logout-confirm"
             class="content-area"
         >
-            <p class="instruction">{{ 'logoutConfirmHeader' | msgStr }}</p>
+            <p class="instruction">{{ i18n.msgStr('logoutConfirmHeader') }}</p>
             <form
                 class="form-actions"
                 [action]="url.logoutConfirmAction"
@@ -42,7 +42,7 @@
                             name="confirmLogout"
                             id="kc-logout"
                             type="submit"
-                            [value]="'doLogout' | msgStr"
+                            [value]="i18n.msgStr('doLogout')"
                         />
                     </div>
                 </div>
@@ -50,7 +50,7 @@
             <div id="kc-info-message">
                 @if (!logoutConfirm.skipLink && client.baseUrl) {
                     <p>
-                        <a [href]="client.baseUrl">{{ 'backToApplication' | msgStr }}</a>
+                        <a [href]="client.baseUrl">{{ i18n.msgStr('backToApplication') }}</a>
                     </p>
                 }
             </div>

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

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

@@ -15,7 +15,7 @@
     [documentTitle]="documentTitle()"
 >
     <ng-container headerNode>
-        {{ messageHeader ?? 'registerTitle' | advancedMsgStr }}
+        {{ messageHeader ?? i18n.advancedMsgStr('registerTitle') }}
     </ng-container>
     <ng-container content>
         <form
@@ -28,9 +28,9 @@
             @if (termsAcceptanceRequired) {
                 <div className="form-group">
                     <div [kcClass]="'kcInputWrapperClass'">
-                        {{ 'termsTitle' | msgStr }}
+                        {{ i18n.msgStr('termsTitle') }}
                         <div id="kc-registration-terms-text">
-                            {{ 'termsText' | msgStr }}
+                            {{ i18n.msgStr('termsText') }}
                         </div>
                     </div>
                 </div>
@@ -49,7 +49,7 @@
                             for="termsAccepted"
                             [kcClass]="'kcLabelClass'"
                         >
-                            {{ 'acceptTerms' | msgStr }}
+                            {{ i18n.msgStr('acceptTerms') }}
                         </label>
                     </div>
                     @if (messagesPerField.existsError('termsAccepted')) {
@@ -86,7 +86,7 @@
                         <span>
                             <a
                                 [href]="url.loginUrl"
-                                [innerHTML]="'backToLogin' | msgStr | kcSanitize: 'html'"
+                                [innerHTML]="i18n.msgStr('backToLogin') | kcSanitize: 'html'"
                             ></a>
                         </span>
                     </div>
@@ -104,7 +104,7 @@
                             [attr.data-action]="recaptchaAction"
                             type="submit"
                         >
-                            {{ 'doRegister' | msgStr }}
+                            {{ i18n.msgStr('doRegister') }}
                         </button>
                     </div>
                 } @else {
@@ -116,7 +116,7 @@
                             [disabled]="!isFormSubmittable || (termsAcceptanceRequired && !areTermsAccepted)"
                             [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
                             type="submit"
-                            [value]="'doRegister' | msgStr"
+                            [value]="i18n.msgStr('doRegister')"
                         />
                     </div>
                 }

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

@@ -1,31 +1,24 @@
 import { AsyncPipe, NgClass } from '@angular/common';
 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 { 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 { 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 { 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({
     selector: 'kc-root',
     templateUrl: './register.component.html',
     standalone: true,
     changeDetection: ChangeDetectionStrategy.OnPush,
-    imports: [
-        KcClassDirective,
-        AsyncPipe,
-        KcSanitizePipe,
-        NgClass,
-        TemplateComponent,
-        UserProfileFormFieldsComponent,
-        MsgStrPipe,
-        AdvancedMsgStrPipe
-    ],
+    imports: [KcClassDirective, AsyncPipe, KcSanitizePipe, NgClass, TemplateComponent, UserProfileFormFieldsComponent],
     providers: [
         {
             provide: ComponentReference,
@@ -34,12 +27,13 @@ import { MsgStrPipe } from '@keycloakify/angular/login/pipes/msg-str.pipe';
     ]
 })
 export class RegisterComponent extends ComponentReference {
-    kcContext = inject<Extract<KcContext, { pageId: 'register.ftl' }>>(KC_CONTEXT);
+    kcContext = inject<Extract<KcContext, { pageId: 'register.ftl' }>>(KC_LOGIN_CONTEXT);
     displayRequiredFields = input(false);
     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);
     areTermsAccepted = signal(false);
     displayInfo: boolean = false;

package/src/login/pages/saml-post-form/saml-post-form.component.html

@@ -7,10 +7,10 @@
     [documentTitle]="documentTitle()"
 >
     <ng-container headerNode>
-        {{ 'saml.post-form.title' | msgStr }}
+        {{ i18n.msgStr('saml.post-form.title') }}
     </ng-container>
     <ng-container content>
-        <p>{{ 'saml.post-form.message' | msgStr }}</p>
+        <p>{{ i18n.msgStr('saml.post-form.message') }}</p>
         <form
             name="saml-post-binding"
             method="post"
@@ -39,10 +39,10 @@
                 />
             }
             <noscript>
-                <p>{{ 'saml.post-form.js-disabled' | msgStr }}</p>
+                <p>{{ i18n.msgStr('saml.post-form.js-disabled') }}</p>
                 <input
                     type="submit"
-                    value="{{ 'doContinue' | msgStr }}"
+                    [value]="i18n.msgStr('doContinue')"
                 />
             </noscript>
         </form>

package/src/login/pages/saml-post-form/saml-post-form.component.ts

@@ -1,14 +1,17 @@
 import { AfterViewInit, ChangeDetectionStrategy, Component, forwardRef, inject, input, ViewChild } 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 { 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: 'saml-post-form.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
@@ -20,9 +23,10 @@ import { MsgStrPipe } from '@keycloakify/angular/login/pipes/msg-str.pipe';
     ]
 })
 export class SamlPostFormComponent extends ComponentReference implements AfterViewInit {
-    kcContext = inject<Extract<KcContext, { pageId: 'saml-post-form.ftl' }>>(KC_CONTEXT);
+    kcContext = inject<Extract<KcContext, { pageId: 'saml-post-form.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/select-authenticator/select-authenticator.component.html

@@ -8,7 +8,7 @@
     [documentTitle]="documentTitle()"
 >
     <ng-container headerNode>
-        {{ 'loginChooseAuthenticator' | msgStr }}
+        {{ i18n.msgStr('loginChooseAuthenticator') }}
     </ng-container>
     <ng-container content>
         <form
@@ -30,10 +30,10 @@
                         </div>
                         <div [kcClass]="'kcSelectAuthListItemBodyClass'">
                             <div [kcClass]="'kcSelectAuthListItemHeadingClass'">
-                                {{ authenticationSelection.displayName | advancedMsgStr }}
+                                {{ i18n.advancedMsgStr(authenticationSelection.displayName) }}
                             </div>
                             <div [kcClass]="'kcSelectAuthListItemDescriptionClass'">
-                                {{ authenticationSelection.helpText | advancedMsgStr }}
+                                {{ i18n.advancedMsgStr(authenticationSelection.helpText) }}
                             </div>
                         </div>
                         <div [kcClass]="'kcSelectAuthListItemFillClass'"></div>

package/src/login/pages/select-authenticator/select-authenticator.component.ts

@@ -1,17 +1,19 @@
 import { NgClass } from '@angular/common';
 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 { 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 { AdvancedMsgStrPipe } from '@keycloakify/angular/login/pipes';
-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: [TemplateComponent, MsgStrPipe, AdvancedMsgStrPipe, KcClassDirective, NgClass],
+    imports: [TemplateComponent, KcClassDirective, NgClass],
     selector: 'kc-root',
     templateUrl: 'select-authenticator.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
@@ -23,9 +25,10 @@ import { MsgStrPipe } from '@keycloakify/angular/login/pipes/msg-str.pipe';
     ]
 })
 export class SelectAuthenticatorComponent extends ComponentReference {
-    kcContext = inject<Extract<KcContext, { pageId: 'select-authenticator.ftl' }>>(KC_CONTEXT);
+    kcContext = inject<Extract<KcContext, { pageId: 'select-authenticator.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/terms/terms.component.html

@@ -7,10 +7,10 @@
     [documentTitle]="documentTitle()"
 >
     <ng-container headerNode>
-        {{ 'termsTitle' | msgStr }}
+        {{ i18n.msgStr('termsTitle') }}
     </ng-container>
     <ng-container content>
-        <div id="kc-terms-text">{{ 'termsText' | msgStr }}</div>
+        <div id="kc-terms-text">{{ i18n.msgStr('termsText') }}</div>
         <form
             class="form-actions"
             [action]="url.loginAction"
@@ -21,14 +21,14 @@
                 name="accept"
                 id="kc-accept"
                 type="submit"
-                [value]="'doAccept' | msgStr"
+                [value]="i18n.msgStr('doAccept')"
             />
             <input
                 [kcClass]="['kcButtonClass', 'kcButtonDefaultClass', 'kcButtonLargeClass']"
                 name="cancel"
                 id="kc-decline"
                 type="submit"
-                [value]="'doDecline' | msgStr"
+                [value]="i18n.msgStr('doDecline')"
             />
         </form>
         <div className="clearfix"></div>