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

feat: Upgrade iOS deployment target to iOS 12 #5223

Merged
merged 6 commits into from
Apr 18, 2024
+4,154 −2,850
Merged

feat: Upgrade iOS deployment target to iOS 12 #5223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5b917a4
feat: Updating iOS deployment target to 12.0
sebaland Feb 23, 2024
d480b42
chore: Fixing simple deprecation warnings
sebaland Feb 23, 2024
c6f1c88
chore: Fixing additional deprecation warnings and updating README
sebaland Feb 27, 2024
eb9470a
fix: Addressing random crash in Pinpoint Integration Tests
sebaland Feb 28, 2024
4a13483
chore: Adding comments to deprecation supressions
sebaland Apr 18, 2024
fd933ff
feat(AWSCore): Upgrading CocoaLumberjack to version 3.8.4 (#5222)
sebaland Apr 18, 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
2 changes: 1 addition & 1 deletion AWSAPIGateway.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Pod::Spec.new do |s|
s.homepage = 'http://aws.amazon.com/mobile/sdk'
s.license = 'Apache License, Version 2.0'
s.author = { 'Amazon Web Services' => 'amazonwebservices' }
s.platform = :ios, '9.0'
s.platform = :ios, '12.0'
s.source = { :git => 'https://github.com/aws-amplify/aws-sdk-ios.git',
:tag => s.version}
s.requires_arc = true
Expand Down
2 changes: 1 addition & 1 deletion AWSAuth.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Pod::Spec.new do |s|
s.homepage = 'http://aws.amazon.com/mobile/sdk'
s.license = 'Apache License, Version 2.0'
s.author = { 'Amazon Web Services' => 'amazonwebservices' }
s.platform = :ios, '9.0'
s.platform = :ios, '12.0'
s.source = { :git => 'https://github.com/aws-amplify/aws-sdk-ios.git',
:tag => s.version}
s.requires_arc = true
Expand Down
2 changes: 1 addition & 1 deletion AWSAuthCore.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Pod::Spec.new do |s|
s.homepage = 'http://aws.amazon.com/mobile/sdk'
s.license = 'Apache License, Version 2.0'
s.author = { 'Amazon Web Services' => 'amazonwebservices' }
s.platform = :ios, '9.0'
s.platform = :ios, '12.0'
s.source = { :git => 'https://github.com/aws-amplify/aws-sdk-ios.git',
:tag => s.version}
s.requires_arc = true
Expand Down
40 changes: 20 additions & 20 deletions AWSAuthSDK/AWSAuthSDK.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4629,7 +4629,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Sources/AWSUserPoolsSignIn/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.amazonaws.AWSUserPoolsSignIn;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -4646,7 +4646,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Sources/AWSUserPoolsSignIn/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.amazonaws.AWSUserPoolsSignIn;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -4704,7 +4704,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -4758,7 +4758,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_COMPILATION_MODE = wholemodule;
Expand All @@ -4779,7 +4779,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Sources/AWSFacebookSignIn/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.amazonaws.AWSFacebookSignIn;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -4797,7 +4797,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Sources/AWSFacebookSignIn/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.amazonaws.AWSFacebookSignIn;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -4816,7 +4816,7 @@
CODE_SIGN_STYLE = Automatic;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = AWSAuthSDKTestAppUITests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
Expand All @@ -4842,7 +4842,7 @@
CODE_SIGN_STYLE = Automatic;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = AWSAuthSDKTestAppUITests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
Expand Down Expand Up @@ -4870,7 +4870,7 @@
);
INFOPLIST_FILE = Sources/AWSGoogleSignIn/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -4898,7 +4898,7 @@
);
INFOPLIST_FILE = Sources/AWSGoogleSignIn/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -4999,7 +4999,7 @@
CODE_SIGN_STYLE = Automatic;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = AWSAuthSDKTestApp/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MACH_O_TYPE = mh_execute;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
Expand Down Expand Up @@ -5034,7 +5034,7 @@
CODE_SIGN_STYLE = Automatic;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = AWSAuthSDKTestApp/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MACH_O_TYPE = mh_execute;
MTL_FAST_MATH = YES;
Expand Down Expand Up @@ -5091,7 +5091,7 @@
);
INFOPLIST_FILE = Sources/AWSMobileClientXCF/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
OTHER_SWIFT_FLAGS = "-Xfrontend -module-interface-preserve-types-as-written";
PRODUCT_BUNDLE_IDENTIFIER = com.amazonaws.AWSMobileClient;
Expand Down Expand Up @@ -5131,7 +5131,7 @@
GCC_PREPROCESSOR_DEFINITIONS = "USE_XCF=1";
INFOPLIST_FILE = Sources/AWSMobileClientXCF/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
OTHER_SWIFT_FLAGS = "-Xfrontend -module-interface-preserve-types-as-written";
PRODUCT_BUNDLE_IDENTIFIER = com.amazonaws.AWSMobileClient;
Expand Down Expand Up @@ -5411,7 +5411,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Sources/AWSAuthCore/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.amazonaws.AWSAuthCore;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -5430,7 +5430,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Sources/AWSAuthCore/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.amazonaws.AWSAuthCore;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -5448,7 +5448,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Sources/AWSAuthUI/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.amazonaws.AWSAuthUI;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -5466,7 +5466,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Sources/AWSAuthUI/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.amazonaws.AWSAuthUI;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -5497,7 +5497,7 @@
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = Sources/AWSMobileClient/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.amazonaws.AWSMobileClient;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
Expand Down Expand Up @@ -5531,7 +5531,7 @@
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = Sources/AWSMobileClient/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.amazonaws.AWSMobileClient;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
Expand Down
2 changes: 1 addition & 1 deletion AWSAuthUI.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Pod::Spec.new do |s|
s.homepage = 'http://aws.amazon.com/mobile/sdk'
s.license = 'Apache License, Version 2.0'
s.author = { 'Amazon Web Services' => 'amazonwebservices' }
s.platform = :ios, '9.0'
s.platform = :ios, '12.0'
s.source = { :git => 'https://github.com/aws-amplify/aws-sdk-ios.git',
:tag => s.version}
s.requires_arc = true
Expand Down
2 changes: 1 addition & 1 deletion AWSAutoScaling.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Pod::Spec.new do |s|
s.homepage = 'http://aws.amazon.com/mobile/sdk'
s.license = 'Apache License, Version 2.0'
s.author = { 'Amazon Web Services' => 'amazonwebservices' }
s.platform = :ios, '9.0'
s.platform = :ios, '12.0'
s.source = { :git => 'https://github.com/aws-amplify/aws-sdk-ios.git',
:tag => s.version}
s.requires_arc = true
Expand Down
2 changes: 1 addition & 1 deletion AWSChimeSDKIdentity.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Pod::Spec.new do |s|
s.homepage = 'http://aws.amazon.com/mobile/sdk'
s.license = 'Apache License, Version 2.0'
s.author = { 'Amazon Web Services' => 'amazonwebservices' }
s.platform = :ios, '9.0'
s.platform = :ios, '12.0'
s.source = { :git => 'https://github.com/aws-amplify/aws-sdk-ios.git',
:tag => s.version}
s.requires_arc = true
Expand Down
2 changes: 1 addition & 1 deletion AWSChimeSDKMessaging.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Pod::Spec.new do |s|
s.homepage = 'http://aws.amazon.com/mobile/sdk'
s.license = 'Apache License, Version 2.0'
s.author = { 'Amazon Web Services' => 'amazonwebservices' }
s.platform = :ios, '9.0'
s.platform = :ios, '12.0'
s.source = { :git => 'https://github.com/aws-amplify/aws-sdk-ios.git',
:tag => s.version}
s.requires_arc = true
Expand Down
2 changes: 1 addition & 1 deletion AWSCloudWatch.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Pod::Spec.new do |s|
s.homepage = 'http://aws.amazon.com/mobile/sdk'
s.license = 'Apache License, Version 2.0'
s.author = { 'Amazon Web Services' => 'amazonwebservices' }
s.platform = :ios, '9.0'
s.platform = :ios, '12.0'
s.source = { :git => 'https://github.com/aws-amplify/aws-sdk-ios.git',
:tag => s.version}
s.requires_arc = true
Expand Down
1 change: 0 additions & 1 deletion AWSCloudWatch/AWSCloudWatchService.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ @implementation AWSCloudWatchResponseSerializer
+ (void)initialize {
errorCodeDictionary = @{
@"InvalidParameterInput" : @(AWSCloudWatchErrorDashboardInvalidInput),
@"ResourceNotFound" : @(AWSCloudWatchErrorDashboardNotFound),
@"InternalServiceError" : @(AWSCloudWatchErrorInternalService),
@"InvalidFormat" : @(AWSCloudWatchErrorInvalidFormat),
@"InvalidNextToken" : @(AWSCloudWatchErrorInvalidNextToken),
Expand Down
2 changes: 1 addition & 1 deletion AWSCognitoAuth.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Pod::Spec.new do |s|
s.homepage = 'http://aws.amazon.com/mobile/sdk'
s.license = 'Apache License, Version 2.0'
s.author = { 'Amazon Web Services' => 'amazonwebservices' }
s.platform = :ios, '9.0'
s.platform = :ios, '12.0'
s.source = { :git => 'https://github.com/aws-amplify/aws-sdk-ios.git',
:tag => s.version}
s.requires_arc = true
Expand Down
28 changes: 16 additions & 12 deletions AWSCognitoAuth/AWSCognitoAuth.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ @interface AWSCognitoAuth()<SFSafariViewControllerDelegate, NSURLConnectionDeleg
API_AVAILABLE(ios(11.0))
@interface AWSCognitoAuth()

@property (nonatomic, strong) SFAuthenticationSession *sfAuthSession;
@property (nonatomic, strong) ASWebAuthenticationSession *sfAuthSession;

@end

Expand Down Expand Up @@ -358,10 +358,10 @@ - (void)launchSFWebAuthenticationSession:(NSURL *)hostedUIURL API_AVAILABLE(ios(
self.sfAuthenticationSessionAvailable = YES;
NSString *callbackURLScheme = [[self urlEncode:self.authConfiguration.signInRedirectUri] copy];
__weak AWSCognitoAuth *weakSelf = self;
self.sfAuthSession = [[SFAuthenticationSession alloc] initWithURL:hostedUIURL
callbackURLScheme:callbackURLScheme
completionHandler:^(NSURL * _Nullable url,
NSError * _Nullable error) {
self.sfAuthSession = [[ASWebAuthenticationSession alloc] initWithURL:hostedUIURL
callbackURLScheme:callbackURLScheme
completionHandler:^(NSURL * _Nullable url,
NSError * _Nullable error) {
__strong AWSCognitoAuth *strongSelf = weakSelf;
[strongSelf handleSignInCallbackWithURL:url error:error];
}];
Expand Down Expand Up @@ -403,7 +403,9 @@ - (void)handleSignInCallbackWithURL:(NSURL * _Nullable) url

-(void)showSFSafariViewControllerForURL:(NSURL *)url
withPresentingViewController:(UIViewController *)presentingViewController{
self.svc = [[SFSafariViewController alloc] initWithURL:url entersReaderIfAvailable:NO];
SFSafariViewControllerConfiguration *configuration = [[SFSafariViewControllerConfiguration alloc] init];
configuration.entersReaderIfAvailable = NO;
self.svc = [[SFSafariViewController alloc] initWithURL:url configuration:configuration];
self.svc.delegate = self;
self.svc.modalPresentationStyle = UIModalPresentationPopover;
self.isProcessingSignIn = YES;
Expand Down Expand Up @@ -655,15 +657,15 @@ - (void)launchSFAuthenticationSessionForSignOut:(NSURL *) url API_AVAILABLE(ios(
self.sfAuthenticationSessionAvailable = YES;
NSString *callbackURLScheme = [[self urlEncode:self.authConfiguration.signOutRedirectUri] copy];
__weak AWSCognitoAuth *weakSelf = self;
self.sfAuthSession = [[SFAuthenticationSession alloc] initWithURL:url
callbackURLScheme:callbackURLScheme
completionHandler:^(NSURL * _Nullable url,
NSError * _Nullable error) {
self.sfAuthSession = [[ASWebAuthenticationSession alloc] initWithURL:url
callbackURLScheme:callbackURLScheme
completionHandler:^(NSURL * _Nullable url,
NSError * _Nullable error) {
__strong AWSCognitoAuth *strongSelf = weakSelf;
if (url) {
[strongSelf processURL:url forRedirection:NO];
} else {
if (error.code != SFAuthenticationErrorCanceledLogin) {
if (error.code != ASWebAuthenticationSessionErrorCodeCanceledLogin) {
[strongSelf signOutLocallyAndClearLastKnownUser];
}
[strongSelf dismissSafariViewControllerAndCompleteSignOut:error];
Expand All @@ -674,7 +676,9 @@ - (void)launchSFAuthenticationSessionForSignOut:(NSURL *) url API_AVAILABLE(ios(

- (void)signOutSFSafariVC: (UIViewController *) vc
url:(NSURL *)url {
self.svc = [[SFSafariViewController alloc] initWithURL:url entersReaderIfAvailable:NO];
SFSafariViewControllerConfiguration *configuration = [[SFSafariViewControllerConfiguration alloc] init];
configuration.entersReaderIfAvailable = NO;
self.svc = [[SFSafariViewController alloc] initWithURL:url configuration:configuration];
self.svc.delegate = self;
self.svc.modalPresentationStyle = UIModalPresentationPopover;
self.isProcessingSignOut = YES;
Expand Down
4 changes: 2 additions & 2 deletions AWSCognitoAuth/Internal/UICKeyChainStore/AWSCognitoAuthUICKeyChainStore.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,12 @@ typedef NS_ENUM(NSInteger, AWSCognitoAuthUICKeyChainStoreAuthenticationType) {
typedef NS_ENUM(NSInteger, AWSCognitoAuthUICKeyChainStoreAccessibility) {
AWSCognitoAuthUICKeyChainStoreAccessibilityWhenUnlocked = 1,
AWSCognitoAuthUICKeyChainStoreAccessibilityAfterFirstUnlock,
AWSCognitoAuthUICKeyChainStoreAccessibilityAlways,
AWSCognitoAuthUICKeyChainStoreAccessibilityAlways __deprecated_enum_msg("Use an accessibility level that provides some user protection, such as AWSCognitoAuthUICKeyChainStoreAccessibilityAfterFirstUnlock"),
AWSCognitoAuthUICKeyChainStoreAccessibilityWhenPasscodeSetThisDeviceOnly
__OSX_AVAILABLE_STARTING(__MAC_10_10, __IPHONE_8_0),
AWSCognitoAuthUICKeyChainStoreAccessibilityWhenUnlockedThisDeviceOnly,
AWSCognitoAuthUICKeyChainStoreAccessibilityAfterFirstUnlockThisDeviceOnly,
AWSCognitoAuthUICKeyChainStoreAccessibilityAlwaysThisDeviceOnly,
AWSCognitoAuthUICKeyChainStoreAccessibilityAlwaysThisDeviceOnly __deprecated_enum_msg("Use an accessibility level that provides some user protection, such as AWSCognitoAuthUICKeyChainStoreAccessibilityAfterFirstUnlockThisDeviceOnly"),
}
__OSX_AVAILABLE_STARTING(__MAC_10_9, __IPHONE_4_0);

Expand Down
Loading
Loading