From 239aae12509ea0072dedb2f107e16c5bd1279776 Mon Sep 17 00:00:00 2001
From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
Date: Tue, 2 Apr 2024 17:12:40 +0200
Subject: [PATCH] use the `umbConfirmModal` to ask the user to disable 2fa

---
 .../modals/user-mfa/user-mfa-modal.element.ts | 26 +++++++------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/modals/user-mfa/user-mfa-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/modals/user-mfa/user-mfa-modal.element.ts
index e76a365753..7d002c19ad 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user/modals/user-mfa/user-mfa-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/modals/user-mfa/user-mfa-modal.element.ts
@@ -3,7 +3,7 @@ import type { UmbUserMfaProviderModel } from '../../types.js';
 import type { UmbUserMfaModalConfiguration } from './user-mfa-modal.token.js';
 import { css, customElement, html, property, repeat, state, when } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
-import { UMB_CONFIRM_MODAL, UMB_MODAL_MANAGER_CONTEXT, type UmbModalContext } from '@umbraco-cms/backoffice/modal';
+import { umbConfirmModal, type UmbModalContext } from '@umbraco-cms/backoffice/modal';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
 import { mergeObservables } from '@umbraco-cms/backoffice/observable-api';
@@ -125,23 +125,15 @@ export class UmbUserMfaModalElement extends UmbLitElement {
 	 * NB! The user must have administrative rights before doing so.
 	 */
 	async #onProviderDisable(item: UmbMfaLoginProviderOption) {
-		const modalManager = await this.getContext(UMB_MODAL_MANAGER_CONTEXT);
-		const confirm = await modalManager
-			.open(this, UMB_CONFIRM_MODAL, {
-				data: {
-					headline: this.localize.term('actions_disable'),
-					content: this.localize.term('user_2faDisableForUser'),
-					confirmLabel: this.localize.term('actions_disable'),
-					color: 'danger',
-				},
-			})
-			.onSubmit()
-			.catch(() => false);
+		await umbConfirmModal(this, {
+			headline: this.localize.term('actions_disable'),
+			content: this.localize.term('user_2faDisableForUser'),
+			confirmLabel: this.localize.term('actions_disable'),
+			color: 'danger',
+		});
 
-		if (confirm !== false) {
-			await this.#userRepository.disableMfaProvider(this.#unique, item.providerName);
-			this.#loadProviders();
-		}
+		await this.#userRepository.disableMfaProvider(this.#unique, item.providerName);
+		this.#loadProviders();
 	}
 
 	static styles = [