Merge pull request #2836 from JohnDuprey/dev

JohnDuprey · web-flow · commit 3042dd48f204 · 2024-08-19T13:17:51.000-04:00
Fix reset MFA
diff --git a/src/views/identity/administration/Users.jsx b/src/views/identity/administration/Users.jsx
@@ -99,10 +99,10 @@ const Offcanvas = (row, rowIndex, formatExtraData) => {
           },
           {
             label: 'Rerequire MFA registration',
-            link: entraLink,
             color: 'info',
-            target: '_blank',
-            external: true,
+            modal: true,
+            modalUrl: `/api/ExecResetMFA?TenantFilter=${tenant.defaultDomainName}&ID=${row.userPrincipalName}`,
+            modalMessage: 'Are you sure you want to reset MFA for this user?',
           },
           {
             label: 'Send MFA Push',
@@ -527,8 +527,8 @@ const Users = (row) => {
             {
               label: 'Rerequire MFA registration',
               modal: true,
-              modalUrl: `/api/ExecResetMFA?TenantFilter=!Tenant&ID=!id`,
-              modalMessage: 'Are you sure you want to enable MFA for these users?',
+              modalUrl: `/api/ExecResetMFA?TenantFilter=!Tenant&ID=!userPrincipalName`,
+              modalMessage: 'Are you sure you want to reset MFA for these users?',
             },
             {
               label: 'Set Per-User MFA',

Original file line number	Diff line number	Diff line change
`@@ -99,10 +99,10 @@ const Offcanvas = (row, rowIndex, formatExtraData) => {`
`99`	`99`	`},`
`100`	`100`	`{`
`101`	`101`	`label: 'Rerequire MFA registration',`
`102`		`- link: entraLink,`
`103`	`102`	`color: 'info',`
`104`		`- target: '_blank',`
`105`		`- external: true,`
	`103`	`+ modal: true,`
	`104`	+ modalUrl: `/api/ExecResetMFA?TenantFilter=${tenant.defaultDomainName}&ID=${row.userPrincipalName}`,
	`105`	`+ modalMessage: 'Are you sure you want to reset MFA for this user?',`
`106`	`106`	`},`
`107`	`107`	`{`
`108`	`108`	`label: 'Send MFA Push',`
`@@ -527,8 +527,8 @@ const Users = (row) => {`
`527`	`527`	`{`
`528`	`528`	`label: 'Rerequire MFA registration',`
`529`	`529`	`modal: true,`
`530`		- modalUrl: `/api/ExecResetMFA?TenantFilter=!Tenant&ID=!id`,
`531`		`- modalMessage: 'Are you sure you want to enable MFA for these users?',`
	`530`	+ modalUrl: `/api/ExecResetMFA?TenantFilter=!Tenant&ID=!userPrincipalName`,
	`531`	`+ modalMessage: 'Are you sure you want to reset MFA for these users?',`
`532`	`532`	`},`
`533`	`533`	`{`
`534`	`534`	`label: 'Set Per-User MFA',`