From a1d489da86ffef2c1dbc08bc83cdc88cdbd84fa4 Mon Sep 17 00:00:00 2001 From: Ameya Patil Date: Wed, 17 Jul 2024 13:28:47 -0700 Subject: [PATCH 1/2] Updating changelog --- changelog.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changelog.txt b/changelog.txt index 19e481218..487751ba5 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,6 @@ +Version 1.7.37 +* Added new account type to handle On-prem ADFS scenarios. (#1397) + Version 1.7.36 * Add platform sequence telemetry param. (#1378) * Update broker automations lab API. (#1377) From b3db7f270eb1cd07b01c0b5e1c8dcaa71411f7a4 Mon Sep 17 00:00:00 2001 From: Sunanda Chowdhary Date: Wed, 17 Jul 2024 13:54:16 -0700 Subject: [PATCH 2/2] add new account type --- IdentityCore/src/oauth2/account/MSIDAccountType.h | 3 ++- IdentityCore/src/oauth2/account/MSIDAccountType.m | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/IdentityCore/src/oauth2/account/MSIDAccountType.h b/IdentityCore/src/oauth2/account/MSIDAccountType.h index 031124cef..7780b3f05 100644 --- a/IdentityCore/src/oauth2/account/MSIDAccountType.h +++ b/IdentityCore/src/oauth2/account/MSIDAccountType.h @@ -28,7 +28,8 @@ typedef NS_ENUM(NSInteger, MSIDAccountType) MSIDAccountTypeOther, MSIDAccountTypeAADV1, MSIDAccountTypeMSA, - MSIDAccountTypeMSSTS + MSIDAccountTypeMSSTS, + MSIDAccountTypeADFS }; @interface MSIDAccountTypeHelpers : NSObject diff --git a/IdentityCore/src/oauth2/account/MSIDAccountType.m b/IdentityCore/src/oauth2/account/MSIDAccountType.m index cd0d0c6af..ebdee6222 100644 --- a/IdentityCore/src/oauth2/account/MSIDAccountType.m +++ b/IdentityCore/src/oauth2/account/MSIDAccountType.m @@ -37,6 +37,9 @@ + (NSString *)accountTypeAsString:(MSIDAccountType)accountType case MSIDAccountTypeMSSTS: return @"MSSTS"; + + case MSIDAccountTypeADFS: + return @"ADFS"; default: return @"Other"; @@ -53,7 +56,8 @@ + (MSIDAccountType)accountTypeFromString:(NSString *)type sAccountTypes = @{@"aad": @(MSIDAccountTypeAADV1), @"msa": @(MSIDAccountTypeMSA), - @"mssts": @(MSIDAccountTypeMSSTS)}; + @"mssts": @(MSIDAccountTypeMSSTS), + @"adfs": @(MSIDAccountTypeADFS)}; }); NSNumber *accountType = sAccountTypes[type.lowercaseString];