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

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

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

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

@@ -1,27 +1,20 @@
-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 { 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 { ChangeDetectionStrategy, Component, forwardRef, inject, TemplateRef, viewChild } from '@angular/core';
+import { KcSanitizePipe } from '@keycloakify/angular/lib/pipes/kc-sanitize';
+import { USE_DEFAULT_CSS } from '@keycloakify/angular/lib/tokens/use-default-css';
+import { ComponentReference } from '@keycloakify/angular/login/classes/component-reference';
+import { TemplateComponent } from '@keycloakify/angular/login/containers/template';
+import { KcClassDirective } from '@keycloakify/angular/login/directives/kc-class';
+import type { I18n } from '../../i18n';
+import type { KcContext } from '../../KcContext';
+import { LOGIN_CLASSES } from '@keycloakify/angular/login/tokens/classes';
+import { LOGIN_I18N } from '@keycloakify/angular/login/tokens/i18n';
+import { KC_LOGIN_CONTEXT } from '@keycloakify/angular/login/tokens/kc-context';
+import type { ClassKey } from 'keycloakify/login/lib/kcClsx';
 
 @Component({
     standalone: true,
-    imports: [TemplateComponent, KcClassDirective, MsgStrPipe, KcSanitizePipe],
-    selector: 'kc-root',
+    imports: [TemplateComponent, KcClassDirective, KcSanitizePipe],
+    selector: 'kc-login-otp',
     templateUrl: 'login-otp.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
     providers: [
@@ -32,12 +25,20 @@ import { MsgStrPipe } from '@keycloakify/angular/login/pipes/msg-str.pipe';
     ]
 })
 export class LoginOtpComponent extends ComponentReference {
-    kcContext = inject<Extract<KcContext, { pageId: 'login-otp.ftl' }>>(KC_CONTEXT);
+    kcContext = inject<Extract<KcContext, { pageId: 'login-otp.ftl' }>>(KC_LOGIN_CONTEXT);
+    i18n = inject<I18n>(LOGIN_I18N);
+
     override doUseDefaultCss = inject<boolean>(USE_DEFAULT_CSS);
-    override classes = inject<Partial<Record<ClassKey, string>>>(CLASSES);
-    displayRequiredFields = input(false);
-    documentTitle = input<string>();
-    bodyClassName = input<string>();
-    displayInfo: boolean = false;
+    override classes = inject<Partial<Record<ClassKey, string>>>(LOGIN_CLASSES);
+
+    documentTitle: string | undefined;
+    bodyClassName: string | undefined;
+
+    displayRequiredFields = false;
+    displayInfo = false;
     displayMessage: boolean = this.kcContext.messagesPerField.existsError('totp');
+
+    headerNode? = viewChild<TemplateRef<HTMLElement>>('headerNode');
+    infoNode? = viewChild<TemplateRef<HTMLElement>>('infoNode');
+    socialProvidersNode? = viewChild<TemplateRef<HTMLElement>>('socialProvidersNode');
 }

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

@@ -1,35 +1,28 @@
 @let url = kcContext.url;
-<kc-login-template
-  [displayInfo]="displayInfo"
-  [bodyClassName]="bodyClassName()"
-  [displayMessage]="displayMessage"
-  [displayRequiredFields]="displayRequiredFields()"
-  [documentTitle]="documentTitle()"
->
-  <ng-container headerNode>
-    {{ 'pageExpiredTitle' | msgStr }}
-  </ng-container>
-  <ng-container content>
+
+<ng-container #headerNode>
+    {{ i18n.msgStr('pageExpiredTitle') }}
+</ng-container>
+<ng-container content>
     <p
-      id="instruction1"
-      class="instruction"
+        id="instruction1"
+        class="instruction"
     >
-      {{ 'pageExpiredMsg1' | msgStr }}
-      <a
-        id="loginRestartLink"
-        [href]="url.loginRestartFlowUrl"
-      >
-        {{ 'doClickHere' | msgStr }}
-      </a>
-      .<br />
-      {{ 'pageExpiredMsg2' | msgStr }}
-      <a
-        id="loginContinueLink"
-        [href]="url.loginAction"
-      >
-        {{ 'doClickHere' | msgStr }}
-      </a>
-      .
+        {{ i18n.msgStr('pageExpiredMsg1') }}
+        <a
+            id="loginRestartLink"
+            [href]="url.loginRestartFlowUrl"
+        >
+            {{ i18n.msgStr('doClickHere') }}
+        </a>
+        .<br />
+        {{ i18n.msgStr('pageExpiredMsg2') }}
+        <a
+            id="loginContinueLink"
+            [href]="url.loginAction"
+        >
+            {{ i18n.msgStr('doClickHere') }}
+        </a>
+        .
     </p>
-  </ng-container>
-</kc-login-template>
+</ng-container>

package/src/login/pages/login-page-expired/login-page-expired.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 { 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 { ChangeDetectionStrategy, Component, forwardRef, inject, TemplateRef, viewChild } from '@angular/core';
+import { USE_DEFAULT_CSS } from '@keycloakify/angular/lib/tokens/use-default-css';
+import { ComponentReference } from '@keycloakify/angular/login/classes/component-reference';
+import { TemplateComponent } from '@keycloakify/angular/login/containers/template';
+import type { I18n } from '../../i18n';
+import type { KcContext } from '../../KcContext';
+import { LOGIN_CLASSES } from '@keycloakify/angular/login/tokens/classes';
+import { LOGIN_I18N } from '@keycloakify/angular/login/tokens/i18n';
+import { KC_LOGIN_CONTEXT } from '@keycloakify/angular/login/tokens/kc-context';
+import type { ClassKey } from 'keycloakify/login/lib/kcClsx';
 
 @Component({
     standalone: true,
-    imports: [TemplateComponent, MsgStrPipe],
-    selector: 'kc-root',
+    imports: [TemplateComponent],
+    selector: 'kc-login-page-expired',
     templateUrl: 'login-page-expired.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
     providers: [
@@ -30,13 +23,19 @@ import { MsgStrPipe } from '@keycloakify/angular/login/pipes/msg-str.pipe';
     ]
 })
 export class LoginPageExpiredComponent extends ComponentReference {
-    kcContext =
-        inject<Extract<KcContext, { pageId: 'login-page-expired.ftl' }>>(KC_CONTEXT);
+    kcContext = inject<Extract<KcContext, { pageId: 'login-page-expired.ftl' }>>(KC_LOGIN_CONTEXT);
+    i18n = inject<I18n>(LOGIN_I18N);
     override doUseDefaultCss = inject<boolean>(USE_DEFAULT_CSS);
-    override classes = inject<Partial<Record<ClassKey, string>>>(CLASSES);
-    displayRequiredFields = input(false);
-    documentTitle = input<string>();
-    bodyClassName = input<string>();
-    displayInfo: boolean = false;
-    displayMessage: boolean = false;
+    override classes = inject<Partial<Record<ClassKey, string>>>(LOGIN_CLASSES);
+
+    documentTitle: string | undefined;
+    bodyClassName: string | undefined;
+
+    displayRequiredFields = false;
+    displayInfo = false;
+    displayMessage = false;
+
+    headerNode? = viewChild<TemplateRef<HTMLElement>>('headerNode');
+    infoNode? = viewChild<TemplateRef<HTMLElement>>('infoNode');
+    socialProvidersNode? = viewChild<TemplateRef<HTMLElement>>('socialProvidersNode');
 }