Added support for iOS13 changes in ASWebAuthenticationSession (#297)

* Gemfile update * Added support for ASWebAuthenticationSession changes in iOS13 * Add/Fix Xcode 11 Beta CI * Compiler checks for 5.1 * Update Telemetry
auth0 · Aug 19, 2019 · 34b9258 · 34b9258
1 parent ad494ad
commit 34b9258
Show file tree

Hide file tree

Showing 15 changed files with 132 additions and 80 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,8 +1,43 @@
 version: 2
 jobs:
+  build-iOS-Swift-5.1:
+    macos:
+      xcode: "11.0.0"
+    shell: /bin/bash --login -eo pipefail
+    environment:
+          LC_ALL: en_US.UTF-8
+          LANG: en_US.UTF-8
+          HOMEBREW_LOGS: ~/homebrew-logs
+          HOMEBREW_TEMP: ~/homebrew-temp
+          HOMEBREW_NO_AUTO_UPDATE: 1
+    steps:
+      - run:
+          name: Set Ruby Version
+          command:  echo "ruby-2.5" > ~/.ruby-version 
+      - checkout
+      - run: |
+          brew install swiftlint
+          bundle install --without=development
+          grep -lR "shouldUseLaunchSchemeArgsEnv" *.* --null | xargs -0 sed -i '' -e 's/shouldUseLaunchSchemeArgsEnv = "YES"/shouldUseLaunchSchemeArgsEnv = "YES" codeCoverageEnabled = "YES"/g'
+      - run:
+          name: Bootstrap
+          command: bundle exec fastlane ios bootstrap
+      - run:
+          name: Run test suite
+          command: bundle exec fastlane ios ci
+          environment:
+            SCHEME: Auth0.iOS
+            DEVICE: iPhone 8
+            FASTLANE_EXPLICIT_OPEN_SIMULATOR: 2
+      - save_cache:
+          key: dependency-cache
+          paths:
+            - Carthage/Build
+      - store_test_results:
+          path: fastlane/test_output
   build-iOS-Swift-5.0:
     macos:
-      xcode: "10.2.0"
+      xcode: "10.3.0"
     environment:
           LC_ALL: en_US.UTF-8
           LANG: en_US.UTF-8
@@ -35,7 +70,7 @@ jobs:
           path: fastlane/test_output
   build-iOS-Swift-4.2:
     macos:
-      xcode: "10.2.0"
+      xcode: "10.3.0"
     environment:
           LC_ALL: en_US.UTF-8
           LANG: en_US.UTF-8
@@ -59,8 +94,6 @@ jobs:
             SCHEME: Auth0.iOS
             DEVICE: iPhone 8
             FASTLANE_EXPLICIT_OPEN_SIMULATOR: 2
-      - run: |
-          bash <(curl -s https://codecov.io/bash) -J 'Auth0'
       - save_cache:
           key: dependency-cache
           paths:
@@ -69,7 +102,7 @@ jobs:
           path: fastlane/test_output
   build-iOS-Swift-4.0:
     macos:
-      xcode: "10.2.0"
+      xcode: "10.3.0"
     environment:
           LC_ALL: en_US.UTF-8
           LANG: en_US.UTF-8
@@ -99,7 +132,7 @@ jobs:
             - Carthage/Build
   build-macOS-Swift-5.0:
     macos:
-      xcode: "10.2.0"
+      xcode: "10.3.0"
     environment:
           LC_ALL: en_US.UTF-8
           LANG: en_US.UTF-8
@@ -131,7 +164,7 @@ jobs:
             - Carthage/Build
   build-macOS-Swift-4.2:
     macos:
-      xcode: "10.2.0"
+      xcode: "10.3.0"
     environment:
           LC_ALL: en_US.UTF-8
           LANG: en_US.UTF-8
@@ -164,7 +197,7 @@ jobs:
             - Carthage/Build
   build-tvOS-Swift-5.0:
     macos:
-      xcode: "10.2.0"
+      xcode: "10.3.0"
     environment:
           LC_ALL: en_US.UTF-8
           LANG: en_US.UTF-8
@@ -189,7 +222,7 @@ jobs:
             - Carthage/Build
   build-tvOS-Swift-4.2:
     macos:
-      xcode: "10.2.0"
+      xcode: "10.3.0"
     environment:
           LC_ALL: en_US.UTF-8
           LANG: en_US.UTF-8
@@ -218,6 +251,7 @@ workflows:
   version: 2
   build:
     jobs:
+      -  build-iOS-Swift-5.1
       -  build-iOS-Swift-5.0
       -  build-iOS-Swift-4.2
       -  build-iOS-Swift-4.0

diff --git a/App/ViewController.swift b/App/ViewController.swift
@@ -8,16 +8,19 @@
 
 import UIKit
 import Auth0
+#if canImport(AuthenticationServices)
+import AuthenticationServices
+#endif
 
 class ViewController: UIViewController {
-
+    
     var onAuth: ((Result<Credentials>) -> ())!
-
+    
     @IBOutlet weak var oauth2: UIButton!
 
     override func viewDidLoad() {
         super.viewDidLoad()
-
+        
         self.onAuth = { [weak self] in
             switch $0 {
             case .failure(let cause):
@@ -37,28 +40,28 @@ class ViewController: UIViewController {
             print($0)
         }
     }
-
+    
     @IBAction func startOAuth2(_ sender: Any) {
-        Auth0.webAuth()
+            Auth0.webAuth()
             .logging(enabled: true)
             .start(onAuth)
     }
-
+    
     @IBAction func startGoogleOAuth2(_ sender: Any) {
         Auth0.webAuth()
             .logging(enabled: true)
             .connection("google-oauth2")
             .start(onAuth)
     }
-
+    
     @IBAction func startTokenGoogleOAuth2(_ sender: Any) {
         Auth0.webAuth()
             .logging(enabled: true)
             .connection("google-oauth2")
             .responseType([.token])
             .start(onAuth)
     }
-
+    
     @IBAction func startIDTokenGoogleOAuth2(_ sender: Any) {
         Auth0.webAuth()
             .logging(enabled: true)
@@ -67,7 +70,7 @@ class ViewController: UIViewController {
             .nonce("abc1234")
             .start(onAuth)
     }
-
+    
     @IBAction func startTokenIDTokenGoogleOAuth2(_ sender: Any) {
         Auth0.webAuth()
             .logging(enabled: true)
@@ -76,7 +79,7 @@ class ViewController: UIViewController {
             .nonce("abc1234")
             .start(onAuth)
     }
-
+    
     @IBAction func startCodeIDTokenGoogleOAuth2(_ sender: Any) {
         Auth0.webAuth()
             .logging(enabled: true)

diff --git a/Auth0.xcodeproj/project.pbxproj b/Auth0.xcodeproj/project.pbxproj
@@ -1276,7 +1276,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0940;
-				LastUpgradeCheck = 0940;
+				LastUpgradeCheck = 1100;
 				ORGANIZATIONNAME = Auth0;
 				TargetAttributes = {
 					5B7EE45720FC9F3200367724 = {
@@ -2032,7 +2032,7 @@
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_ENTITLEMENTS = OAuth2Mac/OAuth2Mac.entitlements;
-				CODE_SIGN_IDENTITY = "";
+				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = "";
@@ -2066,7 +2066,7 @@
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_ENTITLEMENTS = OAuth2Mac/OAuth2Mac.entitlements;
-				CODE_SIGN_IDENTITY = "";
+				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = "";
@@ -2593,6 +2593,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
+				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = 1;
@@ -2617,6 +2618,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
+				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = 1;

diff --git a/Auth0.xcodeproj/xcshareddata/xcschemes/Auth0.iOS.xcscheme b/Auth0.xcodeproj/xcshareddata/xcschemes/Auth0.iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0940"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "5F06DD771CC448B10011842B"
+            BuildableName = "Auth0.framework"
+            BlueprintName = "Auth0.iOS"
+            ReferencedContainer = "container:Auth0.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -39,17 +48,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "5F06DD771CC448B10011842B"
-            BuildableName = "Auth0.framework"
-            BlueprintName = "Auth0.iOS"
-            ReferencedContainer = "container:Auth0.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -70,8 +68,6 @@
             ReferencedContainer = "container:Auth0.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/Auth0.xcodeproj/xcshareddata/xcschemes/Auth0.macOS.xcscheme b/Auth0.xcodeproj/xcshareddata/xcschemes/Auth0.macOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0940"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "5F06DD841CC448C90011842B"
+            BuildableName = "Auth0.framework"
+            BlueprintName = "Auth0.macOS"
+            ReferencedContainer = "container:Auth0.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -39,17 +48,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "5F06DD841CC448C90011842B"
-            BuildableName = "Auth0.framework"
-            BlueprintName = "Auth0.macOS"
-            ReferencedContainer = "container:Auth0.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -70,8 +68,6 @@
             ReferencedContainer = "container:Auth0.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/Auth0.xcodeproj/xcshareddata/xcschemes/Auth0.tvOS.xcscheme b/Auth0.xcodeproj/xcshareddata/xcschemes/Auth0.tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0940"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "5F23E6F51D4B87F000C3F2D9"
+            BuildableName = "Auth0.framework"
+            BlueprintName = "Auth0.tvOS"
+            ReferencedContainer = "container:Auth0.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -39,17 +48,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "5F23E6F51D4B87F000C3F2D9"
-            BuildableName = "Auth0.framework"
-            BlueprintName = "Auth0.tvOS"
-            ReferencedContainer = "container:Auth0.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -70,8 +68,6 @@
             ReferencedContainer = "container:Auth0.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/Auth0/AuthSession.swift b/Auth0/AuthSession.swift
@@ -59,7 +59,7 @@ class AuthSession: NSObject, AuthTransaction {
                 self.finish(.failure(error: AuthenticationError(string: url.absoluteString, statusCode: 200)))
                 return false
             }
-        var items = self.handler.values(fromComponents: components)
+        let items = self.handler.values(fromComponents: components)
         guard has(state: self.state, inItems: items) else { return false }
         if items["error"] != nil {
             self.finish(.failure(error: AuthenticationError(info: items, statusCode: 0)))