Skip to content

Commit

Permalink
Merge pull request #1399 from AzureAD/hotfix/1.7.37
Browse files Browse the repository at this point in the history
Hotfix/1.7.37
  • Loading branch information
ameyapat authored Jul 17, 2024
2 parents 8231b7c + 8eac722 commit 9ef90be
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
3 changes: 2 additions & 1 deletion IdentityCore/src/oauth2/account/MSIDAccountType.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ typedef NS_ENUM(NSInteger, MSIDAccountType)
MSIDAccountTypeOther,
MSIDAccountTypeAADV1,
MSIDAccountTypeMSA,
MSIDAccountTypeMSSTS
MSIDAccountTypeMSSTS,
MSIDAccountTypeADFS
};

@interface MSIDAccountTypeHelpers : NSObject
Expand Down
6 changes: 5 additions & 1 deletion IdentityCore/src/oauth2/account/MSIDAccountType.m
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ + (NSString *)accountTypeAsString:(MSIDAccountType)accountType

case MSIDAccountTypeMSSTS:
return @"MSSTS";

case MSIDAccountTypeADFS:
return @"ADFS";

default:
return @"Other";
Expand All @@ -53,7 +56,8 @@ + (MSIDAccountType)accountTypeFromString:(NSString *)type

sAccountTypes = @{@"aad": @(MSIDAccountTypeAADV1),
@"msa": @(MSIDAccountTypeMSA),
@"mssts": @(MSIDAccountTypeMSSTS)};
@"mssts": @(MSIDAccountTypeMSSTS),
@"adfs": @(MSIDAccountTypeADFS)};
});

NSNumber *accountType = sAccountTypes[type.lowercaseString];
Expand Down
3 changes: 3 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down

0 comments on commit 9ef90be

Please sign in to comment.