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

package/src/login/pages/login-idp-link-confirm-override/login-idp-link-confirm-override.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/kc-class.directive';
-import { MsgStrPipe } from '@keycloakify/angular/login/pipes/msg-str.pipe';
+import { LOGIN_I18N } from '@keycloakify/angular/login/tokens/i18n.token';
+import { I18n } from '../../i18n';
+import { LOGIN_CLASSES } from '@keycloakify/angular/login/tokens/classes.token';
+import { KC_LOGIN_CONTEXT } from '@keycloakify/angular/login/tokens/kc-context.token';
+import { ClassKey } from 'keycloakify/login/lib/kcClsx';
+import { KcContext } from '../../KcContext';
 
 @Component({
     standalone: true,
-    imports: [KcClassDirective, TemplateComponent, MsgStrPipe],
+    imports: [KcClassDirective, TemplateComponent],
     selector: 'kc-root',
     templateUrl: 'login-idp-link-confirm-override.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
@@ -31,12 +24,10 @@ import { MsgStrPipe } from '@keycloakify/angular/login/pipes/msg-str.pipe';
     ]
 })
 export class LoginIdpLinkConfirmOverrideComponent extends ComponentReference {
-    kcContext =
-        inject<Extract<KcContext, { pageId: 'login-idp-link-confirm-override.ftl' }>>(
-            KC_CONTEXT
-        );
+    kcContext = inject<Extract<KcContext, { pageId: 'login-idp-link-confirm-override.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-idp-link-email/login-idp-link-email.component.html

@@ -3,35 +3,37 @@
 @let realm = kcContext.realm;
 @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>
-    {{ 'emailLinkIdpTitle' | msgStr: idpAlias }}
-  </ng-container>
-  <ng-container content>
-    <p
-      id="instruction1"
-      class="instruction"
-    >
-      {{ 'emailLinkIdp1' | msgStr: idpAlias : brokerContext.username : realm.displayName }}
-    </p>
-    <p
-      id="instruction2"
-      class="instruction"
-    >
-      {{ 'emailLinkIdp2' | msgStr }} <a [href]="url.loginAction">{{ 'doClickHere' | msgStr }}</a>
-      {{ 'emailLinkIdp3' | msgStr }}
-    </p>
-    <p
-      id="instruction3"
-      class="instruction"
-    >
-      {{ 'emailLinkIdp4' | msgStr }} <a [href]="url.loginAction">{{ 'doClickHere' | msgStr }}</a>
-      {{ 'emailLinkIdp5' | msgStr }}
-    </p></ng-container
-  >
+    <ng-container headerNode>
+        {{ i18n.msgStr('emailLinkIdpTitle', idpAlias) }}
+    </ng-container>
+    <ng-container content>
+        <p
+            id="instruction1"
+            class="instruction"
+        >
+            {{ i18n.msgStr('emailLinkIdp1', idpAlias, brokerContext.username, realm.displayName) }}
+        </p>
+        <p
+            id="instruction2"
+            class="instruction"
+        >
+            {{ i18n.msgStr('emailLinkIdp2') }}
+            <a [href]="url.loginAction">{{ i18n.msgStr('doClickHere') }}</a>
+            {{ i18n.msgStr('emailLinkIdp3') }}
+        </p>
+        <p
+            id="instruction3"
+            class="instruction"
+        >
+            {{ i18n.msgStr('emailLinkIdp4') }}
+            <a [href]="url.loginAction">{{ i18n.msgStr('doClickHere') }}</a>
+            {{ i18n.msgStr('emailLinkIdp5') }}
+        </p>
+    </ng-container>
 </kc-login-template>

package/src/login/pages/login-idp-link-email/login-idp-link-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/kc-class.directive';
-import { MsgStrPipe } from '@keycloakify/angular/login/pipes/msg-str.pipe';
+import { LOGIN_I18N } from '@keycloakify/angular/login/tokens/i18n.token';
+import { I18n } from '../../i18n';
+import { LOGIN_CLASSES } from '@keycloakify/angular/login/tokens/classes.token';
+import { KC_LOGIN_CONTEXT } from '@keycloakify/angular/login/tokens/kc-context.token';
+import { ClassKey } from 'keycloakify/login/lib/kcClsx';
+import { KcContext } from '../../KcContext';
 
 @Component({
     standalone: true,
-    imports: [TemplateComponent, MsgStrPipe, KcClassDirective],
+    imports: [TemplateComponent, KcClassDirective],
     selector: 'kc-root',
     templateUrl: 'login-idp-link-email.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
@@ -31,10 +24,10 @@ import { MsgStrPipe } from '@keycloakify/angular/login/pipes/msg-str.pipe';
     ]
 })
 export class LoginIdpLinkEmailComponent extends ComponentReference {
-    kcContext =
-        inject<Extract<KcContext, { pageId: 'login-idp-link-email.ftl' }>>(KC_CONTEXT);
+    kcContext = inject<Extract<KcContext, { pageId: 'login-idp-link-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-oauth-grant/login-oauth-grant.component.html

@@ -2,91 +2,93 @@
 @let oauth = kcContext.oauth;
 @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>
-    @if (client.attributes['logoUri']) {
-      <img
-        [src]="client.attributes['logoUri']"
-        alt=""
-      />
-    }
-    <p>{{ 'oauthGrantTitle' | msgStr: (client.name ? (client.name | advancedMsgStr) : client.clientId) }}</p>
-  </ng-container>
-
-  <ng-container content>
-    <div
-      id="kc-oauth"
-      class="content-area"
-    >
-      <h3>{{ 'oauthGrantRequest' | msgStr }}</h3>
-      <ul>
-        @for (clientScope of oauth.clientScopesRequested; track clientScope) {
-          <li>
-            <span>
-              {{ clientScope.consentScreenText | advancedMsgStr }}
-              @if (clientScope.dynamicScopeParameter) {
-                : <b>{{ clientScope.dynamicScopeParameter }}</b>
-              }
-            </span>
-          </li>
+    <ng-container headerNode>
+        @if (client.attributes['logoUri']) {
+            <img
+                [src]="client.attributes['logoUri']"
+                alt=""
+            />
         }
-      </ul>
+        <p>
+            {{ i18n.msgStr('oauthGrantTitle', client.name ? i18n.advancedMsgStr(client.name) : client.clientId) }}
+        </p>
+    </ng-container>
+
+    <ng-container content>
+        <div
+            id="kc-oauth"
+            class="content-area"
+        >
+            <h3>{{ i18n.msgStr('oauthGrantRequest') }}</h3>
+            <ul>
+                @for (clientScope of oauth.clientScopesRequested; track clientScope) {
+                    <li>
+                        <span>
+                            {{ i18n.advancedMsgStr(clientScope.consentScreenText) }}
+                            @if (clientScope.dynamicScopeParameter) {
+                                : <b>{{ clientScope.dynamicScopeParameter }}</b>
+                            }
+                        </span>
+                    </li>
+                }
+            </ul>
 
-      @if (client.attributes['policyUri'] || client.attributes['tosUri']) {
-        <h3>
-          @if (client.name) {
-            {{ 'oauthGrantInformation' | msgStr: (client.name | advancedMsgStr) }}
-          } @else {
-            {{ 'oauthGrantInformation' | msgStr: client.clientId }}
-          }
-          @if (client.attributes['policyUri']) {
-            {{ 'oauthGrantReview' | msgStr }}
-            <a
-              [href]="client.attributes['policyUri']"
-              target="_blank"
+            @if (client.attributes['policyUri'] || client.attributes['tosUri']) {
+                <h3>
+                    @if (client.name) {
+                        {{ i18n.msgStr('oauthGrantInformation', i18n.advancedMsgStr(client.name)) }}
+                    } @else {
+                        {{ i18n.msgStr('oauthGrantInformation', client.clientId) }}
+                    }
+                    @if (client.attributes['policyUri']) {
+                        {{ i18n.msgStr('oauthGrantReview') }}
+                        <a
+                            [href]="client.attributes['policyUri']"
+                            target="_blank"
+                        >
+                            {{ i18n.msgStr('oauthGrantPolicy') }}
+                        </a>
+                    }
+                </h3>
+            }
+            <form
+                class="form-actions"
+                [action]="url.oauthAction"
+                method="post"
             >
-              {{ 'oauthGrantPolicy' | msgStr }}
-            </a>
-          }
-        </h3>
-      }
-      <form
-        class="form-actions"
-        [action]="url.oauthAction"
-        method="post"
-      >
-        <input
-          type="hidden"
-          name="code"
-          [value]="oauth.code"
-        />
-        <div [kcClass]="'kcFormGroupClass'">
-          <div id="kc-form-options">
-            <div [kcClass]="'kcFormOptionsWrapperClass'"></div>
-          </div>
+                <input
+                    type="hidden"
+                    name="code"
+                    [value]="oauth.code"
+                />
+                <div [kcClass]="'kcFormGroupClass'">
+                    <div id="kc-form-options">
+                        <div [kcClass]="'kcFormOptionsWrapperClass'"></div>
+                    </div>
 
-          <div id="kc-form-buttons">
-            <div [kcClass]="'kcFormButtonsWrapperClass'">
-              <input
-                [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonLargeClass']"
-                type="submit"
-                [value]="'doYes' | msgStr"
-              />
-              <input
-                [kcClass]="['kcButtonClass', 'kcButtonDefaultClass', 'kcButtonLargeClass']"
-                type="submit"
-                [value]="'doNo' | msgStr"
-              />
-            </div>
-          </div>
+                    <div id="kc-form-buttons">
+                        <div [kcClass]="'kcFormButtonsWrapperClass'">
+                            <input
+                                [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonLargeClass']"
+                                type="submit"
+                                [value]="i18n.msgStr('doYes')"
+                            />
+                            <input
+                                [kcClass]="['kcButtonClass', 'kcButtonDefaultClass', 'kcButtonLargeClass']"
+                                type="submit"
+                                [value]="i18n.msgStr('doNo')"
+                            />
+                        </div>
+                    </div>
+                </div>
+            </form>
+            <div className="clearfix"></div>
         </div>
-      </form>
-      <div className="clearfix"></div>
-    </div>
-  </ng-container>
+    </ng-container>
 </kc-login-template>

package/src/login/pages/login-oauth-grant/login-oauth-grant.component.ts

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

package/src/login/pages/login-oauth2-device-verify-user-code/login-oauth2-device-verify-user-code.component.html

@@ -1,63 +1,63 @@
 @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>
-    {{ 'oauth2DeviceVerificationTitle' | msgStr }}
-  </ng-container>
-  <ng-container content>
-    <form
-      id="kc-user-verify-device-user-code-form"
-      [kcClass]="'kcFormClass'"
-      [action]="url.oauth2DeviceVerificationAction"
-      method="post"
-    >
-      <div [kcClass]="'kcFormGroupClass'">
-        <div [kcClass]="'kcLabelWrapperClass'">
-          <label
-            for="device-user-code"
-            [kcClass]="'kcLabelClass'"
-          >
-            {{ 'verifyOAuth2DeviceUserCode' | msgStr }}
-          </label>
-        </div>
-
-        <div [kcClass]="'kcInputWrapperClass'">
-          <input
-            id="device-user-code"
-            name="device_user_code"
-            autoComplete="off"
-            type="text"
-            [kcClass]="'kcInputClass'"
-            autofocus
-          />
-        </div>
-      </div>
-      <div [kcClass]="'kcFormGroupClass'">
-        <div
-          id="kc-form-options"
-          [kcClass]="'kcFormOptionsClass'"
+    <ng-container headerNode>
+        {{ i18n.msgStr('oauth2DeviceVerificationTitle') }}
+    </ng-container>
+    <ng-container content>
+        <form
+            id="kc-user-verify-device-user-code-form"
+            [kcClass]="'kcFormClass'"
+            [action]="url.oauth2DeviceVerificationAction"
+            method="post"
         >
-          <div [kcClass]="'kcFormOptionsWrapperClass'"></div>
-        </div>
+            <div [kcClass]="'kcFormGroupClass'">
+                <div [kcClass]="'kcLabelWrapperClass'">
+                    <label
+                        for="device-user-code"
+                        [kcClass]="'kcLabelClass'"
+                    >
+                        {{ i18n.msgStr('verifyOAuth2DeviceUserCode') }}
+                    </label>
+                </div>
 
-        <div
-          id="kc-form-buttons"
-          [kcClass]="'kcFormButtonsClass'"
-        >
-          <div [kcClass]="'kcFormButtonsWrapperClass'">
-            <input
-              [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonLargeClass']"
-              type="submit"
-              value="{{ 'doSubmit' | msgStr }}"
-            />
-          </div>
-        </div>
-      </div>
-    </form>
-  </ng-container>
+                <div [kcClass]="'kcInputWrapperClass'">
+                    <input
+                        id="device-user-code"
+                        name="device_user_code"
+                        autoComplete="off"
+                        type="text"
+                        [kcClass]="'kcInputClass'"
+                        autofocus
+                    />
+                </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']"
+                            type="submit"
+                            [value]="i18n.msgStr('doSubmit')"
+                        />
+                    </div>
+                </div>
+            </div>
+        </form>
+    </ng-container>
 </kc-login-template>

package/src/login/pages/login-oauth2-device-verify-user-code/login-oauth2-device-verify-user-code.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/kc-class.directive';
-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],
+    imports: [TemplateComponent, KcClassDirective],
     selector: 'kc-root',
     templateUrl: 'login-oauth2-device-verify-user-code.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
@@ -31,12 +24,10 @@ import { MsgStrPipe } from '@keycloakify/angular/login/pipes/msg-str.pipe';
     ]
 })
 export class LoginOauth2DeviceVerifyUserCodeComponent extends ComponentReference {
-    kcContext =
-        inject<
-            Extract<KcContext, { pageId: 'login-oauth2-device-verify-user-code.ftl' }>
-        >(KC_CONTEXT);
+    kcContext = inject<Extract<KcContext, { pageId: 'login-oauth2-device-verify-user-code.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>();