Release 1.7.11 (#1146)

* Expose objectId for mam support

* Address comments

* Fixed json serialize and deserilaize issues found during testing

* Add detailed SSO-JIT telemetry:

- Add error codes specific for each case
- Allow lastError telemetry to use a custom error string

* added fix for bckgnd task not stopped in system webview request case

* updated location of system webview bknd task stop

* Update changelog

* Update changelog

* Fix a compiling issue with Edge on Mac

* Improve logging. (#1142)

* Refactor code. (#1143)

* Current Telemetry Changes for FLW and Multiple Registrations

* Fix formatting issues

* Resolved comments

* Disable bitcode everywhere

* Update changelog.

* Update change log

* Update change log file

* Refactor automation (#1043)

* Support resource in automation tests.

* Improve automation tests performance.

* Refactor tests core.

* Remove unused code.

* Use file pipeline for simulator.

* Revert "Remove unused code."

This reverts commit 9cd3b1b.

* Revert "Refactor tests core."

This reverts commit 27c53e5.

* Revert "Improve automation tests performance."

This reverts commit cbf1005.

* Revert "Support resource in automation tests."

This reverts commit 4317159.

* Exctract common automation code.

* Add dely after cache/keychain clearing.

* Fix email typing.

* Increase timeout.

* Debug tests failure.

* Disable CBA automation (#1145)

* Improve errors assertion.

Co-authored-by: Olga Dalton <[email protected]>

* Revert "Merge pull request #1148 from AzureAD/kaisong1990/2073563-disable-bitcode" (#1150)

This reverts commit a71be0e, reversing
changes made to a68a20b.

Co-authored-by: Veena Soman <[email protected]>
Co-authored-by: Juan Arias <[email protected]>
Co-authored-by: Juan Arias Roldan <[email protected]>
Co-authored-by: mipetriu <[email protected]>
Co-authored-by: Feng Gao <[email protected]>
Co-authored-by: kaisong1990 <[email protected]>
Co-authored-by: Swasti Gupta <[email protected]>
Co-authored-by: swasti29 <[email protected]>
Co-authored-by: Olga Dalton <[email protected]>

Author: 9 people

IdentityCore/IdentityCore.xcodeproj/project.pbxproj

@@ -419,8 +419,18 @@
 		23DADC1020B8BF4F005D7389 /* MSIDAadAuthorityCacheRecord.h in Headers */ = {isa = PBXBuildFile; fileRef = 23DADC0E20B8BF4F005D7389 /* MSIDAadAuthorityCacheRecord.h */; };
 		23DADC1120B8BF4F005D7389 /* MSIDAadAuthorityCacheRecord.m in Sources */ = {isa = PBXBuildFile; fileRef = 23DADC0F20B8BF4F005D7389 /* MSIDAadAuthorityCacheRecord.m */; };
 		23E2580A233E7BD1007A38D9 /* MSIDAADV2TokenResponseForV1RequestTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E25808233E7BD1007A38D9 /* MSIDAADV2TokenResponseForV1RequestTests.m */; };
+		23E3A80C289B2952007767BA /* MSIDBaseUITest.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E3A80A289B293F007767BA /* MSIDBaseUITest.m */; };
+		23E3A80D289B2953007767BA /* MSIDBaseUITest.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E3A80A289B293F007767BA /* MSIDBaseUITest.m */; };
+		23E3A818289B30F2007767BA /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 23E3A817289B30F2007767BA /* XCTest.framework */; };
+		23E3A81A289B30FB007767BA /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 23E3A819289B30FB007767BA /* XCTest.framework */; };
+		23E3A824289B4889007767BA /* XCUIElement+CrossPlat.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E3A822289B4889007767BA /* XCUIElement+CrossPlat.m */; };
+		23E3A825289B4889007767BA /* XCUIElement+CrossPlat.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E3A822289B4889007767BA /* XCUIElement+CrossPlat.m */; };
+		23E3A826289B4889007767BA /* XCUIElement+CrossPlat.h in Headers */ = {isa = PBXBuildFile; fileRef = 23E3A823289B4889007767BA /* XCUIElement+CrossPlat.h */; };
 		23F32F251FFDAF1900B2905E /* MSIDTestBrokerResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = B2D81BBD1FF5C7460093859A /* MSIDTestBrokerResponse.m */; };
 		23F32F261FFDAF1A00B2905E /* MSIDTestBrokerResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = B2D81BBD1FF5C7460093859A /* MSIDTestBrokerResponse.m */; };
+		23F48C7C2890C4AC0038E1EA /* MSIDTestsConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 23F48C7A2890C4AC0038E1EA /* MSIDTestsConfig.h */; };
+		23F48C7D2890C4AC0038E1EA /* MSIDTestsConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 23F48C7B2890C4AC0038E1EA /* MSIDTestsConfig.m */; };
+		23F48C7E2890C4AC0038E1EA /* MSIDTestsConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 23F48C7B2890C4AC0038E1EA /* MSIDTestsConfig.m */; };
 		23F9FD4622EC08D800DAB65D /* NSKeyedUnarchiver+MSIDExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 23F9FD4422EC08D800DAB65D /* NSKeyedUnarchiver+MSIDExtensions.h */; };
 		23F9FD4722EC08D800DAB65D /* NSKeyedUnarchiver+MSIDExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = 23F9FD4522EC08D800DAB65D /* NSKeyedUnarchiver+MSIDExtensions.m */; };
 		23F9FD4822EC08D800DAB65D /* NSKeyedUnarchiver+MSIDExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = 23F9FD4522EC08D800DAB65D /* NSKeyedUnarchiver+MSIDExtensions.m */; };
@@ -2124,8 +2134,16 @@
 		23DADC0E20B8BF4F005D7389 /* MSIDAadAuthorityCacheRecord.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSIDAadAuthorityCacheRecord.h; sourceTree = "<group>"; };
 		23DADC0F20B8BF4F005D7389 /* MSIDAadAuthorityCacheRecord.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDAadAuthorityCacheRecord.m; sourceTree = "<group>"; };
 		23E25808233E7BD1007A38D9 /* MSIDAADV2TokenResponseForV1RequestTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDAADV2TokenResponseForV1RequestTests.m; sourceTree = "<group>"; };
+		23E3A809289B293F007767BA /* MSIDBaseUITest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSIDBaseUITest.h; sourceTree = "<group>"; };
+		23E3A80A289B293F007767BA /* MSIDBaseUITest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDBaseUITest.m; sourceTree = "<group>"; };
+		23E3A817289B30F2007767BA /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Platforms/iPhoneOS.platform/Developer/Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
+		23E3A819289B30FB007767BA /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Platforms/MacOSX.platform/Developer/Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
+		23E3A822289B4889007767BA /* XCUIElement+CrossPlat.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "XCUIElement+CrossPlat.m"; sourceTree = "<group>"; };
+		23E3A823289B4889007767BA /* XCUIElement+CrossPlat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "XCUIElement+CrossPlat.h"; sourceTree = "<group>"; };
 		23F32F151FF72CE400B2905E /* MSIDMacTokenCacheIntegrationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MSIDMacTokenCacheIntegrationTests.m; sourceTree = "<group>"; };
 		23F32F221FFDAB9D00B2905E /* MSIDTokenCacheDataSourceIntegrationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MSIDTokenCacheDataSourceIntegrationTests.m; sourceTree = "<group>"; };
+		23F48C7A2890C4AC0038E1EA /* MSIDTestsConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MSIDTestsConfig.h; sourceTree = "<group>"; };
+		23F48C7B2890C4AC0038E1EA /* MSIDTestsConfig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MSIDTestsConfig.m; sourceTree = "<group>"; };
 		23F9FD4422EC08D800DAB65D /* NSKeyedUnarchiver+MSIDExtensions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSKeyedUnarchiver+MSIDExtensions.h"; sourceTree = "<group>"; };
 		23F9FD4522EC08D800DAB65D /* NSKeyedUnarchiver+MSIDExtensions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSKeyedUnarchiver+MSIDExtensions.m"; sourceTree = "<group>"; };
 		23F9FD4922EC097600DAB65D /* NSKeyedArchiver+MSIDExtensions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSKeyedArchiver+MSIDExtensions.h"; sourceTree = "<group>"; };
@@ -3039,13 +3057,15 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				23E3A818289B30F2007767BA /* XCTest.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		B2ED1BB12204D26700A24E82 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				23E3A81A289B30FB007767BA /* XCTest.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -4141,6 +4161,8 @@
 		B21FA9D722063C2B00806B68 /* ui_tests_lib */ = {
 			isa = PBXGroup;
 			children = (
+				23F48C7A2890C4AC0038E1EA /* MSIDTestsConfig.h */,
+				23F48C7B2890C4AC0038E1EA /* MSIDTestsConfig.m */,
 				B248FFA6223C89E800628574 /* lab_api */,
 				B27551F7208182BE00AA7A38 /* keyvault */,
 				B27551E620817CD400AA7A38 /* MSIDTestConfigurationProvider.h */,
@@ -4149,6 +4171,10 @@
 				B2C75908207EE5C900C1FE74 /* MSIDClientCredentialHelper.m */,
 				B275520D208186F500AA7A38 /* MSIDAutomation-Bridging-Header.h */,
 				B275520A208185E600AA7A38 /* KeyvaultAuthentication.swift */,
+				23E3A809289B293F007767BA /* MSIDBaseUITest.h */,
+				23E3A80A289B293F007767BA /* MSIDBaseUITest.m */,
+				23E3A823289B4889007767BA /* XCUIElement+CrossPlat.h */,
+				23E3A822289B4889007767BA /* XCUIElement+CrossPlat.m */,
 			);
 			path = ui_tests_lib;
 			sourceTree = "<group>";
@@ -4978,6 +5004,8 @@
 		D6D9A4C21FBE718C00EFA430 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				23E3A817289B30F2007767BA /* XCTest.framework */,
+				23E3A819289B30FB007767BA /* XCTest.framework */,
 				963C898C214B98F10051AFEE /* AuthenticationServices.framework */,
 				B2BD0A5A2376889600DF6AE4 /* AuthenticationServices.framework */,
 				60D6ED0B20D9BB89002FCBBB /* Security.framework */,
@@ -5313,9 +5341,11 @@
 				B25315BF23E772B000432133 /* MSIDAutomationOperationAPIInMemoryCacheHandler.h in Headers */,
 				B2ED1BBC2204D29400A24E82 /* MSIDAutomationTestRequest.h in Headers */,
 				B2ED1BD72204D35C00A24E82 /* MSIDAutomation-Bridging-Header.h in Headers */,
+				23F48C7C2890C4AC0038E1EA /* MSIDTestsConfig.h in Headers */,
 				B248FFB1223C8F4D00628574 /* MSIDAutomationBaseApiRequest.h in Headers */,
 				B248FFA3223C88CC00628574 /* MSIDAutomationTemporaryAccountRequest.h in Headers */,
 				B23F2849220E0EDE004ADA72 /* MSIDAutomationResetAPIRequest.h in Headers */,
+				23E3A826289B4889007767BA /* XCUIElement+CrossPlat.h in Headers */,
 				B253158123E2A67600432133 /* MSIDTestAutomationApplication.h in Headers */,
 				B21FA9E022063CFA00806B68 /* MSIDAutomationErrorResult.h in Headers */,
 				B25315C423E7782A00432133 /* MSIDAutomationOperationResponseHandler.h in Headers */,
@@ -6200,12 +6230,14 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				23E3A80C289B2952007767BA /* MSIDBaseUITest.m in Sources */,
 				B2ED1BD52204D35700A24E82 /* MSIDClientCredentialHelper.m in Sources */,
 				B248FFD1223D839B00628574 /* MSIDAutomationTemporaryAccountResponseHandler.m in Sources */,
 				B2ED1BC12204D2B400A24E82 /* Result.swift in Sources */,
 				B2ED1BC72204D2BF00A24E82 /* KeyVaultError.swift in Sources */,
 				B21FA9EB22063D1000806B68 /* MSIDAutomationAccountsResult.m in Sources */,
 				B248FFAD223C8DF700628574 /* MSIDAutomationPolicyToggleAPIRequest.m in Sources */,
+				23E3A824289B4889007767BA /* XCUIElement+CrossPlat.m in Sources */,
 				B25315CA23E7A0E800432133 /* MSIDTestAutomationAccountConfigurationRequest.m in Sources */,
 				B25315C023E772B000432133 /* MSIDAutomationOperationAPIInMemoryCacheHandler.m in Sources */,
 				B248FFA9223C8A9C00628574 /* MSIDAutomationTemporaryAccountRequest.m in Sources */,
@@ -6221,6 +6253,7 @@
 				B248FFC3223C97C200628574 /* MSIDAutomationPasswordRequestHandler.m in Sources */,
 				B248FFCC223C9C6800628574 /* MSIDAutomationResetOperationResponseHandler.m in Sources */,
 				B2ED1BBD2204D29C00A24E82 /* MSIDAutomationTestRequest.m in Sources */,
+				23F48C7D2890C4AC0038E1EA /* MSIDTestsConfig.m in Sources */,
 				B2C70D68240CA4AB008CD2DE /* MSIDAutomationDeleteDeviceAPIRequest.m in Sources */,
 				B25315C523E7782A00432133 /* MSIDAutomationOperationResponseHandler.m in Sources */,
 				B23F284A220E0EDE004ADA72 /* MSIDAutomationResetAPIRequest.m in Sources */,
@@ -6239,12 +6272,14 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				23E3A80D289B2953007767BA /* MSIDBaseUITest.m in Sources */,
 				B2ED1BD62204D35800A24E82 /* MSIDClientCredentialHelper.m in Sources */,
 				B248FFD2223D839B00628574 /* MSIDAutomationTemporaryAccountResponseHandler.m in Sources */,
 				B2ED1BC22204D2B400A24E82 /* Result.swift in Sources */,
 				B2ED1BC82204D2C000A24E82 /* KeyVaultError.swift in Sources */,
 				B21FA9EA22063D0F00806B68 /* MSIDAutomationAccountsResult.m in Sources */,
 				B248FFAE223C8DF700628574 /* MSIDAutomationPolicyToggleAPIRequest.m in Sources */,
+				23E3A825289B4889007767BA /* XCUIElement+CrossPlat.m in Sources */,
 				B25315CB23E7A0E800432133 /* MSIDTestAutomationAccountConfigurationRequest.m in Sources */,
 				B25315C123E772B000432133 /* MSIDAutomationOperationAPIInMemoryCacheHandler.m in Sources */,
 				B248FFA5223C88CC00628574 /* MSIDAutomationTemporaryAccountRequest.m in Sources */,
@@ -6260,6 +6295,7 @@
 				B248FFC4223C97C200628574 /* MSIDAutomationPasswordRequestHandler.m in Sources */,
 				B248FFCD223C9C6800628574 /* MSIDAutomationResetOperationResponseHandler.m in Sources */,
 				B2ED1BBE2204D29C00A24E82 /* MSIDAutomationTestRequest.m in Sources */,
+				23F48C7E2890C4AC0038E1EA /* MSIDTestsConfig.m in Sources */,
 				B2C70D69240CA4AB008CD2DE /* MSIDAutomationDeleteDeviceAPIRequest.m in Sources */,
 				B25315C623E7782A00432133 /* MSIDAutomationOperationResponseHandler.m in Sources */,
 				B23F284B220E0EDE004ADA72 /* MSIDAutomationResetAPIRequest.m in Sources */,

IdentityCore/src/MSIDBrokerConstants.h

@@ -80,3 +80,6 @@ extern NSString * _Nonnull const MSID_BROKER_TYPES_OF_HEADER;
 extern NSString * _Nonnull const MSID_ADDITIONAL_EXTENSION_DATA_KEY;
 extern NSString * _Nonnull const MSID_SSO_NONCE_QUERY_PARAM_KEY;
 extern NSString * _Nonnull const MSID_BROKER_MDM_ID_KEY;
+extern NSString * _Nonnull const MSID_ENROLLED_USER_OBJECT_ID_KEY;
+extern NSString * _Nonnull const MSID_EXTRA_DEVICE_INFO_KEY;
+

IdentityCore/src/MSIDBrokerConstants.m

@@ -75,4 +75,6 @@
 
 NSString *const MSID_ADDITIONAL_EXTENSION_DATA_KEY = @"additional_extension_data";
 NSString *const MSID_SSO_NONCE_QUERY_PARAM_KEY = @"sso_nonce";
-NSString *const MSID_BROKER_MDM_ID_KEY          = @"mdm_id";
+NSString *const MSID_BROKER_MDM_ID_KEY = @"mdm_id";
+NSString *const MSID_ENROLLED_USER_OBJECT_ID_KEY = @"object_id";
+NSString *const MSID_EXTRA_DEVICE_INFO_KEY = @"extraDeviceInfo";

IdentityCore/src/broker_operation/response/MSIDDeviceInfo.h

@@ -50,8 +50,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic) MSIDWorkPlaceJoinStatus wpjStatus;
 @property (nonatomic, nullable) NSString *brokerVersion;
 @property (nonatomic) NSDictionary *additionalExtensionData;
-// New property to return MDM Id to 1P and managed apps
-@property (nonatomic, nullable) NSString *mdmId;
+// New property to return additional device Info
+@property (nonatomic) NSDictionary *extraDeviceInfo;
 
 - (instancetype)initWithDeviceMode:(MSIDDeviceMode)deviceMode
                   ssoExtensionMode:(MSIDSSOExtensionMode)ssoExtensionMode

IdentityCore/src/broker_operation/response/MSIDDeviceInfo.m

@@ -25,11 +25,13 @@
 #import "MSIDConstants.h"
 #import "MSIDWorkPlaceJoinUtil.h"
 #import "NSJSONSerialization+MSIDExtensions.h"
+#import "MSIDJsonSerializer.h"
 
 static NSArray *deviceModeEnumString;
 
 @implementation MSIDDeviceInfo
 
+
 - (instancetype)initWithDeviceMode:(MSIDDeviceMode)deviceMode
                   ssoExtensionMode:(MSIDSSOExtensionMode)ssoExtensionMode
                  isWorkPlaceJoined:(BOOL)isWorkPlaceJoined
@@ -63,7 +65,13 @@ - (instancetype)initWithJSONDictionary:(NSDictionary *)json error:(__unused NSEr
 
         NSData *jsonData = [json[MSID_ADDITIONAL_EXTENSION_DATA_KEY] dataUsingEncoding:NSUTF8StringEncoding];
         _additionalExtensionData = [NSJSONSerialization msidNormalizedDictionaryFromJsonData:jsonData error:nil];
-        _mdmId = [json msidStringObjectForKey:MSID_BROKER_MDM_ID_KEY];
+        
+        NSString *extraDeviceInfoStr = [json msidStringObjectForKey:MSID_EXTRA_DEVICE_INFO_KEY];
+        if (extraDeviceInfoStr)
+        {
+            _extraDeviceInfo = [extraDeviceInfoStr msidJson];
+        }
+        
     }
 
     return self;
@@ -78,7 +86,11 @@ - (NSDictionary *)jsonDictionary
     json[MSID_BROKER_WPJ_STATUS_KEY] = [self wpjStatusStringFromEnum:self.wpjStatus];
     json[MSID_BROKER_BROKER_VERSION_KEY] = self.brokerVersion;
     json[MSID_ADDITIONAL_EXTENSION_DATA_KEY] = [self.additionalExtensionData msidJSONSerializeWithContext:nil];
-    json[MSID_BROKER_MDM_ID_KEY] = self.mdmId;
+    if (self.extraDeviceInfo)
+    {
+        json[MSID_EXTRA_DEVICE_INFO_KEY] = [self.extraDeviceInfo msidJSONSerializeWithContext:nil];
+    }
+    
     return json;
 }
 

IdentityCore/src/cache/key/MSIDDefaultCredentialCacheKey.m

@@ -29,7 +29,6 @@
 #import "MSIDIntuneEnrollmentIdsCache.h"
 
 static NSString *keyDelimiter = @"-";
-static NSInteger kCredentialTypePrefix = 2000;
 
 @implementation MSIDDefaultCredentialCacheKey
 
@@ -106,7 +105,7 @@ - (NSString *)accountIdWithHomeAccountId:(NSString *)homeAccountId
 
 - (NSNumber *)credentialTypeNumber:(MSIDCredentialType)credentialType
 {
-    return @(kCredentialTypePrefix + credentialType);
+    return [MSIDCredentialTypeHelpers credentialTypeNumber:credentialType];
 }
 
 #pragma mark - Public

IdentityCore/src/oauth2/token/MSIDCredentialType.h

@@ -32,13 +32,15 @@ typedef NS_ENUM(NSInteger, MSIDCredentialType)
     MSIDLegacySingleResourceTokenType = 4,
     MSIDPrimaryRefreshTokenType = 5,
     MSIDLegacyIDTokenType = 6,
-    MSIDAccessTokenWithAuthSchemeType = 7
+    MSIDAccessTokenWithAuthSchemeType = 7,
+    MSIDCredentialTypeLast
 };
 
 @interface MSIDCredentialTypeHelpers : NSObject
 
 + (NSString *)credentialTypeAsString:(MSIDCredentialType)type;
 + (MSIDCredentialType)credentialTypeFromString:(NSString *)type;
 + (MSIDCredentialType)credentialTypeWithRefreshToken:(NSString *)refreshToken accessToken:(NSString *)accessToken;
++ (NSNumber *)credentialTypeNumber:(MSIDCredentialType)credentialType;
 
 @end

IdentityCore/src/oauth2/token/MSIDCredentialType.m

@@ -23,6 +23,8 @@
 
 #import "MSIDCredentialType.h"
 
+static NSInteger kCredentialTypePrefix = 2000;
+
 @implementation MSIDCredentialTypeHelpers
 
 + (NSString *)credentialTypeAsString:(MSIDCredentialType)type
@@ -100,4 +102,9 @@ + (MSIDCredentialType)credentialTypeWithRefreshToken:(NSString *)refreshToken
     return MSIDCredentialTypeOther;
 }
 
++ (NSNumber *)credentialTypeNumber:(MSIDCredentialType)credentialType
+{
+    return @(kCredentialTypePrefix + credentialType);
+}
+
 @end

IdentityCore/src/telemetry/request_telemetry/MSIDCurrentRequestTelemetry.h

@@ -53,9 +53,14 @@ typedef NS_ENUM(NSInteger, TokenCacheRefreshType)
 
 @interface MSIDCurrentRequestTelemetry : NSObject <MSIDTelemetryStringSerializable>
 
+- (nullable instancetype)initWithAppId:(NSInteger)appId
+                 tokenCacheRefreshType:(TokenCacheRefreshType)tokenCacheRefreshType
+                        platformFields:(nullable NSMutableArray *)platformFields;
+
 @property (nonatomic) NSInteger schemaVersion;
 @property (nonatomic) NSInteger apiId;
 @property (nonatomic) TokenCacheRefreshType tokenCacheRefreshType;
+@property (nonatomic, nullable) NSMutableArray<NSString *> *platformFields;
 
 @end
 

IdentityCore/src/telemetry/request_telemetry/MSIDCurrentRequestTelemetry.m

@@ -25,6 +25,7 @@
 
 #import "MSIDCurrentRequestTelemetry.h"
 #import "MSIDCurrentRequestTelemetrySerializedItem.h"
+#import "MSIDRequestTelemetryConstants.h"
 
 @implementation MSIDCurrentRequestTelemetry
 
@@ -35,19 +36,36 @@ - (NSString *)telemetryString
     return [self serializeCurrentTelemetryString];
 }
 
+#pragma mark - Init
+
+- (nullable instancetype)initWithAppId:(NSInteger)appId
+                 tokenCacheRefreshType:(TokenCacheRefreshType)tokenCacheRefreshType
+                        platformFields:(nullable NSMutableArray *)platformFields
+{
+    self = [super init];
+    if (self)
+    {
+        _schemaVersion = HTTP_REQUEST_TELEMETRY_SCHEMA_VERSION;
+        _apiId = appId;
+        _tokenCacheRefreshType = tokenCacheRefreshType;
+        _platformFields = platformFields;
+    }
+    
+    return self;
+}
+
 #pragma mark - Private
 
 - (NSString *)serializeCurrentTelemetryString
 {
     MSIDCurrentRequestTelemetrySerializedItem *currentTelemetryFields = [self createSerializedItem];
-    
     return [currentTelemetryFields serialize];
 }
 
 - (MSIDCurrentRequestTelemetrySerializedItem *)createSerializedItem
 {
     NSArray *defaultFields = @[[NSNumber numberWithInteger:self.apiId], [NSNumber numberWithInteger:self.tokenCacheRefreshType]];
-    return [[MSIDCurrentRequestTelemetrySerializedItem alloc] initWithSchemaVersion:[NSNumber numberWithInteger:self.schemaVersion] defaultFields:defaultFields platformFields:nil];
+    return [[MSIDCurrentRequestTelemetrySerializedItem alloc] initWithSchemaVersion:[NSNumber numberWithInteger:self.schemaVersion] defaultFields:defaultFields platformFields:self.platformFields];
 }
 
 @end