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

package/src/login/pages/login-idp-link-confirm-override/login-idp-link-confirm-override.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_I18N } from '@keycloakify/angular/login/tokens/i18n';
 import type { I18n } from '../../i18n';
-import { LOGIN_CLASSES } from '@keycloakify/angular/login/tokens/classes';
-import { KC_LOGIN_CONTEXT } from '@keycloakify/angular/login/tokens/kc-context';
-import type { ClassKey } from 'keycloakify/login/lib/kcClsx';
 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: [KcClassDirective, TemplateComponent],
-    selector: 'kc-root',
+    selector: 'kc-login-idp-link-confirm-override',
     templateUrl: 'login-idp-link-confirm-override.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
     providers: [
@@ -26,11 +23,15 @@ import type { KcContext } from '../../KcContext';
 export class LoginIdpLinkConfirmOverrideComponent extends ComponentReference {
     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>>>(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-email/login-idp-link-email.component.html

@@ -2,38 +2,28 @@
 @let brokerContext = kcContext.brokerContext;
 @let realm = kcContext.realm;
 @let url = kcContext.url;
-<kc-login-template
-    [displayInfo]="displayInfo"
-    [bodyClassName]="bodyClassName()"
-    [displayMessage]="displayMessage"
-    [displayRequiredFields]="displayRequiredFields()"
-    [documentTitle]="documentTitle()"
+<ng-template #headerNode>
+    {{ i18n.msgStr('emailLinkIdpTitle', idpAlias) }}
+</ng-template>
+<p
+    id="instruction1"
+    class="instruction"
 >
-    <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>
+    {{ 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>

package/src/login/pages/login-idp-link-email/login-idp-link-email.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_I18N } from '@keycloakify/angular/login/tokens/i18n';
 import type { I18n } from '../../i18n';
-import { LOGIN_CLASSES } from '@keycloakify/angular/login/tokens/classes';
-import { KC_LOGIN_CONTEXT } from '@keycloakify/angular/login/tokens/kc-context';
-import type { ClassKey } from 'keycloakify/login/lib/kcClsx';
 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-email',
     templateUrl: 'login-idp-link-email.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
     providers: [
@@ -26,11 +23,15 @@ import type { KcContext } from '../../KcContext';
 export class LoginIdpLinkEmailComponent extends ComponentReference {
     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>>>(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 = false;
+
+    headerNode? = viewChild<TemplateRef<HTMLElement>>('headerNode');
+    infoNode? = viewChild<TemplateRef<HTMLElement>>('infoNode');
+    socialProvidersNode? = viewChild<TemplateRef<HTMLElement>>('socialProvidersNode');
 }

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

@@ -1,94 +1,85 @@
 @let client = kcContext.client;
 @let oauth = kcContext.oauth;
 @let url = kcContext.url;
-<kc-login-template
-    [displayInfo]="displayInfo"
-    [bodyClassName]="bodyClassName()"
-    [displayMessage]="displayMessage"
-    [displayRequiredFields]="displayRequiredFields()"
-    [documentTitle]="documentTitle()"
->
-    <ng-container headerNode>
-        @if (client.attributes['logoUri']) {
-            <img
-                [src]="client.attributes['logoUri']"
-                alt=""
-            />
-        }
-        <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>
+<ng-template #headerNode>
+    @if (client.attributes['logoUri']) {
+        <img
+            alt=""
+            [src]="client.attributes['logoUri']"
+        />
+    }
+    <p>
+        {{ i18n.msgStr('oauthGrantTitle', client.name ? i18n.advancedMsgStr(client.name) : client.clientId) }}
+    </p>
+</ng-template>
 
-            @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>
+<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>
                     }
-                </h3>
+                </span>
+            </li>
+        }
+    </ul>
+
+    @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
+                    target="_blank"
+                    [href]="client.attributes['policyUri']"
+                >
+                    {{ i18n.msgStr('oauthGrantPolicy') }}
+                </a>
             }
-            <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>
+        </h3>
+    }
+    <form
+        class="form-actions"
+        method="post"
+        [action]="url.oauthAction"
+    >
+        <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]="i18n.msgStr('doYes')"
-                            />
-                            <input
-                                [kcClass]="['kcButtonClass', 'kcButtonDefaultClass', 'kcButtonLargeClass']"
-                                type="submit"
-                                [value]="i18n.msgStr('doNo')"
-                            />
-                        </div>
-                    </div>
+            <div id="kc-form-buttons">
+                <div [kcClass]="'kcFormButtonsWrapperClass'">
+                    <input
+                        type="submit"
+                        [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonLargeClass']"
+                        [value]="i18n.msgStr('doYes')"
+                    />
+                    <input
+                        type="submit"
+                        [kcClass]="['kcButtonClass', 'kcButtonDefaultClass', 'kcButtonLargeClass']"
+                        [value]="i18n.msgStr('doNo')"
+                    />
                 </div>
-            </form>
-            <div className="clearfix"></div>
+            </div>
         </div>
-    </ng-container>
-</kc-login-template>
+    </form>
+    <div className="clearfix"></div>
+</div>

package/src/login/pages/login-oauth-grant/login-oauth-grant.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: [KcClassDirective, TemplateComponent],
-    selector: 'kc-root',
+    selector: 'kc-login-oauth-grant',
     templateUrl: 'login-oauth-grant.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
     providers: [
@@ -26,11 +23,15 @@ import type { KcContext } from '../../KcContext';
 export class LoginOauthGrantComponent extends ComponentReference {
     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>>>(LOGIN_CLASSES);
-    displayRequiredFields = input(false);
-    documentTitle = input<string>();
-    bodyClassName = input<string>('oauth');
-    displayInfo: boolean = false;
-    displayMessage: boolean = false;
+
+    documentTitle: string | undefined;
+    bodyClassName = 'oauth';
+
+    displayRequiredFields = false;
+    displayInfo = false;
+    displayMessage = false;
+
+    headerNode? = viewChild<TemplateRef<HTMLElement>>('headerNode');
+    infoNode? = viewChild<TemplateRef<HTMLElement>>('infoNode');
+    socialProvidersNode? = viewChild<TemplateRef<HTMLElement>>('socialProvidersNode');
 }

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

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

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

@@ -1,19 +1,19 @@
-import { ChangeDetectionStrategy, Component, forwardRef, inject, input } from '@angular/core';
+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 { 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';
-import type { I18n } from '../../i18n';
-import type { KcContext } from '../../KcContext';
 
 @Component({
     standalone: true,
     imports: [TemplateComponent, KcClassDirective],
-    selector: 'kc-root',
+    selector: 'kc-login-oauth2-device-verify-user-code',
     templateUrl: 'login-oauth2-device-verify-user-code.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
     providers: [
@@ -28,9 +28,15 @@ export class LoginOauth2DeviceVerifyUserCodeComponent 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 = false;
+
+    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');
 }