Fixes: Login window will not dismiss in iOS13 #10

touren · Feb 7, 2020 · aa17aff · aa17aff
1 parent 492c510
commit aa17aff
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 3 deletions.
diff --git a/TwitterKit/TwitterKit.xcodeproj/project.pbxproj b/TwitterKit/TwitterKit.xcodeproj/project.pbxproj
@@ -3575,7 +3575,7 @@
 				BITCODE_GENERATION_MODE = bitcode;
 				CODE_SIGN_IDENTITY = "";
 				ENABLE_BITCODE = YES;
-				MARKETING_VERSION = 5.0.3;
+				MARKETING_VERSION = 5.1.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -3593,7 +3593,7 @@
 				BITCODE_GENERATION_MODE = bitcode;
 				CODE_SIGN_IDENTITY = "";
 				ENABLE_BITCODE = YES;
-				MARKETING_VERSION = 5.0.3;
+				MARKETING_VERSION = 5.1.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

diff --git a/TwitterKit/TwitterKit/TWTRTwitter.h b/TwitterKit/TwitterKit/TWTRTwitter.h
@@ -121,6 +121,19 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (BOOL)application:(UIApplication *)application openURL:(NSURL *)url options:(NSDictionary *)options;
 
+/**
+*  Finish the `SFSafariViewController` authentication loop. This method should
+*  be called from scene:openURLContexts inside the scene delegate.
+*
+*  This method will verify an authentication token sent by the Twitter API to
+*  finish the web-based authentication flow.
+*
+*  @param scene  The scene that UIKit asks to open the URL.
+*  @param URLContexts          One or more UIOpenURLContext objects. Each object contains one URL to open and any additional information needed to open that URL.
+*
+*/
+- (void)scene:(UIScene *)scene openURLContexts:(nonnull NSSet<UIOpenURLContext *> *)URLContexts API_AVAILABLE(ios(13.0));
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/TwitterKit/TwitterKit/TWTRTwitter.m b/TwitterKit/TwitterKit/TWTRTwitter.m
@@ -401,6 +401,29 @@ - (BOOL)application:(UIApplication *)application openURL:(NSURL *)url options:(N
     return NO;
 }
 
+- (void)scene:(UIScene *)scene openURLContexts:(nonnull NSSet<UIOpenURLContext *> *)URLContexts API_AVAILABLE(ios(13.0)) {
+    for (UIOpenURLContext *context in URLContexts) {
+        NSURL *url = context.URL;
+        NSString *sourceApplication = context.options.sourceApplication;
+        BOOL isSSOBundle = sourceApplication == nil ? [self.mobileSSO isSSOWithURL:url] : [self.mobileSSO isSSOWithSourceApplication:sourceApplication];
+        BOOL isWeb = sourceApplication == nil ? [self.mobileSSO isWebWithURL:url] : [self.mobileSSO isWebWithSourceApplication:sourceApplication];
+
+        if (isSSOBundle) {
+            [self.mobileSSO processRedirectURL:url];
+            return;
+        } else if (isWeb) {
+            BOOL isTokenValid = [self.mobileSSO verifyOauthTokenResponsefromURL:url];
+            if (isTokenValid) {
+                // If it wasn't a Mobile SSO redirect, try to handle as
+                // SFSafariViewController redirect
+                [self.webAuthenticationFlow resumeAuthenticationWithRedirectURL:url];
+                return;
+            }
+        }
+    }
+    [self.mobileSSO triggerInvalidSourceError];
+}
+
 #pragma mark - TwitterCore
 
 - (NSURL *)applicationDocumentsDirectory

diff --git a/TwitterKit5.podspec b/TwitterKit5.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = "TwitterKit5"
-  s.version = "5.0.3"
+  s.version = "5.1.0"
   s.summary = "Increase user engagement and app growth."
   s.homepage = "https://github.com/touren/twitter-kit-ios"
   s.documentation_url = "https://github.com/touren/twitter-kit-ios/wiki"

diff --git a/build.sh b/build.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 ## Build TwitterKit.framework - x86_64
 xcodebuild \
     -project TwitterKit/TwitterKit.xcodeproj \