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

package/src/login/pages/login-verify-email/login-verify-email.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: [KcClassDirective, TemplateComponent],
-    selector: 'kc-root',
+    selector: 'kc-login-verify-email',
     templateUrl: 'login-verify-email.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
     providers: [
@@ -28,9 +28,15 @@ export class LoginVerifyEmailComponent 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 = true;
-    displayMessage: boolean = true;
+
+    documentTitle: string | undefined;
+    bodyClassName: string | undefined;
+
+    displayRequiredFields = false;
+    displayInfo = true;
+    displayMessage = true;
+
+    headerNode? = viewChild<TemplateRef<HTMLElement>>('headerNode');
+    infoNode? = viewChild<TemplateRef<HTMLElement>>('infoNode');
+    socialProvidersNode? = viewChild<TemplateRef<HTMLElement>>('socialProvidersNode');
 }

package/src/login/pages/login-x509-info/login-x509-info.component.html

@@ -1,102 +1,93 @@
 @let url = kcContext.url;
 @let x509 = kcContext.x509;
-<kc-login-template
-    [displayInfo]="displayInfo"
-    [bodyClassName]="bodyClassName()"
-    [displayMessage]="displayMessage"
-    [displayRequiredFields]="displayRequiredFields()"
-    [documentTitle]="documentTitle()"
+
+<ng-template #headerNode>
+    {{ i18n.msgStr('doLogIn') }}
+</ng-template>
+<form
+    id="kc-x509-login-info"
+    method="post"
+    [kcClass]="'kcFormClass'"
+    [action]="url.loginAction"
 >
-    <ng-container headerNode>
-        {{ i18n.msgStr('doLogIn') }}
-    </ng-container>
-    <ng-container content>
-        <form
-            id="kc-x509-login-info"
-            method="post"
-            [kcClass]="'kcFormClass'"
-            [action]="url.loginAction"
-        >
-            <div [kcClass]="'kcFormGroupClass'">
-                <div [kcClass]="'kcLabelWrapperClass'">
-                    <label
-                        for="certificate_subjectDN"
-                        [kcClass]="'kcLabelClass'"
-                    >
-                        {{ i18n.msgStr('clientCertificate') }}
-                    </label>
-                </div>
-                @if (x509.formData.subjectDN) {
-                    <div [kcClass]="'kcLabelWrapperClass'">
-                        <label
-                            id="certificate_subjectDN"
-                            [kcClass]="'kcLabelClass'"
-                        >
-                            {{ x509.formData.subjectDN }}
-                        </label>
-                    </div>
-                } @else {
-                    <div [kcClass]="'kcLabelWrapperClass'">
-                        <label
-                            id="certificate_subjectDN"
-                            [kcClass]="'kcLabelClass'"
-                        >
-                            {{ i18n.msgStr('noCertificate') }}
-                        </label>
-                    </div>
-                }
+    <div [kcClass]="'kcFormGroupClass'">
+        <div [kcClass]="'kcLabelWrapperClass'">
+            <label
+                for="certificate_subjectDN"
+                [kcClass]="'kcLabelClass'"
+            >
+                {{ i18n.msgStr('clientCertificate') }}
+            </label>
+        </div>
+        @if (x509.formData.subjectDN) {
+            <div [kcClass]="'kcLabelWrapperClass'">
+                <label
+                    id="certificate_subjectDN"
+                    [kcClass]="'kcLabelClass'"
+                >
+                    {{ x509.formData.subjectDN }}
+                </label>
             </div>
-            <div [kcClass]="'kcFormGroupClass'">
-                @if (x509.formData.isUserEnabled) {
-                    <div [kcClass]="'kcLabelWrapperClass'">
-                        <label
-                            for="username"
-                            [kcClass]="'kcLabelClass'"
-                        >
-                            {{ i18n.msgStr('doX509Login') }}
-                        </label>
-                    </div>
-                    <div [kcClass]="'kcLabelWrapperClass'">
-                        <label
-                            id="username"
-                            [kcClass]="'kcLabelClass'"
-                        >
-                            {{ x509.formData.username }}
-                        </label>
-                    </div>
-                }
+        } @else {
+            <div [kcClass]="'kcLabelWrapperClass'">
+                <label
+                    id="certificate_subjectDN"
+                    [kcClass]="'kcLabelClass'"
+                >
+                    {{ i18n.msgStr('noCertificate') }}
+                </label>
             </div>
-            <div [kcClass]="'kcFormGroupClass'">
-                <div
-                    id="kc-form-options"
-                    [kcClass]="'kcFormOptionsClass'"
+        }
+    </div>
+    <div [kcClass]="'kcFormGroupClass'">
+        @if (x509.formData.isUserEnabled) {
+            <div [kcClass]="'kcLabelWrapperClass'">
+                <label
+                    for="username"
+                    [kcClass]="'kcLabelClass'"
                 >
-                    <div [kcClass]="'kcFormOptionsWrapperClass'"></div>
-                </div>
-                <div
-                    id="kc-form-buttons"
-                    [kcClass]="'kcFormButtonsClass'"
+                    {{ i18n.msgStr('doX509Login') }}
+                </label>
+            </div>
+            <div [kcClass]="'kcLabelWrapperClass'">
+                <label
+                    id="username"
+                    [kcClass]="'kcLabelClass'"
                 >
-                    <div [kcClass]="'kcFormButtonsWrapperClass'">
-                        <input
-                            name="login"
-                            id="kc-login"
-                            type="submit"
-                            [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonLargeClass']"
-                            [value]="i18n.msgStr('doContinue')"
-                        />
-                        @if (x509.formData.isUserEnabled) {
-                            <input
-                                name="cancel"
-                                id="kc-cancel"
-                                type="submit"
-                                [kcClass]="['kcButtonClass', 'kcButtonDefaultClass', 'kcButtonLargeClass']"
-                                [value]="i18n.msgStr('doIgnore')"
-                            />
-                        }
-                    </div>
-                </div>
+                    {{ x509.formData.username }}
+                </label>
+            </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
+                    name="login"
+                    id="kc-login"
+                    type="submit"
+                    [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonLargeClass']"
+                    [value]="i18n.msgStr('doContinue')"
+                />
+                @if (x509.formData.isUserEnabled) {
+                    <input
+                        name="cancel"
+                        id="kc-cancel"
+                        type="submit"
+                        [kcClass]="['kcButtonClass', 'kcButtonDefaultClass', 'kcButtonLargeClass']"
+                        [value]="i18n.msgStr('doIgnore')"
+                    />
+                }
             </div>
-        </form>
-    </ng-container>
-</kc-login-template>
+        </div>
+    </div>
+</form>

package/src/login/pages/login-x509-info/login-x509-info.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-x509-info',
     templateUrl: 'login-x509-info.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
     providers: [
@@ -28,9 +28,15 @@ export class LoginX509InfoComponent 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');
 }

package/src/login/pages/logout-confirm/logout-confirm.component.html

@@ -2,58 +2,48 @@
 @let logoutConfirm = kcContext.logoutConfirm;
 @let client = kcContext.client;
 
-<kc-login-template
-    [displayInfo]="displayInfo"
-    [bodyClassName]="bodyClassName()"
-    [displayMessage]="displayMessage"
-    [displayRequiredFields]="displayRequiredFields()"
-    [documentTitle]="documentTitle()"
+<ng-template #headerNode>
+    {{ i18n.msgStr('logoutConfirmTitle') }}
+</ng-template>
+<div
+    id="kc-logout-confirm"
+    class="content-area"
 >
-    <ng-container headerNode>
-        {{ i18n.msgStr('logoutConfirmTitle') }}
-    </ng-container>
-    <ng-container content>
-        <div
-            id="kc-logout-confirm"
-            class="content-area"
-        >
-            <p class="instruction">{{ i18n.msgStr('logoutConfirmHeader') }}</p>
-            <form
-                class="form-actions"
-                method="POST"
-                [action]="url.logoutConfirmAction"
+    <p class="instruction">{{ i18n.msgStr('logoutConfirmHeader') }}</p>
+    <form
+        class="form-actions"
+        method="POST"
+        [action]="url.logoutConfirmAction"
+    >
+        <input
+            type="hidden"
+            name="session_code"
+            [value]="logoutConfirm.code"
+        />
+        <div [kcClass]="'kcFormGroupClass'">
+            <div id="kc-form-options">
+                <div [kcClass]="'kcFormOptionsWrapperClass'"></div>
+            </div>
+            <div
+                id="kc-form-buttons"
+                class="kcFormGroupClass"
             >
                 <input
-                    type="hidden"
-                    name="session_code"
-                    [value]="logoutConfirm.code"
+                    tabIndex="4"
+                    name="confirmLogout"
+                    id="kc-logout"
+                    type="submit"
+                    [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
+                    [value]="i18n.msgStr('doLogout')"
                 />
-                <div [kcClass]="'kcFormGroupClass'">
-                    <div id="kc-form-options">
-                        <div [kcClass]="'kcFormOptionsWrapperClass'"></div>
-                    </div>
-                    <div
-                        id="kc-form-buttons"
-                        class="kcFormGroupClass"
-                    >
-                        <input
-                            tabIndex="4"
-                            name="confirmLogout"
-                            id="kc-logout"
-                            type="submit"
-                            [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
-                            [value]="i18n.msgStr('doLogout')"
-                        />
-                    </div>
-                </div>
-            </form>
-            <div id="kc-info-message">
-                @if (!logoutConfirm.skipLink && client.baseUrl) {
-                    <p>
-                        <a [href]="client.baseUrl">{{ i18n.msgStr('backToApplication') }}</a>
-                    </p>
-                }
             </div>
         </div>
-    </ng-container>
-</kc-login-template>
+    </form>
+    <div id="kc-info-message">
+        @if (!logoutConfirm.skipLink && client.baseUrl) {
+            <p>
+                <a [href]="client.baseUrl">{{ i18n.msgStr('backToApplication') }}</a>
+            </p>
+        }
+    </div>
+</div>

package/src/login/pages/logout-confirm/logout-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-logout-confirm',
     templateUrl: 'logout-confirm.component.html',
     changeDetection: ChangeDetectionStrategy.OnPush,
     providers: [
@@ -26,11 +23,15 @@ import type { KcContext } from '../../KcContext';
 export class LogoutConfirmComponent extends ComponentReference {
     kcContext = inject<Extract<KcContext, { pageId: 'logout-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 = true;
+
+    documentTitle: string | undefined;
+    bodyClassName: string | undefined;
+
+    displayRequiredFields = false;
+    displayInfo = false;
+    displayMessage = true;
+
+    headerNode? = viewChild<TemplateRef<HTMLElement>>('headerNode');
+    infoNode? = viewChild<TemplateRef<HTMLElement>>('infoNode');
+    socialProvidersNode? = viewChild<TemplateRef<HTMLElement>>('socialProvidersNode');
 }

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

@@ -7,120 +7,110 @@
 @let recaptchaAction = kcContext.recaptchaAction;
 @let termsAcceptanceRequired = kcContext.termsAcceptanceRequired;
 
-<kc-login-template
-    [displayInfo]="displayInfo"
-    [bodyClassName]="bodyClassName()"
-    [displayMessage]="displayMessage"
-    [displayRequiredFields]="displayRequiredFields()"
-    [documentTitle]="documentTitle()"
+<ng-template #headerNode>
+    {{ messageHeader ?? i18n.advancedMsgStr('registerTitle') }}
+</ng-template>
+<form
+    id="kc-register-form"
+    method="post"
+    [kcClass]="'kcFormClass'"
+    [action]="url.registrationAction"
 >
-    <ng-container headerNode>
-        {{ messageHeader ?? i18n.advancedMsgStr('registerTitle') }}
-    </ng-container>
-    <ng-container content>
-        <form
-            id="kc-register-form"
-            method="post"
-            [kcClass]="'kcFormClass'"
-            [action]="url.registrationAction"
-        >
-            <ng-container [ngComponentOutlet]="userProfileFormFields() ?? null" />
-            @if (termsAcceptanceRequired) {
-                <div className="form-group">
-                    <div [kcClass]="'kcInputWrapperClass'">
-                        {{ i18n.msgStr('termsTitle') }}
-                        <div id="kc-registration-terms-text">
-                            {{ i18n.msgStr('termsText') }}
-                        </div>
-                    </div>
-                </div>
-                <div className="form-group">
-                    <div [kcClass]="'kcLabelWrapperClass'">
-                        <input
-                            type="checkbox"
-                            id="termsAccepted"
-                            name="termsAccepted"
-                            [kcClass]="'kcCheckboxInputClass'"
-                            [checked]="areTermsAccepted()"
-                            [attr.aria-invalid]="messagesPerField.existsError('termsAccepted')"
-                            (change)="areTermsAccepted.set($any($event.target).checked)"
-                        />
-                        <label
-                            for="termsAccepted"
-                            [kcClass]="'kcLabelClass'"
-                        >
-                            {{ i18n.msgStr('acceptTerms') }}
-                        </label>
-                    </div>
-                    @if (messagesPerField.existsError('termsAccepted')) {
-                        <div [kcClass]="'kcLabelWrapperClass'">
-                            <span
-                                id="input-error-terms-accepted"
-                                aria-live="polite"
-                                [kcClass]="'kcInputErrorMessageClass'"
-                                [innerHtml]="messagesPerField.get('termsAccepted') | kcSanitize: 'html'"
-                            ></span>
-                        </div>
-                    }
+    <ng-container [ngComponentOutlet]="userProfileFormFields() ?? null" />
+    @if (termsAcceptanceRequired) {
+        <div className="form-group">
+            <div [kcClass]="'kcInputWrapperClass'">
+                {{ i18n.msgStr('termsTitle') }}
+                <div id="kc-registration-terms-text">
+                    {{ i18n.msgStr('termsText') }}
                 </div>
-            }
-            @if (recaptchaRequired && (recaptchaVisible || recaptchaAction === undefined)) {
-                <div className="form-group">
-                    <div [kcClass]="'kcInputWrapperClass'">
-                        <div
-                            class="g-recaptcha"
-                            data-size="compact"
-                            [attr.data-sitekey]="recaptchaSiteKey"
-                            [attr.data-action]="recaptchaAction"
-                        ></div>
-                    </div>
+            </div>
+        </div>
+        <div className="form-group">
+            <div [kcClass]="'kcLabelWrapperClass'">
+                <input
+                    type="checkbox"
+                    id="termsAccepted"
+                    name="termsAccepted"
+                    [kcClass]="'kcCheckboxInputClass'"
+                    [checked]="areTermsAccepted()"
+                    [attr.aria-invalid]="messagesPerField.existsError('termsAccepted')"
+                    (change)="areTermsAccepted.set($any($event.target).checked)"
+                />
+                <label
+                    for="termsAccepted"
+                    [kcClass]="'kcLabelClass'"
+                >
+                    {{ i18n.msgStr('acceptTerms') }}
+                </label>
+            </div>
+            @if (messagesPerField.existsError('termsAccepted')) {
+                <div [kcClass]="'kcLabelWrapperClass'">
+                    <span
+                        id="input-error-terms-accepted"
+                        aria-live="polite"
+                        [kcClass]="'kcInputErrorMessageClass'"
+                        [innerHtml]="messagesPerField.get('termsAccepted') | kcSanitize: 'html'"
+                    ></span>
                 </div>
             }
-
-            <div [kcClass]="'kcFormGroupClass'">
+        </div>
+    }
+    @if (recaptchaRequired && (recaptchaVisible || recaptchaAction === undefined)) {
+        <div className="form-group">
+            <div [kcClass]="'kcInputWrapperClass'">
                 <div
-                    id="kc-form-options"
-                    [kcClass]="'kcFormOptionsClass'"
+                    class="g-recaptcha"
+                    data-size="compact"
+                    [attr.data-sitekey]="recaptchaSiteKey"
+                    [attr.data-action]="recaptchaAction"
+                ></div>
+            </div>
+        </div>
+    }
+
+    <div [kcClass]="'kcFormGroupClass'">
+        <div
+            id="kc-form-options"
+            [kcClass]="'kcFormOptionsClass'"
+        >
+            <div [kcClass]="'kcFormOptionsWrapperClass'">
+                <span>
+                    <a
+                        [href]="url.loginUrl"
+                        [innerHTML]="i18n.msgStr('backToLogin') | kcSanitize: 'html'"
+                    ></a>
+                </span>
+            </div>
+        </div>
+        @if (recaptchaRequired && !recaptchaVisible && recaptchaAction !== undefined) {
+            <div
+                id="kc-form-buttons"
+                [kcClass]="'kcFormButtonsClass'"
+            >
+                <button
+                    class="g-recaptcha"
+                    type="submit"
+                    [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
+                    [attr.data-sitekey]="recaptchaSiteKey"
+                    [attr.data-callback]="onCallback"
+                    [attr.data-action]="recaptchaAction"
                 >
-                    <div [kcClass]="'kcFormOptionsWrapperClass'">
-                        <span>
-                            <a
-                                [href]="url.loginUrl"
-                                [innerHTML]="i18n.msgStr('backToLogin') | kcSanitize: 'html'"
-                            ></a>
-                        </span>
-                    </div>
-                </div>
-                @if (recaptchaRequired && !recaptchaVisible && recaptchaAction !== undefined) {
-                    <div
-                        id="kc-form-buttons"
-                        [kcClass]="'kcFormButtonsClass'"
-                    >
-                        <button
-                            class="g-recaptcha"
-                            type="submit"
-                            [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
-                            [attr.data-sitekey]="recaptchaSiteKey"
-                            [attr.data-callback]="onCallback"
-                            [attr.data-action]="recaptchaAction"
-                        >
-                            {{ i18n.msgStr('doRegister') }}
-                        </button>
-                    </div>
-                } @else {
-                    <div
-                        id="kc-form-buttons"
-                        [kcClass]="'kcFormButtonsClass'"
-                    >
-                        <input
-                            type="submit"
-                            [disabled]="!isFormSubmittable() || (termsAcceptanceRequired && !areTermsAccepted())"
-                            [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
-                            [value]="i18n.msgStr('doRegister')"
-                        />
-                    </div>
-                }
+                    {{ i18n.msgStr('doRegister') }}
+                </button>
+            </div>
+        } @else {
+            <div
+                id="kc-form-buttons"
+                [kcClass]="'kcFormButtonsClass'"
+            >
+                <input
+                    type="submit"
+                    [disabled]="!isFormSubmittable() || (termsAcceptanceRequired && !areTermsAccepted())"
+                    [kcClass]="['kcButtonClass', 'kcButtonPrimaryClass', 'kcButtonBlockClass', 'kcButtonLargeClass']"
+                    [value]="i18n.msgStr('doRegister')"
+                />
             </div>
-        </form>
-    </ng-container>
-</kc-login-template>
+        }
+    </div>
+</form>