Add Enrollment Id to ATI (#3399)

* Added enrollmentId to ATI + safety chk
AzureAD · Jun 17, 2022 · a469e1c · a469e1c
1 parent 427a7b1
commit a469e1c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/src/client/Microsoft.Identity.Client/OAuth2/MsalTokenResponse.cs b/src/client/Microsoft.Identity.Client/OAuth2/MsalTokenResponse.cs
@@ -120,6 +120,7 @@ internal static MsalTokenResponse CreateFromiOSBrokerResponse(Dictionary<string,
                     AccountUserId = homeAcctId != null ? AccountId.ParseFromString(homeAcctId).ObjectId : null,
                     TenantId = homeAcctId != null ?  AccountId.ParseFromString(homeAcctId).TenantId : null,
                     Upn = (metadataDictionary?.ContainsKey(TokenResponseClaim.Upn) ?? false) ? metadataDictionary[TokenResponseClaim.Upn] : null,
+                    CorrelationId = responseDictionary.ContainsKey(BrokerResponseConst.CorrelationId) ? responseDictionary[BrokerResponseConst.CorrelationId] : null,
                 };
             }
 

diff --git a/src/client/Microsoft.Identity.Client/Platforms/iOS/Broker/iOSBroker.cs b/src/client/Microsoft.Identity.Client/Platforms/iOS/Broker/iOSBroker.cs
@@ -129,6 +129,11 @@ private Dictionary<string, string> CreateBrokerRequestDictionary(
             brokerRequest.Add(BrokerParameter.ClientId, authenticationRequestParameters.AppConfig.ClientId);
             brokerRequest.Add(BrokerParameter.CorrelationId, authenticationRequestParameters.RequestContext.CorrelationId.ToString());
             brokerRequest.Add(BrokerParameter.ClientVersion, MsalIdHelper.GetMsalVersion());
+            var realEnrollmentId = IntuneEnrollmentIdHelper.GetRawEnrollmentId();
+            if (!string.IsNullOrEmpty(realEnrollmentId))
+            {
+                brokerRequest.Add(BrokerParameter.IntuneEnrollmentIds, realEnrollmentId);
+            }
 
             // this needs to be case sensitive because the AppBundle is case sensitive
             brokerRequest.Add(

diff --git a/src/client/Microsoft.Identity.Client/Platforms/iOS/IntuneEnrollmentIdHelper.cs b/src/client/Microsoft.Identity.Client/Platforms/iOS/IntuneEnrollmentIdHelper.cs
@@ -18,14 +18,14 @@ internal class IntuneEnrollmentIdHelper
         internal static string GetEnrollmentId(ICoreLogger logger)
         {
 #if iOS
-            var keychainData = NSUserDefaults.StandardUserDefaults.StringForKey(EnrollmentIdKey);
+            var keychainData = GetRawEnrollmentId();
             if(!string.IsNullOrEmpty(keychainData))
             {
                 try
                 {
                     var enrollmentIDs = JsonConvert.DeserializeObject<EnrollmentIDs>(keychainData);
 
-                    if (enrollmentIDs.EnrollmentIds.Count > 0)
+                    if ((enrollmentIDs?.EnrollmentIds?.Count ?? 0) > 0)
                     {
                         return enrollmentIDs.EnrollmentIds[0].EnrollmentId;
                     }
@@ -42,6 +42,16 @@ internal static string GetEnrollmentId(ICoreLogger logger)
             return string.Empty;
         }
 
+        internal static string GetRawEnrollmentId()
+        {
+#if iOS
+            var keychainData = NSUserDefaults.StandardUserDefaults.StringForKey(EnrollmentIdKey);
+            return keychainData;
+#else
+            return string.Empty;
+#endif
+        }
+
         /// <summary>
         /// This class corresponds to the EnrollmentIDs entry in the Keychain
         /// </summary>