Merge pull request #1379 from AzureAD/release/1.7.36

Common Core Release 1.7.36
AzureAD · Jun 17, 2024 · 8231b7c · 8231b7c
2 parents 85050f6 + 4b51087
commit 8231b7c
Show file tree

Hide file tree

Showing 40 changed files with 641 additions and 19 deletions.
diff --git a/IdentityCore/IdentityCore.xcodeproj/project.pbxproj b/IdentityCore/IdentityCore.xcodeproj/project.pbxproj
@@ -148,6 +148,8 @@
 		232C658C2138BED1002A41FE /* MSIDAADAuthorityMetadataResponseSerializerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 232C658B2138BED0002A41FE /* MSIDAADAuthorityMetadataResponseSerializerTests.m */; };
 		232C658D2138BED1002A41FE /* MSIDAADAuthorityMetadataResponseSerializerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 232C658B2138BED0002A41FE /* MSIDAADAuthorityMetadataResponseSerializerTests.m */; };
 		23368C0326436E4100374103 /* MSIDRequestParameters+Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 23368C0226436E4100374103 /* MSIDRequestParameters+Internal.h */; };
+		233827912BC8C40C0079C82F /* MSIDBrowserNativeMessageGetTokenResponseTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 233827902BC8C40C0079C82F /* MSIDBrowserNativeMessageGetTokenResponseTests.m */; };
+		233827922BC8C40C0079C82F /* MSIDBrowserNativeMessageGetTokenResponseTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 233827902BC8C40C0079C82F /* MSIDBrowserNativeMessageGetTokenResponseTests.m */; };
 		2338ECCB208A675D00809B9E /* MSIDAADRequestErrorHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 2338ECC8208A675D00809B9E /* MSIDAADRequestErrorHandler.m */; };
 		2338ECCC208A675D00809B9E /* MSIDAADRequestErrorHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 2338ECC8208A675D00809B9E /* MSIDAADRequestErrorHandler.m */; };
 		2338ECCD208A675D00809B9E /* MSIDHttpRequestErrorHandling.h in Headers */ = {isa = PBXBuildFile; fileRef = 2338ECC9208A675D00809B9E /* MSIDHttpRequestErrorHandling.h */; };
@@ -191,6 +193,10 @@
 		23419F83239B36F500EA78C5 /* MSIDAccountIdentifierTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 23419F81239B36F500EA78C5 /* MSIDAccountIdentifierTests.m */; };
 		234858DF20490EF8004FBC3C /* MSIDDefaultTokenCacheIntegrationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 965981041FF4C9B400E31CDE /* MSIDDefaultTokenCacheIntegrationTests.m */; };
 		2348C313221B4EFF00498D56 /* MSIDBasicContext.m in Sources */ = {isa = PBXBuildFile; fileRef = 2323A6C42217AD4A00727088 /* MSIDBasicContext.m */; };
+		234A0BE02BCDC4B900AFBBAA /* MSIDBrowserNativeMessageSignOutResponseTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 234A0BDF2BCDC4B900AFBBAA /* MSIDBrowserNativeMessageSignOutResponseTests.m */; };
+		234A0BE12BCDC4B900AFBBAA /* MSIDBrowserNativeMessageSignOutResponseTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 234A0BDF2BCDC4B900AFBBAA /* MSIDBrowserNativeMessageSignOutResponseTests.m */; };
+		234A0BE32BCDCCB100AFBBAA /* MSIDBrowserNativeMessageSignOutRequestTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 234A0BE22BCDCCB100AFBBAA /* MSIDBrowserNativeMessageSignOutRequestTests.m */; };
+		234A0BE42BCDCCB100AFBBAA /* MSIDBrowserNativeMessageSignOutRequestTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 234A0BE22BCDCCB100AFBBAA /* MSIDBrowserNativeMessageSignOutRequestTests.m */; };
 		234DE5832A9456F600E244B3 /* MSIDBrowserNativeMessageRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 234DE5812A9456F600E244B3 /* MSIDBrowserNativeMessageRequest.h */; };
 		234DE5842A9456F600E244B3 /* MSIDBrowserNativeMessageRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 234DE5822A9456F600E244B3 /* MSIDBrowserNativeMessageRequest.m */; };
 		234DE5852A9456F600E244B3 /* MSIDBrowserNativeMessageRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 234DE5822A9456F600E244B3 /* MSIDBrowserNativeMessageRequest.m */; };
@@ -2060,6 +2066,7 @@
 		232C65872138BDC5002A41FE /* MSIDAADAuthorityMetadataResponse.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDAADAuthorityMetadataResponse.m; sourceTree = "<group>"; };
 		232C658B2138BED0002A41FE /* MSIDAADAuthorityMetadataResponseSerializerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDAADAuthorityMetadataResponseSerializerTests.m; sourceTree = "<group>"; };
 		23368C0226436E4100374103 /* MSIDRequestParameters+Internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MSIDRequestParameters+Internal.h"; sourceTree = "<group>"; };
+		233827902BC8C40C0079C82F /* MSIDBrowserNativeMessageGetTokenResponseTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDBrowserNativeMessageGetTokenResponseTests.m; sourceTree = "<group>"; };
 		2338ECC8208A675D00809B9E /* MSIDAADRequestErrorHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MSIDAADRequestErrorHandler.m; sourceTree = "<group>"; };
 		2338ECC9208A675D00809B9E /* MSIDHttpRequestErrorHandling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MSIDHttpRequestErrorHandling.h; sourceTree = "<group>"; };
 		2338ECCA208A675D00809B9E /* MSIDAADRequestErrorHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MSIDAADRequestErrorHandler.h; sourceTree = "<group>"; };
@@ -2089,6 +2096,8 @@
 		23419F7B239B0D1C00EA78C5 /* MSIDAuthorityTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDAuthorityTests.m; sourceTree = "<group>"; };
 		23419F7E239B33E400EA78C5 /* MSIDAADV2TokenResponseTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDAADV2TokenResponseTests.m; sourceTree = "<group>"; };
 		23419F81239B36F500EA78C5 /* MSIDAccountIdentifierTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDAccountIdentifierTests.m; sourceTree = "<group>"; };
+		234A0BDF2BCDC4B900AFBBAA /* MSIDBrowserNativeMessageSignOutResponseTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDBrowserNativeMessageSignOutResponseTests.m; sourceTree = "<group>"; };
+		234A0BE22BCDCCB100AFBBAA /* MSIDBrowserNativeMessageSignOutRequestTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDBrowserNativeMessageSignOutRequestTests.m; sourceTree = "<group>"; };
 		234DE5812A9456F600E244B3 /* MSIDBrowserNativeMessageRequest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSIDBrowserNativeMessageRequest.h; sourceTree = "<group>"; };
 		234DE5822A9456F600E244B3 /* MSIDBrowserNativeMessageRequest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDBrowserNativeMessageRequest.m; sourceTree = "<group>"; };
 		2352AF302AA7C7B700FA2253 /* MSIDBrowserNativeMessageGetTokenResponse.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSIDBrowserNativeMessageGetTokenResponse.h; sourceTree = "<group>"; };
@@ -5612,6 +5621,9 @@
 				B431B5252AF05B3F0020CD3D /* MSIDBrokerOperationPasskeyCredentialRequestTests.m */,
 				B431B5282AF05C890020CD3D /* MSIDBrokerOperationGetPasskeyAssertionResponseTests.m */,
 				B431B52B2AF19E230020CD3D /* MSIDBrokerOperationGetPasskeyCredentialResponseTests.m */,
+				233827902BC8C40C0079C82F /* MSIDBrowserNativeMessageGetTokenResponseTests.m */,
+				234A0BDF2BCDC4B900AFBBAA /* MSIDBrowserNativeMessageSignOutResponseTests.m */,
+				234A0BE22BCDCCB100AFBBAA /* MSIDBrowserNativeMessageSignOutRequestTests.m */,
 				586DE2A72BC884600082137F /* MSIDAuthenticationSchemeSshCertTest.m */,
 			);
 			path = tests;
@@ -6796,6 +6808,7 @@
 				B2936F7920ABF8310050C585 /* MSIDLegacyAccessTokenTests.m in Sources */,
 				60747FF62354F04F00C5308F /* MSIDBrokerOperationGetAccountsRequestTests.m in Sources */,
 				586CD77E293FD77100550710 /* MSIDRequestControllerFactoryTests.m in Sources */,
+				233827912BC8C40C0079C82F /* MSIDBrowserNativeMessageGetTokenResponseTests.m in Sources */,
 				238EF086209161830035ABE6 /* MSIDAADJsonResponsePreprocessorTests.m in Sources */,
 				B20657C61FC9265800412B7D /* MSIDTelemetryExtensionsTests.m in Sources */,
 				B2BE924F21A24A5300F5AB8C /* MSIDSilentControllerIntegrationTests.m in Sources */,
@@ -6837,6 +6850,7 @@
 				963553BF20CA7C52005235E5 /* MSIDSystemWebviewControllerTests.m in Sources */,
 				963CFAF320AD817600BDA25F /* MSIDWebviewAuthorizationTests.m in Sources */,
 				B2525C752330623E006FBA4B /* MSIDMainThreadUtilTests.m in Sources */,
+				234A0BE32BCDCCB100AFBBAA /* MSIDBrowserNativeMessageSignOutRequestTests.m in Sources */,
 				2338ECDA208A7CBD00809B9E /* MSIDAADRequestErrorHandlerTests.m in Sources */,
 				23CA0C4A220A3B6900768729 /* MSIDPKeyAuthHandlerTests.m in Sources */,
 				80B6BF3C2480A3E30031BFE8 /* MSIDWorkPlaceJoinUtilTests.m in Sources */,
@@ -6870,6 +6884,7 @@
 				B2DD4B4020A934170047A66E /* MSIDCredentialTypeTests.m in Sources */,
 				580E254E271A1815003D1795 /* MSIDBrokerOperationGetSsoCookiesResponseTests.m in Sources */,
 				B2C708DF219BC67F00D917B8 /* MSIDDefaultSilentTokenRequestTests.m in Sources */,
+				234A0BE02BCDC4B900AFBBAA /* MSIDBrowserNativeMessageSignOutResponseTests.m in Sources */,
 				B210F4501FDDF5D2005A8F76 /* MSIDClientInfoTests.m in Sources */,
 				6080B9A523886DD9009B1322 /* MSIDBrokerOperationGetDeviceInfoRequestTests.m in Sources */,
 				B431B5292AF05C890020CD3D /* MSIDBrokerOperationGetPasskeyAssertionResponseTests.m in Sources */,
@@ -7324,6 +7339,7 @@
 				B2DD5B9C20475E780084313F /* MSIDBaseTokenTests.m in Sources */,
 				239DF9C420E04BC9002D428B /* MSIDADFSAuthorityTests.m in Sources */,
 				B431B5422AF1C6C10020CD3D /* MSIDSSOExtensionPasskeyCredentialRequestMock.m in Sources */,
+				233827922BC8C40C0079C82F /* MSIDBrowserNativeMessageGetTokenResponseTests.m in Sources */,
 				23419F6123974C0D00EA78C5 /* MSIDBrokerOperationTokenRequestTests.m in Sources */,
 				236CB13F2A609A1B005A6F5F /* MSIDBrokerOperationBrowserNativeMessageRequestTests.m in Sources */,
 				B2807FFF204CB25E00944D89 /* MSIDTokenResponseTests.m in Sources */,
@@ -7335,6 +7351,7 @@
 				B20657C71FC9265800412B7D /* MSIDTelemetryExtensionsTests.m in Sources */,
 				239DF9C720E04ECF002D428B /* MSIDAuthorityIntegrationTests.m in Sources */,
 				B2E7698F206096A7000F3F2B /* MSIDTelemetryCacheEventTests.m in Sources */,
+				234A0BE12BCDC4B900AFBBAA /* MSIDBrowserNativeMessageSignOutResponseTests.m in Sources */,
 				23419F7D239B0D1C00EA78C5 /* MSIDAuthorityTests.m in Sources */,
 				E733EE0D25C0A50A00ACB79A /* MSIDThumbprintCalculatorTests.m in Sources */,
 				234858DF20490EF8004FBC3C /* MSIDDefaultTokenCacheIntegrationTests.m in Sources */,
@@ -7350,6 +7367,7 @@
 				728D9E492824A323001D990F /* MSIDPkeyAuthHelperTests.m in Sources */,
 				589BDB1E2718CD7D00BF3799 /* MSIDBrokerOperationGetSsoCookiesRequestTests.m in Sources */,
 				B26A0B9A2072BABE006BD95A /* MSIDAADV2Oauth2FactoryTests.m in Sources */,
+				234A0BE42BCDCCB100AFBBAA /* MSIDBrowserNativeMessageSignOutRequestTests.m in Sources */,
 				B287C4CF26A132FA004303F1 /* MSIDSSOExtensionRequestDelegateTests.m in Sources */,
 				60BF06052051F9A200DE7C1C /* MSIDTelemetryTestDispatcher.m in Sources */,
 				23CAB3912A60ACB50066CFA2 /* MSIDBrokerOperationBrowserNativeMessageResponseTests.m in Sources */,

diff --git a/IdentityCore/src/MSIDBrokerConstants.h b/IdentityCore/src/MSIDBrokerConstants.h
@@ -92,7 +92,7 @@ extern NSString * _Nonnull const MSID_BROKER_REQUEST_SENT_TIMESTAMP;
 extern NSString * _Nonnull const MSID_BROKER_ACCOUNT_HOME_TENANT_ID;
 extern NSString * _Nonnull const MSID_CLIENT_SKU_KEY;
 extern NSString * _Nonnull const MSID_SKIP_VALIDATE_RESULT_ACCOUNT_KEY;
-extern NSString * _Nonnull const JIT_TROUBLESHOOTING_HOST;
+extern NSString * _Nonnull const MSID_JIT_TROUBLESHOOTING_HOST;
 extern NSString * _Nonnull const MSID_IS_CALLER_MANAGED_KEY;
 extern NSString * _Nonnull const MSID_BROKER_PREFERRED_AUTH_CONFIGURATION_KEY;
 extern NSString * _Nonnull const MSID_BROKER_SDM_WPJ_ATTEMPTED;

diff --git a/IdentityCore/src/MSIDBrokerConstants.m b/IdentityCore/src/MSIDBrokerConstants.m
@@ -91,7 +91,7 @@
 NSString *const MSID_PRIMARY_REGISTRATION_CLOUD = @"primary_registration_metadata_cloud_host";
 NSString *const MSID_PRIMARY_REGISTRATION_CERTIFICATE_THUMBPRINT = @"primary_registration_metadata_certificate_thumbprint";
 NSString *const MSID_PLATFORM_SSO_STATUS_KEY = @"platform_sso_status";
-NSString *const JIT_TROUBLESHOOTING_HOST = @"jit_troubleshooting";
+NSString *const MSID_JIT_TROUBLESHOOTING_HOST = @"jit_troubleshooting";
 NSString *const MSID_IS_CALLER_MANAGED_KEY = @"isCallerAppManaged";
 NSString *const MSID_BROKER_SDM_WPJ_ATTEMPTED = @"sdm_reg_attempted";
 NSString *const MSID_FORCE_REFRESH_KEY = @"force_refresh";

diff --git a/IdentityCore/src/MSIDConstants.h b/IdentityCore/src/MSIDConstants.h
@@ -114,6 +114,7 @@ typedef void (^MSIDPasskeyCredentialRequestCompletionBlock)(MSIDPasskeyCredentia
 
 extern NSString * _Nonnull const MSID_PLATFORM_KEY;//The SDK platform. iOS or OSX
 extern NSString * _Nonnull const MSID_SOURCE_PLATFORM_KEY;//The source SDK platform. iOS or OSX
+extern NSString * _Nonnull const MSID_PLATFORM_SEQUENCE_KEY;
 extern NSString * _Nonnull const MSID_VERSION_KEY;
 extern NSString * _Nonnull const MSID_CPU_KEY;//E.g. ARM64
 extern NSString * _Nonnull const MSID_OS_VER_KEY;//iOS/OSX version
@@ -161,4 +162,13 @@ extern NSString * _Nonnull const MSID_CLIENT_SKU_ADAL_IOS;
 
 extern NSString * _Nonnull const MSID_BROWSER_NATIVE_MESSAGE_ACCOUNT_ID_KEY;
 
+typedef NS_ENUM(NSInteger, MSIDPlatformSequenceIndex)
+{
+    MSIDPlatformSequenceIndexSrc = 0,
+    MSIDPlatformSequenceIndexMsalRuntime = 1,
+    MSIDPlatformSequenceIndexBrowserExt = 2,
+    MSIDPlatformSequenceIndexBrowserCore = 3,
+    MSIDPlatformSequenceIndexLast = MSIDPlatformSequenceIndexBrowserCore,
+};
+
 #define METHODANDLINE   [NSString stringWithFormat:@"%s [Line %d]", __PRETTY_FUNCTION__, __LINE__]
diff --git a/IdentityCore/src/MSIDConstants.m b/IdentityCore/src/MSIDConstants.m
@@ -25,6 +25,7 @@
 
 NSString *const MSID_PLATFORM_KEY                  = @"x-client-SKU";
 NSString *const MSID_SOURCE_PLATFORM_KEY           = @"x-client-src-SKU";
+NSString *const MSID_PLATFORM_SEQUENCE_KEY         = @"x-client-xtra-sku";
 NSString *const MSID_VERSION_KEY                   = @"x-client-Ver";
 NSString *const MSID_CPU_KEY                       = @"x-client-CPU";
 NSString *const MSID_OS_VER_KEY                    = @"x-client-OS";

diff --git a/IdentityCore/src/MSIDError.h b/IdentityCore/src/MSIDError.h
@@ -325,6 +325,9 @@ typedef NS_ENUM(NSInteger, MSIDErrorCode)
     // In PSSO, KeyId stored in passkey provider storage does not match NGC key, needs to configure and retry
     MSIDErrorPSSOKeyIdMismatch                     =   -51838,
 
+    // JIT - Error Handling config invalid or not found
+    MSIDErrorJITErrorHandlingConfigNotFound        =   -51839,
+
     // Throttling errors
     MSIDErrorThrottleCacheNoRecord = -51900,
     MSIDErrorThrottleCacheInvalidSignature = -51901,

diff --git a/IdentityCore/src/MSIDError.m b/IdentityCore/src/MSIDError.m
@@ -197,6 +197,7 @@ MSIDErrorCode MSIDErrorCodeForOAuthErrorWithSubErrorCode(NSString *oauthError, M
                       @(MSIDErrorJITTroubleshootingAcquireToken),
                       @(MSIDErrorDeviceNotPSSORegistered),
                       @(MSIDErrorPSSOKeyIdMismatch),
+                      @(MSIDErrorJITErrorHandlingConfigNotFound),
 
                       ],
               MSIDOAuthErrorDomain : @[// Server Errors
@@ -397,6 +398,9 @@ void MSIDFillAndLogError(NSError **error, MSIDErrorCode errorCode, NSString *err
             return @"MSIDErrorJITTroubleshootingResultUnknown";
         case MSIDErrorJITTroubleshootingAcquireToken:
             return @"MSIDErrorJITTroubleshootingAcquireToken";
+        case MSIDErrorJITErrorHandlingConfigNotFound:
+            return @"MSIDErrorJITErrorHandlingConfigNotFound";
+            // PSSO errors
         case MSIDErrorDeviceNotPSSORegistered:
             return @"MSIDErrorDeviceNotPSSORegistered";
         case MSIDErrorPSSOKeyIdMismatch:

diff --git a/IdentityCore/src/broker_operation/request/MSIDBrokerOperationRequest.h b/IdentityCore/src/broker_operation/request/MSIDBrokerOperationRequest.h
@@ -37,6 +37,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, nullable) NSString *clientAppName;
 @property (nonatomic) MSIDClientSDKType clientSDK;
 @property (nonatomic) BOOL clientBrokerKeyCapabilityNotSupported;
+@property (nonatomic, nullable) NSString *platformSequence;
 
 + (BOOL)fillRequest:(MSIDBrokerOperationRequest *)request
 keychainAccessGroup:(nullable NSString *)keychainAccessGroup

diff --git a/IdentityCore/src/broker_operation/request/MSIDBrokerOperationRequest.m b/IdentityCore/src/broker_operation/request/MSIDBrokerOperationRequest.m
@@ -80,6 +80,8 @@ - (instancetype)initWithJSONDictionary:(NSDictionary *)json error:(NSError **)er
 
         NSString *sdkTypeString = [json msidStringObjectForKey:MSID_BROKER_CLIENT_SDK_KEY];
         _clientSDK = MSIDClientSDKTypeFromString(sdkTypeString);
+
+        _platformSequence = [json msidStringObjectForKey:MSID_PLATFORM_SEQUENCE_KEY];
     }
 
     return self;
@@ -120,6 +122,8 @@ - (NSDictionary *)jsonDictionary
 
     NSString *sdkTypeString = MSIDClientSDKTypeToString(self.clientSDK);
     json[MSID_BROKER_CLIENT_SDK_KEY] = sdkTypeString;
+
+    json[MSID_PLATFORM_SEQUENCE_KEY] = self.platformSequence;
     return json;
 }
 

diff --git a/...ation/response/browser_native_message_response/MSIDBrowserNativeMessageGetTokenResponse.m b/...ation/response/browser_native_message_response/MSIDBrowserNativeMessageGetTokenResponse.m
@@ -77,6 +77,11 @@ - (NSDictionary *)jsonDictionary
     response[@"account"] = accountJson;
     response[@"state"] = self.state;
 
+    __auto_type propertiesJson = [NSMutableDictionary new];
+    // TODO: once ests follow the latest protocol, this should be removed. Account ID should be read from accountJson.
+    propertiesJson[@"UPN"] = tokenResponse.idTokenObj.username;
+    response[@"properties"] = propertiesJson;
+
     return response;
 }
 

diff --git a/IdentityCore/src/parameters/MSIDRequestParameters.h b/IdentityCore/src/parameters/MSIDRequestParameters.h
@@ -57,6 +57,10 @@
 @property (nonatomic) NSString *clientSku;
 @property (nonatomic) BOOL skipValidateResultAccount;
 @property (nonatomic) BOOL forceRefresh;
+@property (nonatomic) BOOL bypassRedirectURIValidation;
+
+// Telemetry metadata
+@property (nonatomic) NSString *platformSequence;
 
 // Additional body parameters that will be appended to all token requests
 @property (nonatomic) NSDictionary *extraTokenRequestParameters;

diff --git a/IdentityCore/src/parameters/MSIDRequestParameters.m b/IdentityCore/src/parameters/MSIDRequestParameters.m
@@ -332,7 +332,7 @@ - (BOOL)validateParametersWithError:(NSError **)error
         return NO;
     }
 
-    if (!self.redirectUri)
+    if (!self.redirectUri && !self.bypassRedirectURIValidation)
     {
         MSIDFillAndLogError(error, MSIDErrorInvalidDeveloperParameter, @"Missing redirectUri parameter", self.correlationId);
         return NO;
@@ -387,6 +387,7 @@ - (instancetype)copyWithZone:(NSZone*)zone
     parameters->_clientCapabilities = [_clientCapabilities copyWithZone:zone];
     parameters->_msidConfiguration = [_msidConfiguration copyWithZone:zone];
     parameters->_keychainAccessGroup = [_keychainAccessGroup copyWithZone:zone];
+    parameters->_platformSequence = [_platformSequence copyWithZone:zone];
 
     return parameters;
 }

diff --git a/IdentityCore/src/requests/broker/MSIDBrokerTokenRequest.m b/IdentityCore/src/requests/broker/MSIDBrokerTokenRequest.m
@@ -191,6 +191,7 @@ - (NSDictionary *)defaultPayloadContents:(NSError **)error
 
     [queryDictionary msidSetNonEmptyString:self.requestParameters.clientSku forKey:MSID_CLIENT_SKU_KEY];
     [queryDictionary msidSetNonEmptyString:self.requestParameters.skipValidateResultAccount ? @"YES" : @"NO" forKey:MSID_SKIP_VALIDATE_RESULT_ACCOUNT_KEY];
+    [queryDictionary msidSetNonEmptyString:self.requestParameters.platformSequence forKey:MSID_PLATFORM_SEQUENCE_KEY];
     return queryDictionary;
 }
 
@@ -222,6 +223,7 @@ - (NSDictionary *)defaultResumeDictionaryContents
 
     [resumeDictionary msidSetNonEmptyString:self.requestParameters.clientSku forKey:MSID_CLIENT_SKU_KEY];
     [resumeDictionary msidSetNonEmptyString:self.requestParameters.skipValidateResultAccount ? @"YES" : @"NO" forKey:MSID_SKIP_VALIDATE_RESULT_ACCOUNT_KEY];
+    [resumeDictionary msidSetNonEmptyString:self.requestParameters.platformSequence forKey:MSID_PLATFORM_SEQUENCE_KEY];
     return resumeDictionary;
 }
 

diff --git a/IdentityCore/src/util/NSString+MSIDTelemetryExtensions.h b/IdentityCore/src/util/NSString+MSIDTelemetryExtensions.h
@@ -27,4 +27,6 @@
 
 - (NSDictionary *)msidParsedClientTelemetry;
 
++ (NSString *)msidUpdatePlatformSequenceParamWithSrcName:(NSString *)name srcVersion:(NSString *)version sequence:(NSString *)sequence;
+
 @end
Original file line number	Diff line number	Diff line change
Expand Up		@@ -27,4 +27,6 @@

		- (NSDictionary *)msidParsedClientTelemetry;

		+ (NSString )msidUpdatePlatformSequenceParamWithSrcName:(NSString )name srcVersion:(NSString )version sequence:(NSString )sequence;

		@end