From 8ad810204032521eb27ca9419dbdda62189ddf0d Mon Sep 17 00:00:00 2001 From: Jr7468 Date: Wed, 27 Sep 2023 18:25:03 +0100 Subject: [PATCH 1/5] Changed MFARergister OC to point to the Entra page --- src/views/identity/administration/Users.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/views/identity/administration/Users.js b/src/views/identity/administration/Users.js index bd3df44d1aa4..60262c606bd6 100644 --- a/src/views/identity/administration/Users.js +++ b/src/views/identity/administration/Users.js @@ -17,6 +17,7 @@ const Offcanvas = (row, rowIndex, formatExtraData) => { const viewLink = `/identity/administration/users/view?userId=${row.id}&tenantDomain=${tenant.defaultDomainName}&userEmail=${row.userPrincipalName}` const editLink = `/identity/administration/users/edit?userId=${row.id}&tenantDomain=${tenant.defaultDomainName}` const OffboardLink = `/identity/administration/offboarding-wizard?userId=${row.id}&tenantDomain=${tenant.defaultDomainName}` + const userEntraLink = `https://entra.microsoft.com/${tenant.defaultDomainName}/#view/Microsoft_AAD_UsersAndTenants/UserProfileMenuBlade/~/overview/userId/${row.id}//hidePreviewBanner~/true` let licenses = [] row.assignedLicenses?.map((licenseAssignment, idx) => { @@ -94,10 +95,8 @@ const Offcanvas = (row, rowIndex, formatExtraData) => { }, { label: 'Rerequire MFA registration', - color: 'info', - modal: true, - modalUrl: `/api/ExecResetMFA?TenantFilter=${tenant.defaultDomainName}&ID=${row.id}`, - modalMessage: 'Are you sure you want to enable MFA for this user?', + link: userEntraLink, + color: `info`, }, { label: 'Send MFA Push', From 75432f2d130e1e0cda17cdbe4cda6d6acce218ae Mon Sep 17 00:00:00 2001 From: Jr7468 <126574444+Jr7468@users.noreply.github.com> Date: Thu, 28 Sep 2023 11:30:48 +0100 Subject: [PATCH 2/5] Update Users.js Changed MFA Rerequire button to navigate to user Entra Page. --- src/views/identity/administration/Users.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/views/identity/administration/Users.js b/src/views/identity/administration/Users.js index bd3df44d1aa4..30565819fa50 100644 --- a/src/views/identity/administration/Users.js +++ b/src/views/identity/administration/Users.js @@ -17,6 +17,7 @@ const Offcanvas = (row, rowIndex, formatExtraData) => { const viewLink = `/identity/administration/users/view?userId=${row.id}&tenantDomain=${tenant.defaultDomainName}&userEmail=${row.userPrincipalName}` const editLink = `/identity/administration/users/edit?userId=${row.id}&tenantDomain=${tenant.defaultDomainName}` const OffboardLink = `/identity/administration/offboarding-wizard?userId=${row.id}&tenantDomain=${tenant.defaultDomainName}` + const entraLink = `https://entra.microsoft.com/${tenant.defaultDomainName}/#view/Microsoft_AAD_UsersAndTenants/UserProfileMenuBlade/~/overview/userId/${row.id}/hidePreviewBanner~/true` let licenses = [] row.assignedLicenses?.map((licenseAssignment, idx) => { @@ -95,9 +96,9 @@ const Offcanvas = (row, rowIndex, formatExtraData) => { { label: 'Rerequire MFA registration', color: 'info', - modal: true, - modalUrl: `/api/ExecResetMFA?TenantFilter=${tenant.defaultDomainName}&ID=${row.id}`, - modalMessage: 'Are you sure you want to enable MFA for this user?', + link: entraLink, + color: 'info', + target: '_blank', }, { label: 'Send MFA Push', From 4f25cf9b65cd5731cd7249e327c65342a5e0852f Mon Sep 17 00:00:00 2001 From: Jr7468 <126574444+Jr7468@users.noreply.github.com> Date: Thu, 28 Sep 2023 16:01:02 +0100 Subject: [PATCH 3/5] Update Users.js --- src/views/identity/administration/Users.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/identity/administration/Users.js b/src/views/identity/administration/Users.js index 30565819fa50..f8954f1fb045 100644 --- a/src/views/identity/administration/Users.js +++ b/src/views/identity/administration/Users.js @@ -95,7 +95,6 @@ const Offcanvas = (row, rowIndex, formatExtraData) => { }, { label: 'Rerequire MFA registration', - color: 'info', link: entraLink, color: 'info', target: '_blank', From 2163e31a144115165ed53ad9c6aac66513fd6712 Mon Sep 17 00:00:00 2001 From: Jr7468 Date: Wed, 4 Oct 2023 22:06:53 +0100 Subject: [PATCH 4/5] Cleaned up merge issues --- src/views/identity/administration/Users.js | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/views/identity/administration/Users.js b/src/views/identity/administration/Users.js index 9290b6529db2..f8954f1fb045 100644 --- a/src/views/identity/administration/Users.js +++ b/src/views/identity/administration/Users.js @@ -17,11 +17,7 @@ const Offcanvas = (row, rowIndex, formatExtraData) => { const viewLink = `/identity/administration/users/view?userId=${row.id}&tenantDomain=${tenant.defaultDomainName}&userEmail=${row.userPrincipalName}` const editLink = `/identity/administration/users/edit?userId=${row.id}&tenantDomain=${tenant.defaultDomainName}` const OffboardLink = `/identity/administration/offboarding-wizard?userId=${row.id}&tenantDomain=${tenant.defaultDomainName}` -<<<<<<< HEAD - const userEntraLink = `https://entra.microsoft.com/${tenant.defaultDomainName}/#view/Microsoft_AAD_UsersAndTenants/UserProfileMenuBlade/~/overview/userId/${row.id}//hidePreviewBanner~/true` -======= const entraLink = `https://entra.microsoft.com/${tenant.defaultDomainName}/#view/Microsoft_AAD_UsersAndTenants/UserProfileMenuBlade/~/overview/userId/${row.id}/hidePreviewBanner~/true` ->>>>>>> 4f25cf9b65cd5731cd7249e327c65342a5e0852f let licenses = [] row.assignedLicenses?.map((licenseAssignment, idx) => { @@ -99,14 +95,9 @@ const Offcanvas = (row, rowIndex, formatExtraData) => { }, { label: 'Rerequire MFA registration', -<<<<<<< HEAD - link: userEntraLink, - color: `info`, -======= link: entraLink, color: 'info', target: '_blank', ->>>>>>> 4f25cf9b65cd5731cd7249e327c65342a5e0852f }, { label: 'Send MFA Push', From 1723f1a279f28b1e4bfcc98ae3472ce4caec0ec6 Mon Sep 17 00:00:00 2001 From: Jr7468 Date: Thu, 5 Oct 2023 12:17:47 +0100 Subject: [PATCH 5/5] Added external: true flag and modified URL --- src/views/identity/administration/Users.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/identity/administration/Users.js b/src/views/identity/administration/Users.js index f8954f1fb045..69796c07b423 100644 --- a/src/views/identity/administration/Users.js +++ b/src/views/identity/administration/Users.js @@ -17,7 +17,7 @@ const Offcanvas = (row, rowIndex, formatExtraData) => { const viewLink = `/identity/administration/users/view?userId=${row.id}&tenantDomain=${tenant.defaultDomainName}&userEmail=${row.userPrincipalName}` const editLink = `/identity/administration/users/edit?userId=${row.id}&tenantDomain=${tenant.defaultDomainName}` const OffboardLink = `/identity/administration/offboarding-wizard?userId=${row.id}&tenantDomain=${tenant.defaultDomainName}` - const entraLink = `https://entra.microsoft.com/${tenant.defaultDomainName}/#view/Microsoft_AAD_UsersAndTenants/UserProfileMenuBlade/~/overview/userId/${row.id}/hidePreviewBanner~/true` + const entraLink = `https://entra.microsoft.com/${tenant.defaultDomainName}/#view/Microsoft_AAD_UsersAndTenants/UserProfileMenuBlade/~/UserAuthMethods/userId/${row.id}/hidePreviewBanner~/true` let licenses = [] row.assignedLicenses?.map((licenseAssignment, idx) => { @@ -98,6 +98,7 @@ const Offcanvas = (row, rowIndex, formatExtraData) => { link: entraLink, color: 'info', target: '_blank', + external: true, }, { label: 'Send MFA Push',