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

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

@@ -1,33 +1,22 @@
-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 { 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({
     standalone: true,
-    imports: [TemplateComponent, MsgStrPipe, KcSanitizePipe, AdvancedMsgStrPipe],
+    imports: [TemplateComponent, KcSanitizePipe],
     selector: 'kc-root',
     templateUrl: 'info.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
     providers: [
-        AdvancedMsgStrPipe,
-        MsgStrPipe,
-        KcSanitizePipe,
         {
             provide: ComponentReference,
             useExisting: forwardRef(() => InfoComponent)
@@ -35,12 +24,10 @@ import { MsgStrPipe } from '@keycloakify/angular/login/pipes/msg-str.pipe';
     ]
 })
 export class InfoComponent extends ComponentReference {
-    kcContext = inject<Extract<KcContext, { pageId: 'info.ftl' }>>(KC_CONTEXT);
-    advancedMsgStr = inject(AdvancedMsgStrPipe);
-    kcSanitize = inject(KcSanitizePipe);
-    msgStr = inject(MsgStrPipe);
+    kcContext = inject<Extract<KcContext, { pageId: '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>();
@@ -52,11 +39,7 @@ export class InfoComponent extends ComponentReference {
         if (this.kcContext.requiredActions) {
             html += '<b>';
 
-            html += this.kcContext.requiredActions
-                .map(requiredAction =>
-                    this.advancedMsgStr.transform(`requiredAction.${requiredAction}`)
-                )
-                .join(', ');
+            html += this.kcContext.requiredActions.map(requiredAction => this.i18n.advancedMsgStr(`requiredAction.${requiredAction}`)).join(', ');
 
             html += '</b>';
         }

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

@@ -7,206 +7,206 @@
 @let login = kcContext.login;
 
 <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>
-    {{ 'loginAccountTitle' | msgStr }}
-  </ng-container>
-  <ng-container infoNode>
-    <div id="kc-registration-container">
-      <div id="kc-registration">
-        <span>
-          {{ 'noAccount' | msgStr }}
-          <a
-            tabindex="8"
-            [href]="url?.registrationUrl"
-          >
-            {{ 'doRegister' | msgStr }}
-          </a>
-        </span>
-      </div>
-    </div>
-  </ng-container>
-  <ng-container socialProvidersNode>
-    @if (!!realm?.password && !!social?.providers?.length) {
-      <div
-        id="kc-social-providers"
-        [kcClass]="'kcFormSocialAccountSectionClass'"
-      >
-        <hr />
-        <h2>{{ 'identity-provider-login-label' | msgStr }}</h2>
-        <ul
-          [kcClass]="{
-            kcFormSocialAccountListClass: true,
-            kcFormSocialAccountListGridClass: (social?.providers?.length ?? 0) > 3,
-          }"
-        >
-          @for (provider of social?.providers; track provider.alias; let idx = $index) {
-            <li>
-              <a
-                [id]="provider.alias"
-                [kcClass]="{
-                  kcFormSocialAccountListButtonClass: true,
-                  kcFormSocialAccountGridItem: (social?.providers?.length ?? 0) > 3,
-                }"
-                type="button"
-                [href]="provider.loginUrl"
-              >
-                @if (provider.iconClasses) {
-                  <i
-                    [ngClass]="provider.iconClasses"
-                    [kcClass]="'kcCommonLogoIdP'"
-                    aria-hidden="true"
-                  ></i>
-                }
-                <span
-                  [ngClass]="{
-                    'kc-social-icon-text': provider.iconClasses,
-                  }"
-                  [kcClass]="'kcFormSocialAccountNameClass'"
-                  [innerHTML]="provider.displayName | kcSanitize: 'html'"
-                ></span>
-              </a>
-            </li>
-          }
-        </ul>
-      </div>
-    }
-  </ng-container>
-  <ng-container content>
-    <div id="kc-form">
-      <div id="kc-form-wrapper">
-        <!-- login.component.html -->
-        @if (realm?.password) {
-          <form
-            id="kc-form-login"
-            (onSubmit)="isLoginButtonDisabled.set(true)"
-            [action]="url?.loginAction"
-            method="post"
-          >
-            @if (!usernameHidden) {
-              <div [kcClass]="'kcFormGroupClass'">
-                <label
-                  for="username"
-                  [kcClass]="'kcLabelClass'"
-                >
-                  @if (!realm?.loginWithEmailAllowed) {
-                    {{ 'username' | msgStr }}
-                  } @else if (!realm?.registrationEmailAsUsername) {
-                    {{ 'usernameOrEmail' | msgStr }}
-                  } @else {
-                    {{ 'email' | msgStr }}
-                  }
-                </label>
-                <input
-                  tabindex="2"
-                  id="username"
-                  [kcClass]="'kcInputClass'"
-                  name="username"
-                  type="text"
-                  autofocus
-                  [defaultValue]="login?.username || ''"
-                  [attr.aria-invalid]="messagesPerField?.existsError('username', 'password')"
-                />
-                @if (messagesPerField?.existsError('username', 'password')) {
-                  <span
-                    id="input-error"
-                    [kcClass]="'kcInputErrorMessageClass'"
-                    aria-live="polite"
-                    [innerHTML]="messagesPerField?.getFirstError('username', 'password') | kcSanitize: 'html'"
-                  >
-                  </span>
-                }
-              </div>
-            }
-
-            <div [kcClass]="'kcFormGroupClass'">
-              <label
-                for="password"
-                [kcClass]="'kcLabelClass'"
-              >
-                {{ 'password' | msgStr }}
-              </label>
-
-              <kc-password-wrapper passwordInputId="password">
-                <input
-                  tabindex="3"
-                  id="password"
-                  [kcClass]="'kcInputClass'"
-                  name="password"
-                  type="password"
-                  autocomplete="off"
-                  [attr.aria-invalid]="messagesPerField.existsError('username', 'password')"
-                />
-              </kc-password-wrapper>
-              @if (usernameHidden && messagesPerField?.existsError('username', 'password')) {
-                <span
-                  id="input-error"
-                  [kcClass]="'kcInputErrorMessageClass'"
-                  aria-live="polite"
-                  [innerHTML]="messagesPerField?.getFirstError('username', 'password') | kcSanitize: 'html'"
-                >
-                </span>
-              }
-            </div>
-
-            <div [kcClass]="['kcFormGroupClass', 'kcFormSettingClass']">
-              <div id="kc-form-options">
-                @if (realm?.rememberMe && !usernameHidden) {
-                  <div class="checkbox">
-                    <label>
-                      <input
-                        tabindex="5"
-                        id="rememberMe"
-                        name="rememberMe"
-                        type="checkbox"
-                        [defaultChecked]="!!login?.rememberMe"
-                      />
-                      {{ 'rememberMe' | msgStr }}
-                    </label>
-                  </div>
-                }
-              </div>
-
-              <div [kcClass]="'kcFormOptionsWrapperClass'">
-                @if (realm?.resetPasswordAllowed) {
-                  <span>
+    <ng-container headerNode>
+        {{ i18n.msgStr('loginAccountTitle') }}
+    </ng-container>
+    <ng-container infoNode>
+        <div id="kc-registration-container">
+            <div id="kc-registration">
+                <span>
+                    {{ i18n.msgStr('noAccount') }}
                     <a
-                      tabindex="6"
-                      [href]="url?.loginResetCredentialsUrl"
-                      >{{ 'doForgotPassword' | msgStr }}</a
+                        tabindex="8"
+                        [href]="url?.registrationUrl"
                     >
-                  </span>
-                }
-              </div>
+                        {{ i18n.msgStr('doRegister') }}
+                    </a>
+                </span>
             </div>
+        </div>
+    </ng-container>
+    <ng-container socialProvidersNode>
+        @if (!!realm?.password && !!social?.providers?.length) {
             <div
-              id="kc-form-buttons"
-              [kcClass]="'kcFormGroupClass'"
+                id="kc-social-providers"
+                [kcClass]="'kcFormSocialAccountSectionClass'"
             >
-              <input
-                type="hidden"
-                id="id-hidden-input"
-                name="credentialId"
-                [value]="auth?.selectedCredential"
-              />
-              <input
-                tabindex="7"
-                [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
-                name="login"
-                id="kc-login"
-                type="submit"
-                [value]="'doLogIn' | msgStr"
-                [disabled]="isLoginButtonDisabled()"
-              />
+                <hr />
+                <h2>{{ i18n.msgStr('identity-provider-login-label') }}</h2>
+                <ul
+                    [kcClass]="{
+                        kcFormSocialAccountListClass: true,
+                        kcFormSocialAccountListGridClass: (social?.providers?.length ?? 0) > 3
+                    }"
+                >
+                    @for (provider of social?.providers; track provider.alias; let idx = $index) {
+                        <li>
+                            <a
+                                [id]="provider.alias"
+                                [kcClass]="{
+                                    kcFormSocialAccountListButtonClass: true,
+                                    kcFormSocialAccountGridItem: (social?.providers?.length ?? 0) > 3
+                                }"
+                                type="button"
+                                [href]="provider.loginUrl"
+                            >
+                                @if (provider.iconClasses) {
+                                    <i
+                                        [ngClass]="provider.iconClasses"
+                                        [kcClass]="'kcCommonLogoIdP'"
+                                        aria-hidden="true"
+                                    ></i>
+                                }
+                                <span
+                                    [ngClass]="{
+                                        'kc-social-icon-text': provider.iconClasses
+                                    }"
+                                    [kcClass]="'kcFormSocialAccountNameClass'"
+                                    [innerHTML]="provider.displayName | kcSanitize: 'html'"
+                                ></span>
+                            </a>
+                        </li>
+                    }
+                </ul>
             </div>
-          </form>
         }
-      </div>
-    </div>
-  </ng-container>
+    </ng-container>
+    <ng-container content>
+        <div id="kc-form">
+            <div id="kc-form-wrapper">
+                <!-- login.component.html -->
+                @if (realm?.password) {
+                    <form
+                        id="kc-form-login"
+                        (onSubmit)="isLoginButtonDisabled.set(true)"
+                        [action]="url?.loginAction"
+                        method="post"
+                    >
+                        @if (!usernameHidden) {
+                            <div [kcClass]="'kcFormGroupClass'">
+                                <label
+                                    for="username"
+                                    [kcClass]="'kcLabelClass'"
+                                >
+                                    @if (!realm?.loginWithEmailAllowed) {
+                                        {{ i18n.msgStr('username') }}
+                                    } @else if (!realm?.registrationEmailAsUsername) {
+                                        {{ i18n.msgStr('usernameOrEmail') }}
+                                    } @else {
+                                        {{ i18n.msgStr('email') }}
+                                    }
+                                </label>
+                                <input
+                                    tabindex="2"
+                                    id="username"
+                                    [kcClass]="'kcInputClass'"
+                                    name="username"
+                                    type="text"
+                                    autofocus
+                                    [defaultValue]="login?.username || ''"
+                                    [attr.aria-invalid]="messagesPerField?.existsError('username', 'password')"
+                                />
+                                @if (messagesPerField?.existsError('username', 'password')) {
+                                    <span
+                                        id="input-error"
+                                        [kcClass]="'kcInputErrorMessageClass'"
+                                        aria-live="polite"
+                                        [innerHTML]="messagesPerField.getFirstError('username', 'password') | kcSanitize: 'html'"
+                                    >
+                                    </span>
+                                }
+                            </div>
+                        }
+
+                        <div [kcClass]="'kcFormGroupClass'">
+                            <label
+                                for="password"
+                                [kcClass]="'kcLabelClass'"
+                            >
+                                {{ i18n.msgStr('password') }}
+                            </label>
+
+                            <kc-password-wrapper passwordInputId="password">
+                                <input
+                                    tabindex="3"
+                                    id="password"
+                                    [kcClass]="'kcInputClass'"
+                                    name="password"
+                                    type="password"
+                                    autocomplete="off"
+                                    [attr.aria-invalid]="messagesPerField.existsError('username', 'password')"
+                                />
+                            </kc-password-wrapper>
+                            @if (usernameHidden && messagesPerField?.existsError('username', 'password')) {
+                                <span
+                                    id="input-error"
+                                    [kcClass]="'kcInputErrorMessageClass'"
+                                    aria-live="polite"
+                                    [innerHTML]="messagesPerField.getFirstError('username', 'password') | kcSanitize: 'html'"
+                                >
+                                </span>
+                            }
+                        </div>
+
+                        <div [kcClass]="['kcFormGroupClass', 'kcFormSettingClass']">
+                            <div id="kc-form-options">
+                                @if (realm?.rememberMe && !usernameHidden) {
+                                    <div class="checkbox">
+                                        <label>
+                                            <input
+                                                tabindex="5"
+                                                id="rememberMe"
+                                                name="rememberMe"
+                                                type="checkbox"
+                                                [defaultChecked]="!!login?.rememberMe"
+                                            />
+                                            {{ i18n.msgStr('rememberMe') }}
+                                        </label>
+                                    </div>
+                                }
+                            </div>
+
+                            <div [kcClass]="'kcFormOptionsWrapperClass'">
+                                @if (realm?.resetPasswordAllowed) {
+                                    <span>
+                                        <a
+                                            tabindex="6"
+                                            [href]="url?.loginResetCredentialsUrl"
+                                            >{{ i18n.msgStr('doForgotPassword') }}</a
+                                        >
+                                    </span>
+                                }
+                            </div>
+                        </div>
+                        <div
+                            id="kc-form-buttons"
+                            [kcClass]="'kcFormGroupClass'"
+                        >
+                            <input
+                                type="hidden"
+                                id="id-hidden-input"
+                                name="credentialId"
+                                [value]="auth?.selectedCredential"
+                            />
+                            <input
+                                tabindex="7"
+                                [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
+                                name="login"
+                                id="kc-login"
+                                type="submit"
+                                [value]="i18n.msgStr('doLogIn')"
+                                [disabled]="isLoginButtonDisabled()"
+                            />
+                        </div>
+                    </form>
+                }
+            </div>
+        </div>
+    </ng-container>
 </kc-login-template>

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

@@ -1,40 +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 { ChangeDetectionStrategy, Component, forwardRef, inject, input, signal } 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 { PasswordWrapperComponent } from '@keycloakify/angular/login/components/password-wrapper/password-wrapper.component';
 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.component.html',
     standalone: true,
     changeDetection: ChangeDetectionStrategy.OnPush,
-    imports: [
-        KcClassDirective,
-        AsyncPipe,
-        KcSanitizePipe,
-        PasswordWrapperComponent,
-        NgClass,
-        TemplateComponent,
-        MsgStrPipe
-    ],
+    imports: [KcClassDirective, AsyncPipe, KcSanitizePipe, PasswordWrapperComponent, NgClass, TemplateComponent],
     providers: [
         {
             provide: ComponentReference,
@@ -43,19 +27,14 @@ import { MsgStrPipe } from '@keycloakify/angular/login/pipes/msg-str.pipe';
     ]
 })
 export class LoginComponent extends ComponentReference {
-    kcContext = inject<Extract<KcContext, { pageId: 'login.ftl' }>>(KC_CONTEXT);
+    kcContext = inject<Extract<KcContext, { pageId: 'login.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',
-        'password'
-    );
+    displayInfo: boolean = !!this.kcContext?.realm?.password && !!this.kcContext?.realm?.registrationAllowed && !this.kcContext?.registrationDisabled;
+    displayMessage: boolean = !this.kcContext?.messagesPerField?.existsError('username', 'password');
 }