Skip to content

Fix null reference while patching phone and address, when customized … #51

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
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix null reference while patching phone and address, when customized … #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f3b0ba
Fix null reference while patching phone and address, when customized …
May 20, 2021
269e572
Merge branch 'AzureAD:master' into master
johnxjcheng Apr 19, 2022
7b06dce
Fix casting issue
Apr 19, 2022
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
29 changes: 17 additions & 12 deletions Microsoft.SystemForCrossDomainIdentityManagement/Protocol/Core2EnterpriseUserExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,12 +488,13 @@ private static void PatchAddresses(this Core2EnterpriseUser user, PatchOperation

if
(
string.IsNullOrWhiteSpace(address.Country)
address == null ||
(string.IsNullOrWhiteSpace(address.Country)
&& string.IsNullOrWhiteSpace(address.Locality)
&& string.IsNullOrWhiteSpace(address.PostalCode)
&& string.IsNullOrWhiteSpace(address.Region)
&& string.IsNullOrWhiteSpace(address.StreetAddress)
&& string.IsNullOrWhiteSpace(address.Formatted)
&& string.IsNullOrWhiteSpace(address.Formatted))
)
{
if (addressExisting != null)
Expand Down Expand Up @@ -951,19 +952,23 @@ private static void PatchPhoneNumbers(this Core2EnterpriseUser user, PatchOperat
};
}

string value = operation.Value?.Single().Value;
if
(
value != null
&& OperationName.Remove == operation.Name
&& string.Equals(value, phoneNumber.Value, StringComparison.OrdinalIgnoreCase)
)
if (phoneNumber != null)
{
value = null;
string value = operation.Value?.Single().Value;
if
(
value != null
&& OperationName.Remove == operation.Name
&& string.Equals(value, phoneNumber.Value, StringComparison.OrdinalIgnoreCase)
)
{
value = null;
}

phoneNumber.Value = value;
}
phoneNumber.Value = value;

if (string.IsNullOrWhiteSpace(phoneNumber.Value))
if (phoneNumber == null || string.IsNullOrWhiteSpace(phoneNumber.Value))
{
if (phoneNumberExisting != null)
{
Expand Down
3 changes: 1 addition & 2 deletions Microsoft.SystemForCrossDomainIdentityManagement/Schemas/TrustedJsonFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ public class TrustedJsonFactory : JsonFactory
public override Dictionary<string, object> Create(string json)
{
Dictionary<string, object> result =
(Dictionary<string, object>)JsonConvert.DeserializeObject(
json);
JsonConvert.DeserializeObject<Dictionary<string, object>>(json);
return result;
}

Expand Down