Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hotfix/1.7.37 #1399

Merged
merged 3 commits into from
Jul 17, 2024
Merged

Hotfix/1.7.37 #1399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a1d489d
Updating changelog
ameyapat Jul 17, 2024
b3db7f2
add new account type
SunandaChowdhary Jul 17, 2024
8eac722
Merge pull request #1398 from AzureAD/suchowd/adfs-account-type
ameyapat Jul 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion IdentityCore/src/oauth2/account/MSIDAccountType.h
View file
Open in desktop
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
View file
Open in desktop
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)};
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: fix the identation

Suggested change
@"adfs": @(MSIDAccountTypeADFS)};
@"adfs": @(MSIDAccountTypeADFS)};

});

NSNumber *accountType = sAccountTypes[type.lowercaseString];
Expand Down
3 changes: 3 additions & 0 deletions changelog.txt
View file
Open in desktop
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
Loading