diff --git a/F4SDM42WebApi/F4SDHelperService.cs b/F4SDM42WebApi/F4SDHelperService.cs index cbc0e29..c6fa61b 100644 --- a/F4SDM42WebApi/F4SDHelperService.cs +++ b/F4SDM42WebApi/F4SDHelperService.cs @@ -305,6 +305,7 @@ namespace C4IT.F4SD public string InitiatorDisplayName { get; set; } public string InitiatorAccount { get; set; } public string InitiatorDomain { get; set; } + public string InitiatorSid { get; set; } public Guid RecipientId { get; set; } public Guid RecipientRoleId { get; set; } public int State { get; set; } @@ -389,7 +390,11 @@ namespace C4IT.F4SD ["StatusId"] = ConvertM42State(entry.State), ["UserDisplayName"] = entry.InitiatorDisplayName ?? string.Empty, ["UserAccount"] = entry.InitiatorAccount ?? string.Empty, - ["UserDomain"] = entry.InitiatorDomain ?? string.Empty + ["UserDomain"] = entry.InitiatorDomain ?? string.Empty, + ["UserSid"] = entry.InitiatorSid ?? string.Empty, + ["Sids"] = entry.InitiatorSid ?? string.Empty, + ["UserId"] = entry.InitiatorId != Guid.Empty ? entry.InitiatorId.ToString() : string.Empty, + ["UserGuid"] = entry.InitiatorId != Guid.Empty ? entry.InitiatorId.ToString() : string.Empty }, Identities = new List { @@ -436,6 +441,7 @@ namespace C4IT.F4SD ", Initiator.LastName + ISNULL(', ' + Initiator.FirstName, '') as Initiator" + ", Initiator.PrimaryAccount.T(SPSAccountClassAD).NBAccountName as InitiatorAccount" + ", Initiator.PrimaryAccount.T(SPSAccountClassAD).Domain.NT4Name as InitiatorDomain" + + ", Initiator.PrimaryAccount.T(SPSAccountClassAD).Sid as InitiatorSid" + ", Recipient as RecipientId" + ", RecipientRole as RecipientRoleId" + ", T(SPSCommonClassBase).State as State" + @@ -465,6 +471,7 @@ namespace C4IT.F4SD InitiatorDisplayName = getStringFromObject(row["Initiator"]), InitiatorAccount = getStringFromObject(row["InitiatorAccount"]), InitiatorDomain = getStringFromObject(row["InitiatorDomain"]), + InitiatorSid = getStringFromObject(row["InitiatorSid"]), RecipientId = getGuidFromObject(row["RecipientId"]), RecipientRoleId = getGuidFromObject(row["RecipientRoleId"]), State = getIntFromObject(row["State"]),