Skip to content

Commit 2243942

Browse files
authored
Merge pull request #2599 from AzureAD/MSAL-2x-breaking-changes
[MSAL.2x]Msal 2x breaking changes merge to dev
2 parents 7ef79b5 + 1cb4242 commit 2243942

File tree

89 files changed

+1515
-2415
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+1515
-2415
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
## [TBD]
22
* Use a single family refresh token (#2550)
3+
* Removed deprecated APIs, including legacy initializers, account management methods and token acquisition methods, and the MSALTelemetry interface (#2577)
4+
* Enforced requirement for a valid ParentViewController (with a window) in interactive token requests (#2590)
5+
* Removed deprecated methods from native auth public interface (#2588)
6+
* Removed the deprecated MSALLogger interface and implementation class (#2591)
7+
* Enforced a valid broker-capable redirect URI format for AAD scenarios (#2592)
8+
* Merged the MSALAccount (MultiTenantAccount) category into the MSALAccount protocol and removed the MSALAccount+MultiTenantAccount.h (#2594)
39

410
## [1.9.0]
511
* Add feature flags provider to be controlled from broker (#2540)

MSAL/MSAL.xcodeproj/project.pbxproj

Lines changed: 8 additions & 52 deletions
Large diffs are not rendered by default.

MSAL/MSAL.xcodeproj/xcshareddata/xcschemes/MSAL Test App (Mac).xcscheme

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30-
<Testables>
31-
</Testables>
3230
<MacroExpansion>
3331
<BuildableReference
3432
BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
3836
ReferencedContainer = "container:MSAL.xcodeproj">
3937
</BuildableReference>
4038
</MacroExpansion>
41-
<AdditionalOptions>
42-
</AdditionalOptions>
39+
<Testables>
40+
</Testables>
4341
</TestAction>
4442
<LaunchAction
4543
buildConfiguration = "Debug"
@@ -62,8 +60,6 @@
6260
ReferencedContainer = "container:MSAL.xcodeproj">
6361
</BuildableReference>
6462
</BuildableProductRunnable>
65-
<AdditionalOptions>
66-
</AdditionalOptions>
6763
</LaunchAction>
6864
<ProfileAction
6965
buildConfiguration = "Release"

MSAL/src/MSALErrorConverter.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ + (void)initialize
5858
@(MSIDErrorServerNonHttpsRedirect) : @(MSALInternalErrorNonHttpsRedirect),
5959
@(MSIDErrorMismatchedAccount): @(MSALInternalErrorMismatchedUser),
6060
@(MSIDErrorRedirectSchemeNotRegistered): @(MSALInternalErrorRedirectSchemeNotRegistered),
61+
@(MSIDErrorInvalidRedirectURI): @(MSALInternalErrorInvalidRedirectURI),
6162

6263
// Cache
6364
@(MSIDErrorCacheMultipleUsers) : @(MSALInternalErrorAmbiguousAccount),

MSAL/src/MSALInteractiveTokenParameters.m

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -47,54 +47,4 @@ - (instancetype)initWithScopes:(NSArray<NSString *> *)scopes
4747
return self;
4848
}
4949

50-
- (instancetype)initWithScopes:(NSArray<NSString *> *)scopes
51-
{
52-
return [self initWithScopes:scopes
53-
webviewParameters:[MSALWebviewParameters new]];
54-
}
55-
56-
#if TARGET_OS_IPHONE
57-
58-
- (void)setParentViewController:(UIViewController *)parentViewController
59-
{
60-
self.webviewParameters.parentViewController = parentViewController;
61-
}
62-
63-
- (UIViewController *)parentViewController
64-
{
65-
return self.webviewParameters.parentViewController;
66-
}
67-
68-
- (void)setPresentationStyle:(UIModalPresentationStyle)presentationStyle
69-
{
70-
self.webviewParameters.presentationStyle = presentationStyle;
71-
}
72-
73-
- (UIModalPresentationStyle)presentationStyle
74-
{
75-
return self.webviewParameters.presentationStyle;
76-
}
77-
78-
#endif
79-
80-
- (void)setWebviewType:(MSALWebviewType)webviewType
81-
{
82-
self.webviewParameters.webviewType = webviewType;
83-
}
84-
85-
- (MSALWebviewType)webviewType
86-
{
87-
return self.webviewParameters.webviewType;
88-
}
89-
90-
- (void)setCustomWebview:(WKWebView *)customWebview
91-
{
92-
self.webviewParameters.customWebview = customWebview;
93-
}
94-
95-
- (WKWebView *)customWebview
96-
{
97-
return self.webviewParameters.customWebview;
98-
}
99-
10050
@end

MSAL/src/MSALLogger.m

Lines changed: 0 additions & 75 deletions
This file was deleted.

0 commit comments

Comments
 (0)