Skip to content

Uptake/rename license configurations #6404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BenPlunk wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Uptake/rename license configurations #6404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1f9c041
Renamed license configurations and updated upgrade code
BenPlunk Jan 12, 2026
3566848
Added new function and upgrade tag for plan renames
BenPlunk Jan 28, 2026
6f9d090
Merged PR 39916: Renamed license configurations and updated upgrade code
BenPlunk Feb 3, 2026
229f5d4
Merged PR 39916: Renamed license configurations and updated upgrade code
BenPlunk Feb 3, 2026
ff30775
Updated Plan ID function names
BenPlunk Feb 23, 2026
ce6ab58
Add back and deprecate old functions
BenPlunk Feb 27, 2026
5d3f1d1
Add call to Rename function in upgrade trigger
BenPlunk Feb 27, 2026
1287a74
Update plan name to fit character limit
BenPlunk Feb 27, 2026
8d59a6b
Updated clean tags
BenPlunk Feb 27, 2026
e938195
Merge branch 'uptake/rename-license-configurations' of https://dev.az…
BenPlunk Mar 4, 2026
eea1dd7
Updated plan names match the regular plan names with the new delegate…
BenPlunk Mar 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/System Application/App/Azure AD Plan/src/AzureADPlanImpl.Codeunit.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@ codeunit 9018 "Azure AD Plan Impl."
begin
case true of
AzureADGraphUser.IsUserDelegatedAdmin():
PlanId := PlanIds.GetDelegatedAdminPlanId();
PlanId := PlanIds.GetGlobalAdminPlanId();
AzureADGraphUser.IsUserDelegatedHelpdesk():
PlanId := PlanIds.GetHelpDeskPlanId();
else begin
Expand Down Expand Up @@ -805,7 +805,7 @@ codeunit 9018 "Azure AD Plan Impl."
begin
exit(
IsPlanAssignedToUser(PlanIds.GetGlobalAdminPlanId(), SecurityID)
or IsPlanAssignedToUser(PlanIds.GetDelegatedAdminPlanId(), SecurityID)
or IsPlanAssignedToUser(PlanIds.GetGlobalAdminPlanId(), SecurityID)
or IsPlanAssignedToUser(PlanIds.GetD365AdminPlanId(), SecurityID));
end;

Expand Down
28 changes: 26 additions & 2 deletions src/System Application/App/Azure AD Plan/src/PlanIds.Codeunit.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,28 +105,52 @@ codeunit 9027 "Plan Ids"
exit(ExternalAccountantPlanGUIDTxt);
end;

#if not CLEAN32
/// <summary>
/// Returns the ID for the Delegated Admin agent - Partner plan.
/// </summary>
/// <returns>The ID for the Delegated Admin agent - Partner plan.</returns>
[Obsolete('Use GetDelegatedGlobalAdminPlanId instead', '28.0')]
procedure GetDelegatedAdminPlanId(): Guid
begin
exit(DelegatedAdminGUIDTxt);
end;
#endif

/// <summary>
/// Returns the ID for the Delegated Admin agent - Partner plan.
/// </summary>
/// <returns>The ID for the Delegated Admin agent - Partner plan.</returns>
procedure GetDelegatedGlobalAdminPlanId(): Guid
begin
exit(DelegatedAdminGUIDTxt);
end;

#if not CLEAN32
/// <summary>
/// Returns the ID for the Delegated BC Admin agent - Partner plan.
/// </summary>
/// <returns>The ID for the Delegated BC Admin agent - Partner plan.</returns>
[Obsolete('Use GetD365BCAdminPlanId instead', '28.0')]
procedure GetDelegatedBCAdminPlanId(): Guid
begin
exit(BCAdminPartnerGUIDTxt);
end;
#endif

/// <summary>
/// Returns the ID for the Delegated BC Admin agent - Partner plan.
/// </summary>
/// <returns>The ID for the Delegated BC Admin agent - Partner plan.</returns>
procedure GetD365BCAdminPlanId(): Guid
begin
exit(BCAdminPartnerGUIDTxt);
end;

/// <summary>
/// Returns the ID for the Internal BC Administrator plan.
/// Returns the ID for the D365 Business Central Administrator plan.
/// </summary>
/// <returns>The ID for the Internal BC Administrator plan.</returns>
/// <returns>The ID for the D365 Business Central Administrator plan.</returns>
procedure GetBCAdminPlanId(): Guid
begin
exit(BCAdminGUIDTxt);
Expand Down
12 changes: 6 additions & 6 deletions src/System Application/App/Azure AD Plan/src/PlanInstaller.Codeunit.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ codeunit 9056 "Plan Installer"
UpgradeTag: Codeunit "Upgrade Tag";
PlanUpgradeTag: Codeunit "Plan Upgrade Tag";
begin
CreatePlan(PlanIds.GetDelegatedBCAdminPlanId(), 'Delegated BC Admin agent - Partner', 9022, 'FFF16A30-3B0B-47CB-9751-54A5C8F634ED');
CreatePlan(PlanIds.GetBCAdminPlanId(), 'Internal BC Administrator', 9022, 'A2BB1194-FC0B-4C6B-840F-963851B783C9');
CreatePlan(PlanIds.GetDelegatedAdminPlanId(), 'Delegated Admin agent - Partner', 9022, '7584DDCA-27B8-E911-BB26-000D3A2B005C');
CreatePlan(PlanIds.GetHelpDeskPlanId(), 'Delegated Helpdesk agent - Partner', 9022, '8884DDCA-27B8-E911-BB26-000D3A2B005C');
CreatePlan(PlanIds.GetGlobalAdminPlanId(), 'Internal Administrator', 9022, '9B84DDCA-27B8-E911-BB26-000D3A2B005C'); // Global admin
CreatePlan(PlanIds.GetD365BCAdminPlanId(), 'Delegated D365 Business Central Administrator', 9022, 'FFF16A30-3B0B-47CB-9751-54A5C8F634ED');
CreatePlan(PlanIds.GetBCAdminPlanId(), 'D365 Business Central Administrator', 9022, 'A2BB1194-FC0B-4C6B-840F-963851B783C9');
CreatePlan(PlanIds.GetDelegatedGlobalAdminPlanId(), 'Delegated Global Administrator', 9022, '7584DDCA-27B8-E911-BB26-000D3A2B005C');
CreatePlan(PlanIds.GetHelpDeskPlanId(), 'Delegated Helpdesk Administrator', 9022, '8884DDCA-27B8-E911-BB26-000D3A2B005C');
CreatePlan(PlanIds.GetGlobalAdminPlanId(), 'Global Administrator', 9022, '9B84DDCA-27B8-E911-BB26-000D3A2B005C'); // Global admin
CreatePlan(PlanIds.GetD365AdminPlanId(), 'Dynamics 365 Administrator', 9022, 'F67B9B96-C667-4DD2-B370-FA065A895C9D');
CreatePlan(PlanIds.GetD365AdminPartnerPlanId(), 'Delegated Dynamics 365 Admin agent - Partner', 9022, '5C28E514-8AFD-4158-B8C0-93A5915938F9');
CreatePlan(PlanIds.GetD365AdminPartnerPlanId(), 'Delegated Dynamics 365 Administrator', 9022, '5C28E514-8AFD-4158-B8C0-93A5915938F9');
CreatePlan(PlanIds.GetEssentialISVPlanId(), 'Dynamics 365 Business Central Essential - Embedded', 9022, '2E84DDCA-27B8-E911-BB26-000D3A2B005C');
CreatePlan(PlanIds.GetTeamMemberPlanId(), 'Dynamics 365 Business Central Team Member', 9028, '5784DDCA-27B8-E911-BB26-000D3A2B005C');
CreatePlan(PlanIds.GetMicrosoft365PlanId(), 'Microsoft 365', 8999, '57ff2da0-773e-42df-b2af-ffb7a2317929');
Expand Down
35 changes: 29 additions & 6 deletions src/System Application/App/Azure AD Plan/src/PlanUpgrade.Codeunit.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ codeunit 9057 "Plan Upgrade"
begin
UpdateSubscriptionPlan();
RenamePlansAndDeleteOldPlans();
RenameDelegatedAdminPlans();
RenameTeamMemberPlan();
RenameDevicePlan();
AddPremiumPartnerSandbox();
Expand Down Expand Up @@ -86,7 +87,7 @@ codeunit 9057 "Plan Upgrade"
RenameOrCreatePlan(PlanIds.GetExternalAccountantPlanId(), 'Dynamics 365 Business Central External Accountant');
RenameOrCreatePlan(PlanIds.GetPremiumISVPlanId(), 'Dynamics 365 Business Central Premium - Embedded');
RenameOrCreatePlan(PlanIds.GetViralSignupPlanId(), 'Dynamics 365 Business Central for IWs');
RenameOrCreatePlan(PlanIds.GetDelegatedAdminPlanId(), 'Delegated Admin agent - Partner');
RenameOrCreatePlan(PlanIds.GetGlobalAdminPlanId(), 'Delegated Admin agent - Partner');
RenameOrCreatePlan(PlanIds.GetHelpDeskPlanId(), 'Delegated Helpdesk agent - Partner');
RenameOrCreatePlan('996DEF3D-B36C-4153-8607-A6FD3C01B89F', 'D365 Business Central Infrastructure');

Expand All @@ -96,11 +97,33 @@ codeunit 9057 "Plan Upgrade"
DeletePlan('46764787-E039-4AB0-8F00-820FC2D89BF9');
DeletePlan('312BDEEE-8FBD-496E-B529-EB985F305FCF');

Session.LogMessage('0000AHN', 'Subscription Plans were renamed and old plans werer deleted.', Verbosity::Normal, DataClassification::CustomerContent, TelemetryScope::ExtensionPublisher, 'Category', 'AL SaaS Upgrade');
Session.LogMessage('0000AHN', 'Subscription Plans were renamed and old plans were deleted.', Verbosity::Normal, DataClassification::SystemMetadata, TelemetryScope::ExtensionPublisher, 'Category', 'AL SaaS Upgrade');

UpgradeTag.SetUpgradeTag(PlanUpgradeTag.GetRenamePlansUpgradeTag());
end;

[NonDebuggable]
local procedure RenameDelegatedAdminPlans()
var
UpgradeTag: Codeunit "Upgrade Tag";
PlanUpgradeTag: Codeunit "Plan Upgrade Tag";
PlanIds: Codeunit "Plan Ids";
begin
if UpgradeTag.HasUpgradeTag(PlanUpgradeTag.GetRenameDelegatedAdminPlansUpgradeTag()) then
exit;

RenameOrCreatePlan(PlanIds.GetBCAdminPlanId(), 'D365 Business Central Administrator');
RenameOrCreatePlan(PlanIds.GetGlobalAdminPlanId(), 'Global Administrator');
RenameOrCreatePlan(PlanIds.GetD365BCAdminPlanId(), 'Delegated Dynamics 365 Business Central Administrator');
RenameOrCreatePlan(PlanIds.GetGlobalAdminPlanId(), 'Delegated Global Administrator');
RenameOrCreatePlan(PlanIds.GetHelpDeskPlanId(), 'Delegated Helpdesk Administrator');
RenameOrCreatePlan(PlanIds.GetD365AdminPartnerPlanId(), 'Delegated Dynamics 365 Administrator');

Session.LogMessage('0000AHN', 'Subscription Plans were renamed.', Verbosity::Normal, DataClassification::SystemMetadata, TelemetryScope::ExtensionPublisher, 'Category', 'AL SaaS Upgrade');

UpgradeTag.SetUpgradeTag(PlanUpgradeTag.GetRenameDelegatedAdminPlansUpgradeTag());
end;

[NonDebuggable]
local procedure RenameTeamMemberPlan()
var
Expand Down Expand Up @@ -225,15 +248,15 @@ codeunit 9057 "Plan Upgrade"

// Create internal plan
PlanId := PlanIds.GetBCAdminPlanId();
PlanName := 'Internal BC Administrator';
PlanName := 'D365 Business Central Administrator';
RoleCenterId := 9022;

if not Plan.Get(PlanId) then
CreatePlan(PlanId, PlanName, RoleCenterId);

// Create delegated plan
PlanId := PlanIds.GetDelegatedBCAdminPlanId();
PlanName := 'Delegated BC Admin agent - Partner';
PlanId := PlanIds.GetD365BCAdminPlanId();
PlanName := 'Delegated Dynamics 365 Business Central Administrator';
RoleCenterId := 9022;

if not Plan.Get(PlanId) then
Expand Down Expand Up @@ -283,7 +306,7 @@ codeunit 9057 "Plan Upgrade"
exit;

PlanId := PlanIds.GetD365AdminPartnerPlanId();
PlanName := 'Delegated Dynamics 365 Admin agent - Partner';
PlanName := 'Delegated Dynamics 365 Administrator';
RoleCenterId := 9022;

if Plan.Get(PlanId) then
Expand Down
9 changes: 9 additions & 0 deletions src/System Application/App/Azure AD Plan/src/PlanUpgradeTag.Codeunit.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,15 @@ codeunit 9058 "Plan Upgrade Tag"
exit('MS-329421-RenamePlans-20211028');
end;

/// <summary>
/// Returns the rename delegated admin plans upgrade tag.
/// </summary>
/// <returns>The rename delegated admin plans upgrade tag.</returns>
internal procedure GetRenameDelegatedAdminPlansUpgradeTag(): Code[250]
begin
exit('MS-582117-RenameDelegatedAdminPlans-20260128');
end;

/// <summary>
/// Returns the rename team member plan upgrade tag.
/// </summary>
Expand Down
4 changes: 2 additions & 2 deletions src/System Application/App/Azure AD Plan/src/User Details/PlanUserDetails.Codeunit.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ codeunit 776 "Plan User Details"
end;

UserDetails."User Plans" := CopyStr(UserPlansTextBuilder.ToText().TrimEnd(' ; '), 1, MaxStrLen(UserDetails."User Plans"));
UserDetails."Is Delegated" := AzureADPlan.IsPlanAssignedToUser(PlanIds.GetDelegatedAdminPlanId(), UserSecId) or
UserDetails."Is Delegated" := AzureADPlan.IsPlanAssignedToUser(PlanIds.GetGlobalAdminPlanId(), UserSecId) or
AzureADPlan.IsPlanAssignedToUser(PlanIds.GetHelpDeskPlanId(), UserSecId) or
AzureADPlan.IsPlanAssignedToUser(PlanIds.GetD365AdminPartnerPlanId(), UserSecId) or
AzureADPlan.IsPlanAssignedToUser(PlanIds.GetDelegatedBCAdminPlanId(), UserSecId);
AzureADPlan.IsPlanAssignedToUser(PlanIds.GetD365BCAdminPlanId(), UserSecId);

UserDetails."Has M365 Plan" := AzureADPlan.IsPlanAssignedToUser(PlanIds.GetMicrosoft365PlanId(), UserSecId);

Expand Down
4 changes: 2 additions & 2 deletions src/System Application/App/Azure AD User Management/src/AzureADUserMgmtImpl.Codeunit.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,10 +208,10 @@ codeunit 9017 "Azure AD User Mgmt. Impl."
var
PlanIds: Codeunit "Plan Ids";
begin
exit(AzureADPlan.IsPlanAssignedToUser(PlanIds.GetDelegatedAdminPlanId(), UserSecID) or
exit(AzureADPlan.IsPlanAssignedToUser(PlanIds.GetGlobalAdminPlanId(), UserSecID) or
AzureADPlan.IsPlanAssignedToUser(PlanIds.GetHelpDeskPlanId(), UserSecID) or
AzureADPlan.IsPlanAssignedToUser(PlanIds.GetD365AdminPartnerPlanId(), UserSecID) or
AzureADPlan.IsPlanAssignedToUser(PlanIds.GetDelegatedBCAdminPlanId(), UserSecID))
AzureADPlan.IsPlanAssignedToUser(PlanIds.GetD365BCAdminPlanId(), UserSecID))
end;

[NonDebuggable]
Expand Down
4 changes: 2 additions & 2 deletions ...em Application/App/Azure AD User Management/src/User sync/AzureADUserSyncImpl.Codeunit.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,9 +238,9 @@ codeunit 9029 "Azure AD User Sync Impl."
end;

// If the user's plans are any of the following:
// - Internal Administrator (Global Administrator or Dynamics 365 Administrator or BC Administrator)
// - Global Administrator (Global Administrator or Dynamics 365 Administrator or BC Administrator)
// - Microsoft 365
// - Internal Administrator + Microsoft 365
// - Global Administrator + Microsoft 365
// and there is no environment security group defined,
// then we don't want to create a BC user during user sync.
local procedure SkipCreatingUserDuringSync(UserPlanIDs: List of [Guid]): Boolean
Expand Down
Loading
Loading