Skip to content

Commit a8942df

Browse files
authored
Merge pull request #664 from AzureAD/release/1.3.11
[Blocked for release freeze] Release common core 1.3.1 (MSAL 1.0.6 common core)
2 parents 5f58069 + 735e540 commit a8942df

File tree

4 files changed

+16
-5
lines changed

4 files changed

+16
-5
lines changed

IdentityCore/src/controllers/ios/MSIDBrokerInteractiveController.m

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -312,11 +312,8 @@ + (BOOL)isResponseFromBroker:(NSString *)sourceApplication
312312
#if AD_BROKER
313313
return YES;
314314
#else
315-
BOOL isBrokerResponse = [MSID_BROKER_APP_BUNDLE_ID isEqualToString:sourceApplication];
316-
317-
#ifdef DOGFOOD_BROKER
318-
isBrokerResponse = isBrokerResponse || [MSID_BROKER_APP_BUNDLE_ID_DF isEqualToString:sourceApplication];
319-
#endif
315+
BOOL isBrokerResponse = [MSID_BROKER_APP_BUNDLE_ID isEqualToString:sourceApplication]
316+
|| [MSID_BROKER_APP_BUNDLE_ID_DF isEqualToString:sourceApplication];
320317

321318
return isBrokerResponse;
322319
#endif

IdentityCore/src/webview/embeddedWebview/ui/ios/MSIDWebviewUIController.m

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ + (void)initialize
4747
static dispatch_once_t onceToken;
4848
dispatch_once(&onceToken, ^{
4949
s_webConfig = [WKWebViewConfiguration new];
50+
if (@available(iOS 13.0, *))
51+
{
52+
s_webConfig.defaultWebpagePreferences.preferredContentMode = WKContentModeMobile;
53+
}
5054
});
5155
}
5256

IdentityCore/src/webview/embeddedWebview/ui/mac/MSIDWebviewUIController.m

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,11 @@ + (void)initialize
4444
static dispatch_once_t onceToken;
4545
dispatch_once(&onceToken, ^{
4646
s_webConfig = [WKWebViewConfiguration new];
47+
48+
if (@available(macOS 10.15, *))
49+
{
50+
s_webConfig.defaultWebpagePreferences.preferredContentMode = WKContentModeDesktop;
51+
}
4752
});
4853
}
4954

changelog.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
Version 1.3.11
2+
-------
3+
* Set web config content mode to mobile on iPad
4+
* Enable dogfood authenticator support by default
5+
16
Version 1.3.10
27
--------
38
* Account lookup fix when no refresh tokens present

0 commit comments

Comments
 (0)