Merge pull request #52 from passageidentity/PSG-4176

SinaSeylani · web-flow · commit a035d10a36ce · 2024-07-22T23:16:31.000-06:00
PSG-4176
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -116,6 +116,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Set up Xcode 15.4
+        uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: '15.4'
+
       - name: Set up Flutter
         uses: subosito/flutter-action@v2
         with:
@@ -135,7 +140,7 @@ jobs:
           model: 'iPhone 14'
 
       - name: Run iOS tests
-        run: flutter test integration_test/*.dart -d D9B9FD9F-A0A3-422F-8D9B-35F8CC886FF3 --dart-define=MAILOSAUR_API_KEY=${{ secrets.MAILOSAUR_API_KEY }}
+        run: flutter test integration_test/*.dart -d F36E59FA-5F31-4EEA-A81A-514EA3F505B4 --dart-define=MAILOSAUR_API_KEY=${{ secrets.MAILOSAUR_API_KEY }}
         working-directory: ./integrationtestapp
         env:
           MAILOSAUR_API_KEY: ${{ secrets.MAILOSAUR_API_KEY }}
diff --git a/android/build.gradle b/android/build.gradle
@@ -2,14 +2,14 @@ group 'id.passage.passage_flutter'
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '1.8.10'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
+        classpath 'com.android.tools.build:gradle:7.3.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -25,7 +25,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 34
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -48,7 +48,7 @@ android {
     dependencies {
         testImplementation 'org.jetbrains.kotlin:kotlin-test'
         testImplementation 'org.mockito:mockito-core:5.0.0'
-        implementation 'id.passage.android:passage:1.7.3'
+        implementation 'id.passage.android:passage:1.8.2'
         implementation 'com.google.code.gson:gson:2.9.0'
     }
 
diff --git a/android/src/main/kotlin/id/passage/passage_flutter/PassageFlutter.kt b/android/src/main/kotlin/id/passage/passage_flutter/PassageFlutter.kt
@@ -431,4 +431,55 @@ internal class PassageFlutter(private val activity: Activity, appId: String? = n
 
     // endregion
 
+    // region Hosted Auth 
+
+
+    fun hostedAuthStart(result: MethodChannel.Result) {
+        CoroutineScope(Dispatchers.IO).launch {
+            try {
+                passage.hostedAuthStart()
+                result.success(null)
+            } catch (e: Exception) {
+                val error = PassageFlutterError.START_HOSTED_AUTH_ERROR
+                result.error(error.name, e.message, e.toString())
+            }
+        }
+    }
+
+
+    fun hostedAuthFinish(call: MethodCall, result: MethodChannel.Result) {
+        val code = call.argument<String>("code")
+            ?: return invalidArgumentError(result)
+        val state = call.argument<String>("state")
+            ?: return invalidArgumentError(result)
+        CoroutineScope(Dispatchers.IO).launch {
+            try {
+                val authResultWithIdToken = passage.hostedAuthFinish(code, state) 
+                val jsonString = Gson().toJson(authResultWithIdToken.first)
+                val map = mapOf(
+                    "authResult" to jsonString,
+                    "idToken" to authResultWithIdToken.second
+                )
+                result.success(map)
+            } catch (e: Exception) {
+                val error = PassageFlutterError.FINISH_HOSTED_AUTH_ERROR
+                result.error(error.name, e.message, e.toString())
+            }
+        }
+    }
+
+    fun hostedLogout(result: MethodChannel.Result) {
+        CoroutineScope(Dispatchers.IO).launch {
+            try {
+                passage.hostedLogout()
+                result.success(null)
+            } catch (e: Exception) {
+                val error = PassageFlutterError.LOGOUT_HOSTED_AUTH_ERROR
+                result.error(error.name, e.message, e.toString())
+            }
+        }
+    }
+
+    // endregion
+
 }
diff --git a/android/src/main/kotlin/id/passage/passage_flutter/PassageFlutterError.kt b/android/src/main/kotlin/id/passage/passage_flutter/PassageFlutterError.kt
@@ -14,4 +14,7 @@ internal enum class PassageFlutterError {
     IDENTIFIER_EXISTS_ERROR,
     OTP_ACTIVATION_EXCEEDED_ATTEMPTS,
     SOCIAL_AUTH_ERROR,
+    START_HOSTED_AUTH_ERROR,
+    LOGOUT_HOSTED_AUTH_ERROR,
+    FINISH_HOSTED_AUTH_ERROR
 }
diff --git a/android/src/main/kotlin/id/passage/passage_flutter/PassageFlutterPlugin.kt b/android/src/main/kotlin/id/passage/passage_flutter/PassageFlutterPlugin.kt
@@ -71,6 +71,9 @@ class PassageFlutterPlugin: FlutterPlugin, MethodCallHandler, ActivityAware {
           "editPasskeyName" -> passageFlutter?.editPasskeyName(call, result)
           "changeEmail" -> passageFlutter?.changeEmail(call, result)
           "changePhone" -> passageFlutter?.changePhone(call, result)
+          "hostedAuthStart" -> passageFlutter?.hostedAuthStart(result)
+          "hostedAuthFinish" -> passageFlutter?.hostedAuthFinish(call, result)
+          "hostedLogout" -> passageFlutter?.hostedLogout(result)
           else -> {
               result.notImplemented()
           }
diff --git a/integrationtestapp/android/build.gradle b/integrationtestapp/android/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '1.8.10'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
+        classpath 'com.android.tools.build:gradle:7.3.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/integrationtestapp/android/settings.gradle b/integrationtestapp/android/settings.gradle
@@ -18,8 +18,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.3.0" apply false
-    id "org.jetbrains.kotlin.android" version "1.7.10" apply false
+    id "com.android.application" version "7.3.1" apply false
+    id "org.jetbrains.kotlin.android" version "1.8.10" apply false
 }
 
 include ":app"
diff --git a/integrationtestapp/integration_test/change_user_info_test.dart b/integrationtestapp/integration_test/change_user_info_test.dart
@@ -14,9 +14,6 @@ void main() {
   setUp(() async {
     if (!kIsWeb) {
       String basePath = IntegrationTestConfig.apiBaseUrl;
-      if (PlatformHelper.isAndroid) {
-        basePath += '/v1';
-      }
       await passage.overrideBasePath(basePath);
     }
   });
diff --git a/integrationtestapp/integration_test/current_user_test.dart b/integrationtestapp/integration_test/current_user_test.dart
@@ -13,9 +13,6 @@ void main() {
   setUp(() async {
     if (!kIsWeb) {
       String basePath = IntegrationTestConfig.apiBaseUrl;
-      if (PlatformHelper.isAndroid) {
-        basePath += '/v1';
-      }
       await passage.overrideBasePath(basePath);
     }
   });
diff --git a/integrationtestapp/integration_test/helper/integration_test_config.dart b/integrationtestapp/integration_test/helper/integration_test_config.dart
@@ -1,7 +1,7 @@
 import 'package:passage_flutter/passage_flutter_models/passage_user.dart';
 
 class IntegrationTestConfig {
-  static const String apiBaseUrl = "https://auth-uat.passage.dev";
+  static const String apiBaseUrl = "https://auth-uat.passage.dev/v1";
   static const String appIdOtp = "Ezbk6fSdx9pNQ7v7UbVEnzeC";
   static const String appIdMagicLink = "Pea2GdtBHN3esylK4ZRlF19U";
   static const int waitTimeMilliseconds = 8000;
diff --git a/integrationtestapp/integration_test/magic_link_test.dart b/integrationtestapp/integration_test/magic_link_test.dart
@@ -14,9 +14,6 @@ void main() {
   setUpAll(() async {
     if (!kIsWeb) {
       String basePath = IntegrationTestConfig.apiBaseUrl;
-      if (PlatformHelper.isAndroid) {
-        basePath += '/v1';
-      }
       await passage.overrideBasePath(basePath);
     }
   });
diff --git a/integrationtestapp/integration_test/otp_test.dart b/integrationtestapp/integration_test/otp_test.dart
@@ -14,9 +14,6 @@ void main() {
   setUp(() async {
     if (!kIsWeb) {
       String basePath = IntegrationTestConfig.apiBaseUrl;
-      if (PlatformHelper.isAndroid) {
-        basePath += '/v1';
-      }
       await passage.overrideBasePath(basePath);
     }
   });
diff --git a/integrationtestapp/integration_test/token_store_test.dart b/integrationtestapp/integration_test/token_store_test.dart
@@ -13,9 +13,6 @@ void main() {
   setUp(() async {
     if (!kIsWeb) {
       String basePath = IntegrationTestConfig.apiBaseUrl;
-      if (PlatformHelper.isAndroid) {
-        basePath += '/v1';
-      }
       await passage.overrideBasePath(basePath);
     }
   });
diff --git a/integrationtestapp/ios/Podfile.lock b/integrationtestapp/ios/Podfile.lock
@@ -1,12 +1,14 @@
 PODS:
+  - AnyCodable-FlightSchool (0.6.7)
   - Flutter (1.0.0)
   - integration_test (0.0.1):
     - Flutter
-  - Passage (1.6.0):
+  - Passage (1.8.1):
+    - AnyCodable-FlightSchool
     - SwiftKeychainWrapper
   - passage_flutter (0.7.3):
     - Flutter
-    - Passage (= 1.6.0)
+    - Passage (= 1.8.1)
   - SwiftKeychainWrapper (4.0.1)
 
 DEPENDENCIES:
@@ -16,6 +18,7 @@ DEPENDENCIES:
 
 SPEC REPOS:
   trunk:
+    - AnyCodable-FlightSchool
     - Passage
     - SwiftKeychainWrapper
 
@@ -28,10 +31,11 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/passage_flutter/ios"
 
 SPEC CHECKSUMS:
+  AnyCodable-FlightSchool: 261cbe76757802b17d471b9059b21e6fa5edf57b
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   integration_test: ce0a3ffa1de96d1a89ca0ac26fca7ea18a749ef4
-  Passage: 347004a76cb6677646c1f46ea48766cab5e9eb8a
-  passage_flutter: 484b9c4b625e0d17c6907cf4e9e57a1d5a1df50d
+  Passage: d6a41db58c3256e85a73ba993e515e7d1995b04f
+  passage_flutter: 8539d3e5e33da9b00454de4e371f9d3371a4de00
   SwiftKeychainWrapper: 807ba1d63c33a7d0613288512399cd1eda1e470c
 
 PODFILE CHECKSUM: 6a26cacf19c7fcde87d9c59e8f24986138e82f3b
diff --git a/ios/Classes/PassageFlutter.swift b/ios/Classes/PassageFlutter.swift
@@ -35,7 +35,7 @@ internal class PassageFlutter {
                 }
                 let authResult = try await passage.registerWithPasskey(identifier: identifier, options: passkeyCreationOptions)
                 result(convertToJsonString(codable: authResult))
-            } catch PassageASAuthorizationError.canceled {
+            } catch RegisterWithPasskeyError.canceled {
                 let error = PassageFlutterError.USER_CANCELLED.defaultFlutterError
                 result(error)
             } catch {
@@ -60,7 +60,7 @@ internal class PassageFlutter {
             do {
                 let authResult = try await passage.loginWithPasskey(identifier: identifier)
                 result(convertToJsonString(codable: authResult))
-            } catch PassageASAuthorizationError.canceled {
+            } catch LoginWithPasskeyError.canceled {
                 let error = PassageFlutterError.USER_CANCELLED.defaultFlutterError
                 result(error)
             } catch {
@@ -138,7 +138,7 @@ internal class PassageFlutter {
                 result(convertToJsonString(codable: authResult))
             } catch {
                 var errorCode = PassageFlutterError.OTP_ERROR.rawValue
-                if case PassageOTPError.exceededAttempts = error {
+                if case OneTimePasscodeActivateError.exceededAttempts = error {
                     errorCode = PassageFlutterError.OTP_ACTIVATION_EXCEEDED_ATTEMPTS.rawValue
                 }
                 let error = FlutterError(
@@ -339,11 +339,7 @@ internal class PassageFlutter {
     internal func getAppInfo(result: @escaping FlutterResult) {
         Task {
             do {
-                guard let appInfo = try await PassageAuth.appInfo() else {
-                    let error = PassageFlutterError.APP_INFO_ERROR.defaultFlutterError
-                    result(error)
-                    return
-                }
+                let appInfo = try await passage.appInfo()
                 result(convertToJsonString(codable: appInfo))
             } catch {
                 let error = FlutterError(
@@ -526,6 +522,38 @@ internal class PassageFlutter {
             result(convertToJsonString(codable: user))
         }
     }
+
+    internal func hostedAuth(result: @escaping FlutterResult) {
+        Task {
+            do {
+                let authResult = try await passage.hostedAuth()
+                result(convertToJsonString(codable: authResult))
+            } catch {
+                let error = FlutterError(
+                    code: PassageFlutterError.START_HOSTED_AUTH_ERROR.rawValue,
+                    message: error.localizedDescription,
+                    details: nil
+                )
+                result(error)
+            }
+        }
+    }
+
+    internal func hostedLogout(result: @escaping FlutterResult) {
+        Task {
+            do {
+                try await passage.hostedLogout()
+                result(nil)
+            } catch {
+                let error = FlutterError(
+                    code: PassageFlutterError.LOGOUT_HOSTED_AUTH_ERROR.rawValue,
+                    message: error.localizedDescription,
+                    details: nil
+                )
+                result(error)
+            }
+        }
+    }
     
 }
 
diff --git a/ios/Classes/PassageFlutterError.swift b/ios/Classes/PassageFlutterError.swift
@@ -15,13 +15,19 @@ internal enum PassageFlutterError: String {
     case CHANGE_PHONE_ERROR
     case IDENTIFIER_EXISTS_ERROR
     case OTP_ACTIVATION_EXCEEDED_ATTEMPTS
+    case START_HOSTED_AUTH_ERROR
+    case FINISH_HOSTED_AUTH_ERROR
+    case LOGOUT_HOSTED_AUTH_ERROR
     
     var defaultMessage: String {
         switch self {
         case .INVALID_ARGUMENT: return "Invalid or missing argument"
         case .PASSKEYS_NOT_SUPPORTED: return "Passkeys only supported in iOS 16 and newer"
         case .USER_CANCELLED: return "User cancelled"
         case .APP_INFO_ERROR: return "Error getting app info"
+        case .START_HOSTED_AUTH_ERROR: return "Error starting hosted authentication"
+        case .FINISH_HOSTED_AUTH_ERROR: return "Error finishing hosted authentication"
+        case .LOGOUT_HOSTED_AUTH_ERROR: return "Error logging out from hosted authentication"
         default: return ""
         }
     }
diff --git a/ios/Classes/PassageFlutterPlugin.swift b/ios/Classes/PassageFlutterPlugin.swift
@@ -76,6 +76,10 @@ public class PassageFlutterPlugin: NSObject, FlutterPlugin {
             passageFlutter.changePhone(arguments: call.arguments, result: result)
         case "identifierExists":
             passageFlutter.identifierExists(arguments: call.arguments, result: result)
+        case "hostedAuth":
+            passageFlutter.hostedAuth(result: result)
+        case "hostedLogout":
+            passageFlutter.hostedLogout(result: result)
         default:
             result(FlutterMethodNotImplemented)
         }
diff --git a/ios/passage_flutter.podspec b/ios/passage_flutter.podspec
@@ -11,7 +11,7 @@ Pod::Spec.new do |s|
   s.source           = { :path => '.' }
   s.source_files = 'Classes/**/*'
   s.dependency 'Flutter'
-  s.dependency 'Passage', '1.6.0'
+  s.dependency 'Passage', '1.8.1'
   s.platform = :ios, '14.0'
 
   # Flutter.framework does not contain a i386 slice.
diff --git a/lib/passage_flutter.dart b/lib/passage_flutter.dart
diff --git a/lib/passage_flutter_models/passage_error_code.dart b/lib/passage_flutter_models/passage_error_code.dart
diff --git a/lib/passage_flutter_platform/passage_flutter_method_channel.dart b/lib/passage_flutter_platform/passage_flutter_method_channel.dart
diff --git a/lib/passage_flutter_platform/passage_flutter_platform_interface.dart b/lib/passage_flutter_platform/passage_flutter_platform_interface.dart

Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,7 @@ internal enum class PassageFlutterError {`
`14`	`14`	`IDENTIFIER_EXISTS_ERROR,`
`15`	`15`	`OTP_ACTIVATION_EXCEEDED_ATTEMPTS,`
`16`	`16`	`SOCIAL_AUTH_ERROR,`
	`17`	`+ START_HOSTED_AUTH_ERROR,`
	`18`	`+ LOGOUT_HOSTED_AUTH_ERROR,`
	`19`	`+ FINISH_HOSTED_AUTH_ERROR`
`17`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`	`1`	`buildscript {`
`2`		`- ext.kotlin_version = '1.7.10'`
	`2`	`+ ext.kotlin_version = '1.8.10'`
`3`	`3`	`repositories {`
`4`	`4`	`google()`
`5`	`5`	`mavenCentral()`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`dependencies {`
`9`		`- classpath 'com.android.tools.build:gradle:7.3.0'`
	`9`	`+ classpath 'com.android.tools.build:gradle:7.3.1'`
`10`	`10`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@ pluginManagement {`
`18`	`18`
`19`	`19`	`plugins {`
`20`	`20`	`id "dev.flutter.flutter-plugin-loader" version "1.0.0"`
`21`		`- id "com.android.application" version "7.3.0" apply false`
`22`		`- id "org.jetbrains.kotlin.android" version "1.7.10" apply false`
	`21`	`+ id "com.android.application" version "7.3.1" apply false`
	`22`	`+ id "org.jetbrains.kotlin.android" version "1.8.10" apply false`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`include ":app"`