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

package/src/login/pages/login-verify-email/login-verify-email.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, TemplateComponent, MsgStrPipe],
+    imports: [KcClassDirective, TemplateComponent],
     selector: 'kc-root',
     templateUrl: 'login-verify-email.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
@@ -31,10 +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

@@ -1,102 +1,102 @@
 @let url = kcContext.url;
 @let x509 = kcContext.x509;
 <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-x509-login-info"
-      [kcClass]="'kcFormClass'"
-      [action]="url.loginAction"
-      method="post"
-    >
-      <div [kcClass]="'kcFormGroupClass'">
-        <div [kcClass]="'kcLabelWrapperClass'">
-          <label
-            for="certificate_subjectDN"
-            [kcClass]="'kcLabelClass'"
-          >
-            {{ 'clientCertificate' | msgStr }}
-          </label>
-        </div>
-        @if (x509.formData.subjectDN) {
-          <div [kcClass]="'kcLabelWrapperClass'">
-            <label
-              id="certificate_subjectDN"
-              [kcClass]="'kcLabelClass'"
-            >
-              {{ x509.formData.subjectDN }}
-            </label>
-          </div>
-        } @else {
-          <div [kcClass]="'kcLabelWrapperClass'">
-            <label
-              id="certificate_subjectDN"
-              [kcClass]="'kcLabelClass'"
-            >
-              {{ 'noCertificate' | msgStr }}
-            </label>
-          </div>
-        }
-      </div>
-      <div [kcClass]="'kcFormGroupClass'">
-        @if (x509.formData.isUserEnabled) {
-          <div [kcClass]="'kcLabelWrapperClass'">
-            <label
-              for="username"
-              [kcClass]="'kcLabelClass'"
-            >
-              {{ 'doX509Login' | msgStr }}
-            </label>
-          </div>
-          <div [kcClass]="'kcLabelWrapperClass'">
-            <label
-              id="username"
-              [kcClass]="'kcLabelClass'"
-            >
-              {{ x509.formData.username }}
-            </label>
-          </div>
-        }
-      </div>
-      <div [kcClass]="'kcFormGroupClass'">
-        <div
-          id="kc-form-options"
-          [kcClass]="'kcFormOptionsClass'"
+    <ng-container headerNode>
+        {{ i18n.msgStr('doLogIn') }}
+    </ng-container>
+    <ng-container content>
+        <form
+            id="kc-x509-login-info"
+            [kcClass]="'kcFormClass'"
+            [action]="url.loginAction"
+            method="post"
         >
-          <div [kcClass]="'kcFormOptionsWrapperClass'"></div>
-        </div>
-        <div
-          id="kc-form-buttons"
-          [kcClass]="'kcFormButtonsClass'"
-        >
-          <div [kcClass]="'kcFormButtonsWrapperClass'">
-            <input
-              [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonLargeClass']"
-              name="login"
-              id="kc-login"
-              type="submit"
-              [value]="'doContinue' | msgStr"
-            />
-            @if (x509.formData.isUserEnabled) {
-              <input
-                [kcClass]="['kcButtonClass', 'kcButtonDefaultClass', 'kcButtonLargeClass']"
-                name="cancel"
-                id="kc-cancel"
-                type="submit"
-                [value]="'doIgnore' | msgStr"
-              />
-            }
-          </div>
-        </div>
-      </div>
-    </form>
-  </ng-container>
+            <div [kcClass]="'kcFormGroupClass'">
+                <div [kcClass]="'kcLabelWrapperClass'">
+                    <label
+                        for="certificate_subjectDN"
+                        [kcClass]="'kcLabelClass'"
+                    >
+                        {{ i18n.msgStr('clientCertificate') }}
+                    </label>
+                </div>
+                @if (x509.formData.subjectDN) {
+                    <div [kcClass]="'kcLabelWrapperClass'">
+                        <label
+                            id="certificate_subjectDN"
+                            [kcClass]="'kcLabelClass'"
+                        >
+                            {{ x509.formData.subjectDN }}
+                        </label>
+                    </div>
+                } @else {
+                    <div [kcClass]="'kcLabelWrapperClass'">
+                        <label
+                            id="certificate_subjectDN"
+                            [kcClass]="'kcLabelClass'"
+                        >
+                            {{ i18n.msgStr('noCertificate') }}
+                        </label>
+                    </div>
+                }
+            </div>
+            <div [kcClass]="'kcFormGroupClass'">
+                @if (x509.formData.isUserEnabled) {
+                    <div [kcClass]="'kcLabelWrapperClass'">
+                        <label
+                            for="username"
+                            [kcClass]="'kcLabelClass'"
+                        >
+                            {{ i18n.msgStr('doX509Login') }}
+                        </label>
+                    </div>
+                    <div [kcClass]="'kcLabelWrapperClass'">
+                        <label
+                            id="username"
+                            [kcClass]="'kcLabelClass'"
+                        >
+                            {{ x509.formData.username }}
+                        </label>
+                    </div>
+                }
+            </div>
+            <div [kcClass]="'kcFormGroupClass'">
+                <div
+                    id="kc-form-options"
+                    [kcClass]="'kcFormOptionsClass'"
+                >
+                    <div [kcClass]="'kcFormOptionsWrapperClass'"></div>
+                </div>
+                <div
+                    id="kc-form-buttons"
+                    [kcClass]="'kcFormButtonsClass'"
+                >
+                    <div [kcClass]="'kcFormButtonsWrapperClass'">
+                        <input
+                            [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonLargeClass']"
+                            name="login"
+                            id="kc-login"
+                            type="submit"
+                            [value]="i18n.msgStr('doContinue')"
+                        />
+                        @if (x509.formData.isUserEnabled) {
+                            <input
+                                [kcClass]="['kcButtonClass', 'kcButtonDefaultClass', 'kcButtonLargeClass']"
+                                name="cancel"
+                                id="kc-cancel"
+                                type="submit"
+                                [value]="i18n.msgStr('doIgnore')"
+                            />
+                        }
+                    </div>
+                </div>
+            </div>
+        </form>
+    </ng-container>
 </kc-login-template>

package/src/login/pages/login-x509-info/login-x509-info.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: [TemplateComponent, MsgStrPipe, KcClassDirective],
+    imports: [TemplateComponent, KcClassDirective],
     selector: 'kc-root',
     templateUrl: 'login-x509-info.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
@@ -31,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

@@ -3,57 +3,57 @@
 @let client = kcContext.client;
 
 <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>
-    {{ 'logoutConfirmTitle' | msgStr }}
-  </ng-container>
-  <ng-container content>
-    <div
-      id="kc-logout-confirm"
-      class="content-area"
-    >
-      <p class="instruction">{{ 'logoutConfirmHeader' | msgStr }}</p>
-      <form
-        class="form-actions"
-        [action]="url.logoutConfirmAction"
-        method="POST"
-      >
-        <input
-          type="hidden"
-          name="session_code"
-          [value]="logoutConfirm.code"
-        />
-        <div [kcClass]="'kcFormGroupClass'">
-          <div id="kc-form-options">
-            <div [kcClass]="'kcFormOptionsWrapperClass'"></div>
-          </div>
-          <div
-            id="kc-form-buttons"
-            class="kcFormGroupClass"
-          >
-            <input
-              tabIndex="4"
-              [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
-              name="confirmLogout"
-              id="kc-logout"
-              type="submit"
-              [value]="'doLogout' | msgStr"
-            />
-          </div>
+    <ng-container headerNode>
+        {{ i18n.msgStr('logoutConfirmTitle') }}
+    </ng-container>
+    <ng-container content>
+        <div
+            id="kc-logout-confirm"
+            class="content-area"
+        >
+            <p class="instruction">{{ i18n.msgStr('logoutConfirmHeader') }}</p>
+            <form
+                class="form-actions"
+                [action]="url.logoutConfirmAction"
+                method="POST"
+            >
+                <input
+                    type="hidden"
+                    name="session_code"
+                    [value]="logoutConfirm.code"
+                />
+                <div [kcClass]="'kcFormGroupClass'">
+                    <div id="kc-form-options">
+                        <div [kcClass]="'kcFormOptionsWrapperClass'"></div>
+                    </div>
+                    <div
+                        id="kc-form-buttons"
+                        class="kcFormGroupClass"
+                    >
+                        <input
+                            tabIndex="4"
+                            [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
+                            name="confirmLogout"
+                            id="kc-logout"
+                            type="submit"
+                            [value]="i18n.msgStr('doLogout')"
+                        />
+                    </div>
+                </div>
+            </form>
+            <div id="kc-info-message">
+                @if (!logoutConfirm.skipLink && client.baseUrl) {
+                    <p>
+                        <a [href]="client.baseUrl">{{ i18n.msgStr('backToApplication') }}</a>
+                    </p>
+                }
+            </div>
         </div>
-      </form>
-      <div id="kc-info-message">
-        @if (!logoutConfirm.skipLink && client.baseUrl) {
-          <p>
-            <a [href]="client.baseUrl">{{ 'backToApplication' | msgStr }}</a>
-          </p>
-        }
-      </div>
-    </div>
-  </ng-container>
+    </ng-container>
 </kc-login-template>

package/src/login/pages/logout-confirm/logout-confirm.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: [MsgStrPipe, TemplateComponent, KcClassDirective],
+    imports: [TemplateComponent, KcClassDirective],
     selector: 'kc-root',
     templateUrl: 'logout-confirm.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
@@ -31,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>();