Merge pull request #611 from AzureAD/oldalton/dont_log_enrollment_id_error

oldalton · web-flow · commit 19d1e83daecb · 2019-11-07T18:21:27.000-08:00
Don't log intune enrollment ID error
diff --git a/IdentityCore/src/intune/MSIDIntuneEnrollmentIdsCache.m b/IdentityCore/src/intune/MSIDIntuneEnrollmentIdsCache.m
@@ -208,11 +208,11 @@ - (BOOL)isValid:(NSDictionary *)json
         context:(id<MSIDRequestContext>)context
           error:(NSError **)error
 {
-    NSString *errorDescription = @"Intune Enrollment ID JSON structure is incorrect.";
-    __auto_type validationError = MSIDCreateError(MSIDErrorDomain, MSIDErrorInternal, errorDescription, nil, nil, nil, context.correlationId, nil, YES);
-    
     if (!json) return YES;
     
+    NSString *errorDescription = @"Intune Enrollment ID JSON structure is incorrect.";
+    __auto_type validationError = MSIDCreateError(MSIDErrorDomain, MSIDErrorInternal, errorDescription, nil, nil, nil, context.correlationId, nil, NO);
+    
     if (![json isKindOfClass:NSDictionary.class])
     {
         if (error) *error = validationError;

Original file line number	Diff line number	Diff line change
`@@ -208,11 +208,11 @@ - (BOOL)isValid:(NSDictionary *)json`
`208`	`208`	`context:(id<MSIDRequestContext>)context`
`209`	`209`	`error:(NSError **)error`
`210`	`210`	`{`
`211`		`- NSString *errorDescription = @"Intune Enrollment ID JSON structure is incorrect.";`
`212`		`- __auto_type validationError = MSIDCreateError(MSIDErrorDomain, MSIDErrorInternal, errorDescription, nil, nil, nil, context.correlationId, nil, YES);`
`213`		`-`
`214`	`211`	`if (!json) return YES;`
`215`	`212`
	`213`	`+ NSString *errorDescription = @"Intune Enrollment ID JSON structure is incorrect.";`
	`214`	`+ __auto_type validationError = MSIDCreateError(MSIDErrorDomain, MSIDErrorInternal, errorDescription, nil, nil, nil, context.correlationId, nil, NO);`
	`215`	`+`
`216`	`216`	`if (![json isKindOfClass:NSDictionary.class])`
`217`	`217`	`{`
`218`	`218`	`if (error) *error = validationError;`