merge conflicts

Author: Veena11

MSAL/IdentityCore

@@ -116,6 +116,8 @@ - (MSALPlatformSSOStatus)msalPlatformSSOStatusFromMSIDPlatformSSOStatus:(MSIDPla
             return MSALPlatformSSOEnabledNotRegistered;
         case MSIDPlatformSSOEnabledAndRegistered:
             return MSALPlatformSSOEnabledAndRegistered;
+        case MSIDPlatformSSORegistrationNeedsRepair:
+            return MSALPlatformSSORegistrationNeedsRepair;
 
         default:
             return MSALPlatformSSONotEnabled;

MSAL/src/MSALDeviceInformation.m

@@ -133,7 +133,8 @@ + (void)initialize
                                    @(MSIDErrorServerError) : @(MSALErrorServerError),
                                    @(MSIDErrorServerInvalidState) : @(MSALInternalErrorInvalidState),
                                    @(MSIDErrorServerProtectionPoliciesRequired) : @(MSALErrorServerProtectionPoliciesRequired),
-                                   @(MSIDErrorServerUnhandledResponse) : @(MSALInternalErrorUnhandledResponse)
+                                   @(MSIDErrorServerUnhandledResponse) : @(MSALInternalErrorUnhandledResponse),
+                                   @(MSIDErrorUnexpectedHttpResponse) : @(MSALInternalErrorUnexpectedHttpResponse)
                                    }
                            };
 

MSAL/src/MSALErrorConverter.m

@@ -175,7 +175,11 @@ typedef NS_ENUM(NSUInteger, MSALPlatformSSOStatus)
     /*
      Administrator has configured Platform SSO in sso config and the device is registred with AAD via platform SSO
      */
-    MSALPlatformSSOEnabledAndRegistered
+    MSALPlatformSSOEnabledAndRegistered,
+    /*
+     Platform SSO registration on device is not valid , needs repair
+     */
+    MSALPlatformSSORegistrationNeedsRepair
 };
 
 /**

MSAL/src/public/MSALDefinitions.h

@@ -262,6 +262,11 @@ typedef NS_ENUM(NSInteger, MSALInternalError)
      */
     MSALInternalErrorUnexpected                         = -42008,
 
+    /**
+     Un expected http response with status code 403 or 404
+     */
+    MSALInternalErrorUnexpectedHttpResponse             = -42009,
+    
     /**
      The passed in authority URL does not pass validation.
      If you're trying to use B2C, you must disable authority validation by