@keycloakify/angular 0.0.1-rc.17 → 0.0.1-rc.19

package/src/login/pages/login-config-totp/login-config-totp.component.html

@@ -3,198 +3,189 @@
 @let messagesPerField = kcContext.messagesPerField;
 @let mode = kcContext.mode;
 @let isAppInitiatedAction = kcContext.isAppInitiatedAction;
-<kc-login-template
-    [displayInfo]="displayInfo"
-    [bodyClassName]="bodyClassName()"
-    [displayMessage]="displayMessage"
-    [displayRequiredFields]="displayRequiredFields()"
-    [documentTitle]="documentTitle()"
->
-    <ng-container headerNode>
-        {{ i18n.msgStr('loginTotpStep1') }}
-    </ng-container>
-    <ng-container content>
-        <ol id="kc-totp-settings">
-            <li>
-                <p>{{ i18n.msgStr('loginTotpStep1') }}</p>
-                <ul id="kc-totp-supported-apps">
-                    @for (app of totp.supportedApplications; track app) {
-                        <li>{{ i18n.advancedMsgStr(app) }}</li>
-                    }
-                </ul>
-            </li>
-            @if (kcContext.mode === 'manual') {
-                <li>
-                    <p>{{ i18n.msgStr('loginTotpManualStep2') }}</p>
-                    <p>
-                        <span id="kc-totp-secret-key">{{ totp.totpSecretEncoded }}</span>
-                    </p>
-                    <p>
-                        <a
-                            [href]="totp.qrUrl"
-                            id="mode-barcode"
-                        >
-                            {{ i18n.msgStr('loginTotpScanBarcode') }}
-                        </a>
-                    </p>
-                </li>
-                <li>
-                    <p>{{ i18n.msgStr('loginTotpManualStep3') }}</p>
-                    <p></p>
-                    <ul>
-                        <li id="kc-totp-type">
-                            {{ i18n.msgStr('loginTotpType') }}:
-                            {{ i18n.advancedMsgStr('loginTotp.' + totp.policy.type) }}
-                        </li>
-                        <li id="kc-totp-algorithm">
-                            {{ i18n.msgStr('loginTotpAlgorithm') }}:
-                            {{ totp.policy.getAlgorithmKey() }}
-                        </li>
-                        <li id="kc-totp-digits">{{ i18n.msgStr('loginTotpDigits') }}: {{ totp.policy.digits }}</li>
-                        @if (totp.policy.type === 'totp') {
-                            <li id="kc-totp-period">
-                                {{ i18n.msgStr('loginTotpInterval') }}:
-                                {{ totp.policy.period }}
-                            </li>
-                        } @else {
-                            <li id="kc-totp-counter">
-                                {{ i18n.msgStr('loginTotpCounter') }}:
-                                {{ totp.policy.initialCounter }}
-                            </li>
-                        }
-                    </ul>
+
+<ng-template #headerNode>
+    {{ i18n.msgStr('loginTotpStep1') }}
+</ng-template>
+<ol id="kc-totp-settings">
+    <li>
+        <p>{{ i18n.msgStr('loginTotpStep1') }}</p>
+        <ul id="kc-totp-supported-apps">
+            @for (app of totp.supportedApplications; track app) {
+                <li>{{ i18n.advancedMsgStr(app) }}</li>
+            }
+        </ul>
+    </li>
+    @if (kcContext.mode === 'manual') {
+        <li>
+            <p>{{ i18n.msgStr('loginTotpManualStep2') }}</p>
+            <p>
+                <span id="kc-totp-secret-key">{{ totp.totpSecretEncoded }}</span>
+            </p>
+            <p>
+                <a
+                    id="mode-barcode"
+                    [href]="totp.qrUrl"
+                >
+                    {{ i18n.msgStr('loginTotpScanBarcode') }}
+                </a>
+            </p>
+        </li>
+        <li>
+            <p>{{ i18n.msgStr('loginTotpManualStep3') }}</p>
+            <p></p>
+            <ul>
+                <li id="kc-totp-type">
+                    {{ i18n.msgStr('loginTotpType') }}:
+                    {{ i18n.advancedMsgStr('loginTotp.' + totp.policy.type) }}
                 </li>
-            } @else {
-                <li>
-                    <p>{{ i18n.msgStr('loginTotpStep2') }}</p>
-                    <img
-                        id="kc-totp-secret-qr-code"
-                        [src]="'data:image/png;base64, ' + totp.totpSecretQrCode"
-                        alt="Figure: Barcode"
-                    />
-                    <br />
-                    <p>
-                        <a
-                            [href]="totp.manualUrl"
-                            id="mode-manual"
-                        >
-                            {{ i18n.msgStr('loginTotpUnableToScan') }}
-                        </a>
-                    </p>
+                <li id="kc-totp-algorithm">
+                    {{ i18n.msgStr('loginTotpAlgorithm') }}:
+                    {{ totp.policy.getAlgorithmKey() }}
                 </li>
-            }
-            <li>
-                <p>{{ i18n.msgStr('loginTotpStep3') }}</p>
-                <p>{{ i18n.msgStr('loginTotpStep3DeviceName') }}</p>
-            </li>
-        </ol>
-        <form
-            [action]="url.loginAction"
-            [kcClass]="'kcFormClass'"
-            id="kc-totp-settings-form"
-            method="post"
-        >
-            <div [kcClass]="'kcFormGroupClass'">
-                <div [kcClass]="'kcInputWrapperClass'">
-                    <label
-                        for="totp"
-                        [kcClass]="'kcLabelClass'"
-                    >
-                        {{ i18n.msgStr('authenticatorCode') }}
-                    </label>
-                    <span class="required">*</span>
-                </div>
-                <div [kcClass]="'kcInputWrapperClass'">
-                    <input
-                        type="text"
-                        id="totp"
-                        name="totp"
-                        autoComplete="off"
-                        [kcClass]="'kcInputClass'"
-                        [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>
-                    }
-                </div>
-                <input
-                    type="hidden"
-                    id="totpSecret"
-                    name="totpSecret"
-                    [value]="totp.totpSecret"
-                />
-                @if (mode) {
-                    <input
-                        type="hidden"
-                        id="mode"
-                        [value]="mode"
-                    />
+                <li id="kc-totp-digits">{{ i18n.msgStr('loginTotpDigits') }}: {{ totp.policy.digits }}</li>
+                @if (totp.policy.type === 'totp') {
+                    <li id="kc-totp-period">
+                        {{ i18n.msgStr('loginTotpInterval') }}:
+                        {{ totp.policy.period }}
+                    </li>
+                } @else {
+                    <li id="kc-totp-counter">
+                        {{ i18n.msgStr('loginTotpCounter') }}:
+                        {{ totp.policy.initialCounter }}
+                    </li>
                 }
-            </div>
-            <div [kcClass]="'kcFormGroupClass'">
-                <div [kcClass]="'kcInputWrapperClass'">
-                    <label
-                        for="userLabel"
-                        [kcClass]="'kcLabelClass'"
-                    >
-                        {{ i18n.msgStr('loginTotpDeviceName') }}
-                    </label>
-                    @if (totp.otpCredentials.length >= 1) {
-                        <span class="required">*</span>
-                    }
-                </div>
-                <div [kcClass]="'kcInputWrapperClass'">
-                    <input
-                        type="text"
-                        id="userLabel"
-                        name="userLabel"
-                        autoComplete="off"
-                        [kcClass]="'kcInputClass'"
-                        [attr.aria-invalid]="messagesPerField.existsError('userLabel')"
-                    />
-                    @if (messagesPerField.existsError('userLabel')) {
-                        <span
-                            id="input-error-otp-label"
-                            [kcClass]="'kcInputErrorMessageClass'"
-                            aria-live="polite"
-                            [innerHTML]="messagesPerField.get('userLabel') | kcSanitize: 'html'"
-                        ></span>
-                    }
-                </div>
-            </div>
-            <div [kcClass]="'kcFormGroupClass'">
-                <kc-logout-other-sessions />
-            </div>
-
-            @if (isAppInitiatedAction) {
-                <input
-                    type="submit"
-                    [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonLargeClass']"
-                    id="saveTOTPBtn"
-                    [value]="i18n.msgStr('doSubmit')"
-                />
-                <button
-                    type="submit"
-                    [kcClass]="['kcButtonClass', 'kcButtonDefaultClass', 'kcButtonLargeClass', 'kcButtonLargeClass']"
-                    id="cancelTOTPBtn"
-                    name="cancel-aia"
-                    [value]="true"
+            </ul>
+        </li>
+    } @else {
+        <li>
+            <p>{{ i18n.msgStr('loginTotpStep2') }}</p>
+            <img
+                id="kc-totp-secret-qr-code"
+                alt="Figure: Barcode"
+                [src]="'data:image/png;base64, ' + totp.totpSecretQrCode"
+            />
+            <br />
+            <p>
+                <a
+                    id="mode-manual"
+                    [href]="totp.manualUrl"
                 >
-                    {{ i18n.msgStr('doCancel') }}
-                </button>
-            } @else {
-                <input
-                    type="submit"
-                    [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonLargeClass']"
-                    id="saveTOTPBtn"
-                    [value]="i18n.msgStr('doSubmit')"
-                />
+                    {{ i18n.msgStr('loginTotpUnableToScan') }}
+                </a>
+            </p>
+        </li>
+    }
+    <li>
+        <p>{{ i18n.msgStr('loginTotpStep3') }}</p>
+        <p>{{ i18n.msgStr('loginTotpStep3DeviceName') }}</p>
+    </li>
+</ol>
+<form
+    id="kc-totp-settings-form"
+    method="post"
+    [action]="url.loginAction"
+    [kcClass]="'kcFormClass'"
+>
+    <div [kcClass]="'kcFormGroupClass'">
+        <div [kcClass]="'kcInputWrapperClass'">
+            <label
+                for="totp"
+                [kcClass]="'kcLabelClass'"
+            >
+                {{ i18n.msgStr('authenticatorCode') }}
+            </label>
+            <span class="required">*</span>
+        </div>
+        <div [kcClass]="'kcInputWrapperClass'">
+            <input
+                type="text"
+                id="totp"
+                name="totp"
+                autoComplete="off"
+                [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>
+        <input
+            type="hidden"
+            id="totpSecret"
+            name="totpSecret"
+            [value]="totp.totpSecret"
+        />
+        @if (mode) {
+            <input
+                type="hidden"
+                id="mode"
+                [value]="mode"
+            />
+        }
+    </div>
+    <div [kcClass]="'kcFormGroupClass'">
+        <div [kcClass]="'kcInputWrapperClass'">
+            <label
+                for="userLabel"
+                [kcClass]="'kcLabelClass'"
+            >
+                {{ i18n.msgStr('loginTotpDeviceName') }}
+            </label>
+            @if (totp.otpCredentials.length >= 1) {
+                <span class="required">*</span>
             }
-        </form>
-    </ng-container>
-</kc-login-template>
+        </div>
+        <div [kcClass]="'kcInputWrapperClass'">
+            <input
+                type="text"
+                id="userLabel"
+                name="userLabel"
+                autoComplete="off"
+                [kcClass]="'kcInputClass'"
+                [attr.aria-invalid]="messagesPerField.existsError('userLabel')"
+            />
+            @if (messagesPerField.existsError('userLabel')) {
+                <span
+                    id="input-error-otp-label"
+                    aria-live="polite"
+                    [kcClass]="'kcInputErrorMessageClass'"
+                    [innerHTML]="messagesPerField.get('userLabel') | kcSanitize: 'html'"
+                ></span>
+            }
+        </div>
+    </div>
+    <div [kcClass]="'kcFormGroupClass'">
+        <kc-logout-other-sessions />
+    </div>
+
+    @if (isAppInitiatedAction) {
+        <input
+            type="submit"
+            id="saveTOTPBtn"
+            [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonLargeClass']"
+            [value]="i18n.msgStr('doSubmit')"
+        />
+        <button
+            type="submit"
+            id="cancelTOTPBtn"
+            name="cancel-aia"
+            [kcClass]="['kcButtonClass', 'kcButtonDefaultClass', 'kcButtonLargeClass', 'kcButtonLargeClass']"
+            [value]="true"
+        >
+            {{ i18n.msgStr('doCancel') }}
+        </button>
+    } @else {
+        <input
+            type="submit"
+            id="saveTOTPBtn"
+            [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonLargeClass']"
+            [value]="i18n.msgStr('doSubmit')"
+        />
+    }
+</form>

package/src/login/pages/login-config-totp/login-config-totp.component.ts

@@ -1,21 +1,21 @@
-import { ChangeDetectionStrategy, Component, forwardRef, inject, input } from '@angular/core';
+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 { LogoutOtherSessionsComponent } from '@keycloakify/angular/login/components/logout-other-sessions';
 import { TemplateComponent } from '@keycloakify/angular/login/containers/template';
 import { KcClassDirective } from '@keycloakify/angular/login/directives/kc-class';
-import { KcSanitizePipe } from '@keycloakify/angular/lib/pipes/kc-sanitize';
+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';
-import type { I18n } from '../../i18n';
-import type { KcContext } from '../../KcContext';
 
 @Component({
     standalone: true,
     imports: [TemplateComponent, KcClassDirective, KcSanitizePipe, LogoutOtherSessionsComponent],
-    selector: 'kc-root',
+    selector: 'kc-login-config-totp',
     templateUrl: 'login-config-totp.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
     providers: [
@@ -30,9 +30,15 @@ export class LoginConfigTotpComponent extends ComponentReference {
     i18n = inject<I18n>(LOGIN_I18N);
     override doUseDefaultCss = inject<boolean>(USE_DEFAULT_CSS);
     override classes = inject<Partial<Record<ClassKey, string>>>(LOGIN_CLASSES);
-    displayRequiredFields = input(false);
-    documentTitle = input<string>();
-    bodyClassName = input<string>();
-    displayInfo: boolean = false;
-    displayMessage: boolean = this.kcContext.messagesPerField.existsError('totp', 'userLabel');
+
+    documentTitle: string | undefined;
+    bodyClassName: string | undefined;
+
+    displayRequiredFields = false;
+    displayInfo = false;
+    displayMessage = !this.kcContext.messagesPerField.existsError('totp', 'userLabel');
+
+    headerNode? = viewChild<TemplateRef<HTMLElement>>('headerNode');
+    infoNode? = viewChild<TemplateRef<HTMLElement>>('infoNode');
+    socialProvidersNode? = viewChild<TemplateRef<HTMLElement>>('socialProvidersNode');
 }

package/src/login/pages/login-idp-link-confirm/login-idp-link-confirm.component.html

@@ -1,41 +1,31 @@
 @let url = kcContext.url;
 @let idpAlias = kcContext.idpAlias;
-<kc-login-template
-    [displayInfo]="displayInfo"
-    [bodyClassName]="bodyClassName()"
-    [displayMessage]="displayMessage"
-    [displayRequiredFields]="displayRequiredFields()"
-    [documentTitle]="documentTitle()"
+<ng-template #headerNode>
+    {{ i18n.msgStr('confirmLinkIdpTitle') }}
+</ng-template>
+<form
+    id="kc-register-form"
+    method="post"
+    [action]="url.loginAction"
 >
-    <ng-container headerNode>
-        {{ i18n.msgStr('confirmLinkIdpTitle') }}
-    </ng-container>
-    <ng-container content>
-        <form
-            id="kc-register-form"
-            [action]="url.loginAction"
-            method="post"
+    <div [kcClass]="'kcFormGroupClass'">
+        <button
+            type="submit"
+            name="submitAction"
+            id="updateProfile"
+            value="updateProfile"
+            [kcClass]="['kcButtonClass', 'kcButtonDefaultClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
         >
-            <div [kcClass]="'kcFormGroupClass'">
-                <button
-                    type="submit"
-                    [kcClass]="['kcButtonClass', 'kcButtonDefaultClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
-                    name="submitAction"
-                    id="updateProfile"
-                    value="updateProfile"
-                >
-                    {{ i18n.msgStr('confirmLinkIdpReviewProfile') }}
-                </button>
-                <button
-                    type="submit"
-                    [kcClass]="['kcButtonClass', 'kcButtonDefaultClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
-                    name="submitAction"
-                    id="linkAccount"
-                    value="linkAccount"
-                >
-                    {{ i18n.msgStr('confirmLinkIdpContinue', idpAlias) }}
-                </button>
-            </div>
-        </form>
-    </ng-container>
-</kc-login-template>
+            {{ i18n.msgStr('confirmLinkIdpReviewProfile') }}
+        </button>
+        <button
+            type="submit"
+            name="submitAction"
+            id="linkAccount"
+            value="linkAccount"
+            [kcClass]="['kcButtonClass', 'kcButtonDefaultClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
+        >
+            {{ i18n.msgStr('confirmLinkIdpContinue', idpAlias) }}
+        </button>
+    </div>
+</form>

package/src/login/pages/login-idp-link-confirm/login-idp-link-confirm.component.ts

@@ -1,19 +1,16 @@
-import { ChangeDetectionStrategy, Component, forwardRef, inject, input } from '@angular/core';
-import { USE_DEFAULT_CSS } from '@keycloakify/angular/lib/tokens/use-default-css';
+import { ChangeDetectionStrategy, Component, forwardRef, inject, TemplateRef, viewChild } from '@angular/core';
 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 { 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';
 import type { I18n } from '../../i18n';
 import type { KcContext } from '../../KcContext';
+import { LOGIN_I18N } from '@keycloakify/angular/login/tokens/i18n';
+import { KC_LOGIN_CONTEXT } from '@keycloakify/angular/login/tokens/kc-context';
 
 @Component({
     standalone: true,
     imports: [TemplateComponent, KcClassDirective],
-    selector: 'kc-root',
+    selector: 'kc-login-idp-link-confirm',
     templateUrl: 'login-idp-link-confirm.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
     providers: [
@@ -26,11 +23,15 @@ import type { KcContext } from '../../KcContext';
 export class LoginIdpLinkConfirmComponent extends ComponentReference {
     kcContext = inject<Extract<KcContext, { pageId: 'login-idp-link-confirm.ftl' }>>(KC_LOGIN_CONTEXT);
     i18n = inject<I18n>(LOGIN_I18N);
-    override doUseDefaultCss = inject<boolean>(USE_DEFAULT_CSS);
-    override classes = inject<Partial<Record<ClassKey, string>>>(LOGIN_CLASSES);
-    displayRequiredFields = input(false);
-    documentTitle = input<string>();
-    bodyClassName = input<string>();
-    displayInfo: boolean = false;
-    displayMessage: boolean = false;
+
+    documentTitle: string | undefined;
+    bodyClassName: string | undefined;
+
+    displayRequiredFields = false;
+    displayInfo = false;
+    displayMessage = !this.kcContext.messagesPerField.existsError('totp', 'userLabel');
+
+    headerNode? = viewChild<TemplateRef<HTMLElement>>('headerNode');
+    infoNode? = viewChild<TemplateRef<HTMLElement>>('infoNode');
+    socialProvidersNode? = viewChild<TemplateRef<HTMLElement>>('socialProvidersNode');
 }

package/src/login/pages/login-idp-link-confirm-override/login-idp-link-confirm-override.component.html

@@ -1,40 +1,30 @@
 @let url = kcContext.url;
 @let idpDisplayName = kcContext.idpDisplayName;
 
-<kc-login-template
-    [displayInfo]="displayInfo"
-    [bodyClassName]="bodyClassName()"
-    [displayMessage]="displayMessage"
-    [displayRequiredFields]="displayRequiredFields()"
-    [documentTitle]="documentTitle()"
+<ng-template #headerNode>
+    {{ i18n.msgStr('confirmOverrideIdpTitle') }}
+</ng-template>
+<form
+    id="kc-register-form"
+    method="post"
+    [action]="url.loginAction"
 >
-    <ng-container headerNode>
-        {{ i18n.msgStr('confirmOverrideIdpTitle') }}
-    </ng-container>
-    <ng-container content>
-        <form
-            id="kc-register-form"
-            [action]="url.loginAction"
-            method="post"
-        >
-            {{ i18n.msgStr('pageExpiredMsg1') }}
-            <a
-                id="loginRestartLink"
-                [href]="url.loginRestartFlowUrl"
-            >
-                {{ i18n.msgStr('doClickHere') }}
-            </a>
-            <br />
-            <br />
-            <button
-                type="submit"
-                [kcClass]="['kcButtonClass', 'kcButtonDefaultClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
-                name="submitAction"
-                id="confirmOverride"
-                value="confirmOverride"
-            >
-                {{ i18n.msgStr('confirmOverrideIdpContinue', idpDisplayName) }}
-            </button>
-        </form>
-    </ng-container>
-</kc-login-template>
+    {{ i18n.msgStr('pageExpiredMsg1') }}
+    <a
+        id="loginRestartLink"
+        [href]="url.loginRestartFlowUrl"
+    >
+        {{ i18n.msgStr('doClickHere') }}
+    </a>
+    <br />
+    <br />
+    <button
+        type="submit"
+        name="submitAction"
+        id="confirmOverride"
+        value="confirmOverride"
+        [kcClass]="['kcButtonClass', 'kcButtonDefaultClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
+    >
+        {{ i18n.msgStr('confirmOverrideIdpContinue', idpDisplayName) }}
+    </button>
+</form>