From 423368fdf7a631f032a5f475ef6eb14f7ea29aa5 Mon Sep 17 00:00:00 2001
From: Onat Buyukakkus <55088871+onbuyuka@users.noreply.github.com>
Date: Thu, 30 Jan 2025 18:50:21 +0100
Subject: [PATCH 1/2] Add missing audit log events

---
 .../App/Security Groups/src/SecurityGroupImpl.Codeunit.al       | 1 +
 .../App/User Permissions/src/UserSubform.Page.al                | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/System Application/App/Security Groups/src/SecurityGroupImpl.Codeunit.al b/src/System Application/App/Security Groups/src/SecurityGroupImpl.Codeunit.al
index 8585f53dea..4f271184d2 100644
--- a/src/System Application/App/Security Groups/src/SecurityGroupImpl.Codeunit.al	
+++ b/src/System Application/App/Security Groups/src/SecurityGroupImpl.Codeunit.al	
@@ -90,6 +90,7 @@ codeunit 9871 "Security Group Impl."
 
         FeatureTelemetry.LogUptake('0000JGO', SecurityGroupsTok, Enum::"Feature Uptake Status"::"Set up");
         Session.LogSecurityAudit(SecurityGroupsTok, SecurityOperationResult::Success, StrSubstNo(SecurityGroupAddedLbl, GroupId, SecurityGroupUser."User Security ID"), AuditCategory::UserManagement);
+        Session.LogAuditMessage(StrSubstNo(SecurityGroupAddedLbl, GroupId, SecurityGroupUser."User Security ID"), SecurityOperationResult::Success, AuditCategory::UserManagement, 2, 0);
     end;
 
     procedure Delete(GroupCode: Code[20])
diff --git a/src/System Application/App/User Permissions/src/UserSubform.Page.al b/src/System Application/App/User Permissions/src/UserSubform.Page.al
index dee79309e6..49a0dea680 100644
--- a/src/System Application/App/User Permissions/src/UserSubform.Page.al	
+++ b/src/System Application/App/User Permissions/src/UserSubform.Page.al	
@@ -95,6 +95,7 @@ page 9801 "User Subform"
         PermissionSetLookupRecord: Record "Aggregate Permission Set";
         User: Record User;
         MultipleRoleIDErr: Label 'The permission set %1 is defined multiple times in this context. Use the lookup button to select the relevant permission set.', Comment = '%1 will be replaced with a Role ID code value from the Permission Set table';
+        PermissionSetAddedToUserLbl: Label 'The permission set %1 has been added to the user %2 by UserSecurityId %3.', Comment = '%1 - Role ID, %2 - UserSecurityId, %3 - Current UserSecurityId';
         PermissionScope: Text;
         PermissionSetNotFound: Boolean;
 
@@ -120,6 +121,7 @@ page 9801 "User Subform"
     begin
         User.TestField("User Name");
         Rec.CalcFields("App Name", Rec."Role Name");
+        Session.LogAuditMessage(StrSubstNo(PermissionSetAddedToUserLbl, Rec."Role ID", rec."User Security ID", UserSecurityId()), SecurityOperationResult::Success, AuditCategory::UserManagement, 2, 0);
     end;
 
     trigger OnModifyRecord(): Boolean

From ef6de831b44975a1db9d478d9db75b790d3c5269 Mon Sep 17 00:00:00 2001
From: Onat Buyukakkus <55088871+onbuyuka@users.noreply.github.com>
Date: Mon, 3 Feb 2025 17:54:13 +0100
Subject: [PATCH 2/2] Update UserSubform.Page.al

---
 .../App/User Permissions/src/UserSubform.Page.al              | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/System Application/App/User Permissions/src/UserSubform.Page.al b/src/System Application/App/User Permissions/src/UserSubform.Page.al
index 49a0dea680..39c958f7b7 100644
--- a/src/System Application/App/User Permissions/src/UserSubform.Page.al	
+++ b/src/System Application/App/User Permissions/src/UserSubform.Page.al	
@@ -98,6 +98,7 @@ page 9801 "User Subform"
         PermissionSetAddedToUserLbl: Label 'The permission set %1 has been added to the user %2 by UserSecurityId %3.', Comment = '%1 - Role ID, %2 - UserSecurityId, %3 - Current UserSecurityId';
         PermissionScope: Text;
         PermissionSetNotFound: Boolean;
+        UserPermissionsTok: Label 'User Permissions', Locked = true;
 
     trigger OnAfterGetRecord()
     var
@@ -121,7 +122,8 @@ page 9801 "User Subform"
     begin
         User.TestField("User Name");
         Rec.CalcFields("App Name", Rec."Role Name");
-        Session.LogAuditMessage(StrSubstNo(PermissionSetAddedToUserLbl, Rec."Role ID", rec."User Security ID", UserSecurityId()), SecurityOperationResult::Success, AuditCategory::UserManagement, 2, 0);
+        Session.LogSecurityAudit(UserPermissionsTok, SecurityOperationResult::Success, StrSubstNo(PermissionSetAddedToUserLbl, Rec."Role ID", Rec."User Security ID", UserSecurityId()), AuditCategory::UserManagement);
+        Session.LogAuditMessage(StrSubstNo(PermissionSetAddedToUserLbl, Rec."Role ID", Rec."User Security ID", UserSecurityId()), SecurityOperationResult::Success, AuditCategory::UserManagement, 2, 0);
     end;
 
     trigger OnModifyRecord(): Boolean