PSG-4629

.github/workflows/integration-tests.yml

@@ -32,7 +32,7 @@ jobs:
       - name: Set up Google Chrome and ChromeDriver
         uses: browser-actions/setup-chrome@v1
         with:
-          chrome-version: 127
+          chrome-version: 129
           install-chromedriver: true
           install-dependencies: true
 
@@ -135,12 +135,13 @@ jobs:
         working-directory: ./integrationtestapp
 
       - name: Install simulator
+        id: install-simulator
         uses: futureware-tech/simulator-action@v3
         with:
           model: 'iPhone 14'
 
       - name: Run iOS tests
-        run: flutter test integration_test/*.dart -d 2CBBC7F8-8C98-4142-8292-D5833BB30F8F --dart-define=MAILOSAUR_API_KEY=${{ secrets.MAILOSAUR_API_KEY }}
+        run: flutter test integration_test/*.dart -d ${{ steps.install-simulator.outputs.udid }} --dart-define=MAILOSAUR_API_KEY=${{ secrets.MAILOSAUR_API_KEY }}
         working-directory: ./integrationtestapp
         env:
           MAILOSAUR_API_KEY: ${{ secrets.MAILOSAUR_API_KEY }}

android/build.gradle

@@ -38,8 +38,11 @@ android {
     dependencies {
         testImplementation 'org.jetbrains.kotlin:kotlin-test'
         testImplementation 'org.mockito:mockito-core:5.0.0'
-        implementation 'id.passage.android:passage:1.8.2'
+        implementation 'id.passage.android:passage:2.0.1'
         implementation 'com.google.code.gson:gson:2.10.1'
+        implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1'
+        implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1'
+        implementation 'androidx.annotation:annotation:1.8.2'
     }
 
     testOptions {

android/settings.gradle

@@ -1,4 +1,3 @@
-rootProject.name = 'passage_flutter'
 pluginManagement {
     def flutterSdkPath = {
         def properties = new Properties()
@@ -22,5 +21,5 @@ plugins {
     id "com.android.application" version "8.5.2" apply false
     id "org.jetbrains.kotlin.android" version "2.0.10" apply false
 }
-
+rootProject.name = 'passage_flutter'
 include ":app"

android/src/main/kotlin/id/passage/passage_flutter/PassageFlutterError.kt

@@ -5,6 +5,14 @@ internal enum class PassageFlutterError {
     PASSKEY_ERROR,
     USER_CANCELLED,
     USER_UNAUTHORIZED,
+    USER_NOT_FOUND,
+    USER_INACTIVE,
+    USER_REQUEST,
+    USER_SERVER_ERROR,
+    METADATA_APP_NOT_FOUND,
+    METADATA_INVALID,
+    METADATA_FORBIDDEN,
+    METADATA_SERVER_ERROR,
     OTP_ERROR,
     MAGIC_LINK_ERROR,
     TOKEN_ERROR,

android/src/main/kotlin/id/passage/passage_flutter/PassageFlutterExtensions.kt

@@ -1,8 +1,8 @@
 package id.passage.passage_flutter
 
-import id.passage.android.PassageAuthResult
+import id.passage.android.model.AuthResult
 
-internal fun PassageAuthResult.convertToMap(): HashMap<String, Any> {
+internal fun AuthResult.convertToMap(): HashMap<String, Any> {
     val authResultHashMap:  HashMap<String, Any> = hashMapOf(
         "auth_token" to authToken,
         "redirect_url" to redirectUrl

android/src/main/kotlin/id/passage/passage_flutter/PassageFlutterPlugin.kt

@@ -34,19 +34,14 @@ class PassageFlutterPlugin: FlutterPlugin, MethodCallHandler, ActivityAware {
 
   override fun onMethodCall(@NonNull call: MethodCall, @NonNull result: Result) {
       if (passageFlutter == null) {
-          passageFlutter = if (call.method == "initWithAppId") {
+          if (call.method == "initialize") {
               val appId = call.argument<String>("appId") ?: return invalidArgumentError(result)
-              PassageFlutter(activity, appId)
-          } else {
-              PassageFlutter(activity)
+              passageFlutter =  PassageFlutter(activity, appId)
           }
       }
 
       when (call.method) {
-          "initWithAppId" -> {}
-          "overrideBasePath" -> {
-            passageFlutter?.overrideBasePath(call, result)
-          }
+          "initialize" -> {}
           "registerWithPasskey" -> passageFlutter?.registerWithPasskey(call, result)
           "loginWithPasskey" -> passageFlutter?.loginWithPasskey(call, result)
           "deviceSupportsPasskeys" -> passageFlutter?.deviceSupportsPasskeys(result)
@@ -73,7 +68,12 @@ class PassageFlutterPlugin: FlutterPlugin, MethodCallHandler, ActivityAware {
           "changePhone" -> passageFlutter?.changePhone(call, result)
           "hostedAuthStart" -> passageFlutter?.hostedAuthStart(result)
           "hostedAuthFinish" -> passageFlutter?.hostedAuthFinish(call, result)
-          "hostedLogout" -> passageFlutter?.hostedLogout(result)
+          "passkeys" -> passageFlutter?.passkeys(result);
+          "socialConnections" -> passageFlutter?.socialConnections(result)
+          "deleteSocialConnection" -> passageFlutter?.deleteSocialConnection(call, result)
+          "metaData" -> passageFlutter?.metaData(result);
+          "updateMetaData" -> passageFlutter?.updateMetaData(call, result)
+          "createUser" -> passageFlutter?.createUser(call, result)
           else -> {
               result.notImplemented()
           }

integrationtestapp/android/app/src/main/res/values/strings.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="passage_auth_origin">YOUR_AUTH_ORIGIN</string>
+    <string name="passage_auth_origin">try-uat.passage.dev</string>
+    <string name="clientApiBasePath">https://auth-uat.passage.dev/v1</string>
     <string name="asset_statements">
       [{
         \"include\": \"https://@string/passage_auth_origin/.well-known/assetlinks.json\"

integrationtestapp/integration_test/app_test.dart

@@ -0,0 +1,57 @@
+import 'package:flutter/foundation.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:passage_flutter/passage_flutter.dart';
+import 'helper/integration_test_config.dart';
+import 'package:integration_test/integration_test.dart';
+
+void main() {
+  IntegrationTestWidgetsFlutterBinding.ensureInitialized();
+  PassageFlutter passage = PassageFlutter(IntegrationTestConfig.appIdPassage);
+
+  setUp(() async {
+    if (!kIsWeb) {
+      String basePath = IntegrationTestConfig.apiBaseUrl;
+    }
+  });
+
+
+  group('PassageAppTests', () {
+    test('testAppInfo', () async {
+      try {
+        final appInfo = await passage.app.info();
+        expect(appInfo.id.toString(), IntegrationTestConfig.appIdPassage);
+      } catch (e) {
+        fail('Test failed due to unexpected exception: $e');
+      }
+    });
+
+    test('testUserExists', () async {
+      try {
+        const identifier = IntegrationTestConfig.existingUserPassage;
+        final userInfo = await passage.app.userExists(identifier);
+        expect(userInfo, isNotNull);
+      } catch (e) {
+        fail('Test failed due to unexpected exception: $e');
+      }
+    });
+
+    test('testUserDoesNotExist', () async {
+      try {
+        final identifier = 'nonexistent_${DateTime.now().millisecondsSinceEpoch}@example.com';
+        final userInfo = await passage.app.userExists(identifier);
+        fail('Expected PassageError but got success');
+      } catch (e) {
+        //success
+      }
+    });
+
+    test('testUserDoesExist', () async {
+      try {
+        final newUser = await passage.app.createUser('newuser_${DateTime.now().millisecondsSinceEpoch}@example.com');
+        expect(newUser, isNotNull);
+        } catch (e) {
+        fail('Test failed due to unexpected exception: $e');
+      }
+    });
+  });
+}

integrationtestapp/integration_test/change_user_info_test.dart

@@ -14,13 +14,12 @@ void main() {
   setUp(() async {
     if (!kIsWeb) {
       String basePath = IntegrationTestConfig.apiBaseUrl;
-      await passage.overrideBasePath(basePath);
     }
   });
 
   tearDown(() async {
     try {
-      await passage.signOut();
+      await passage.currentUser.logout();
     } catch (e) {
       // an error happened during sign out
     }
@@ -29,14 +28,14 @@ void main() {
   Future<void> loginWithMagicLink() async {
     try {
       await passage
-          .newLoginMagicLink(IntegrationTestConfig.existingUserEmailMagicLink);
+          .magliclink.login(IntegrationTestConfig.existingUserEmailMagicLink);
       await Future.delayed(const Duration(
           milliseconds: IntegrationTestConfig.waitTimeMilliseconds));
       final magicLinkStr = await MailosaurAPIClient.getMostRecentMagicLink();
       if (magicLinkStr.isEmpty) {
         fail('Test failed: Magic link is empty');
       }
-      await passage.magicLinkActivate(magicLinkStr);
+      await passage.magliclink.activate(magicLinkStr);
     } catch (e) {
       fail('Expected to activate login magic link, but got an exception: $e');
     }
@@ -48,7 +47,7 @@ void main() {
         await loginWithMagicLink();
         final date = DateTime.now().millisecondsSinceEpoch;
         final identifier = '[email protected]';
-        final response = await passage.changeEmail(identifier);
+        final response = await passage.currentUser.changeEmail(identifier);
         expect(response, isNotNull);
       } catch (e) {
         fail('Test failed due to unexpected exception: $e');
@@ -57,10 +56,10 @@ void main() {
 
     test('testChangeEmailUnAuthed', () async {
       try {
-        await passage.signOut();
+        await passage.currentUser.logout();
         final date = DateTime.now().millisecondsSinceEpoch;
         final identifier = '[email protected]';
-        await passage.changeEmail(identifier);
+        await passage.currentUser.changeEmail(identifier);
         fail('Test should throw PassageError');
       } catch (e) {
         if (e is PassageError) {
@@ -74,7 +73,7 @@ void main() {
     test('testChangePhoneInvalid', () async {
       try {
         await loginWithMagicLink();
-        final response = await passage.changePhone('444');
+        final response = await passage.currentUser.changePhone('444');
         expect(response, isNotNull);
         fail('Test should throw PassageError');
       } catch (e) {
@@ -88,7 +87,7 @@ void main() {
 
     test('testChangePhoneUnAuthed', () async {
       try {
-        await passage.changePhone('+14155552671');
+        await passage.currentUser.changePhone('+14155552671');
         fail('Test should throw PassageError');
       } catch (e) {
         if (e is PassageError) {

integrationtestapp/integration_test/current_user_test.dart

@@ -1,5 +1,9 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:passage_flutter/passage_flutter.dart';
+import 'package:passage_flutter/passage_flutter_models/meta_data.dart';
+import 'package:passage_flutter/passage_flutter_models/passage_social_connection.dart';
+import 'package:passage_flutter/passage_flutter_models/passage_user_social_connections.dart';
+import 'package:passage_flutter/passage_flutter_models/passkey.dart';
 import 'helper/integration_test_config.dart';
 import 'helper/mailosaur_api_client.dart';
 import 'package:flutter/foundation.dart';
@@ -10,16 +14,15 @@ void main() {
   IntegrationTestWidgetsFlutterBinding.ensureInitialized();
   PassageFlutter passage = PassageFlutter(IntegrationTestConfig.appIdMagicLink);
 
-  setUp(() async {
+  setUpAll(() async {
     if (!kIsWeb) {
       String basePath = IntegrationTestConfig.apiBaseUrl;
-      await passage.overrideBasePath(basePath);
     }
   });
 
   tearDown(() async {
     try {
-      await passage.signOut();
+      await passage.currentUser.logout();
     } catch (e) {
       // an error happened during sign out
     }
@@ -28,14 +31,15 @@ void main() {
   Future<void> loginWithMagicLink() async {
     try {
       await passage
-          .newLoginMagicLink(IntegrationTestConfig.existingUserEmailMagicLink);
-      await Future.delayed(const Duration(
-          milliseconds: IntegrationTestConfig.waitTimeMilliseconds));
+          .magliclink
+          .login(IntegrationTestConfig.existingUserEmailMagicLink);
+      await Future.delayed(
+          const Duration(milliseconds: IntegrationTestConfig.waitTimeMilliseconds));
       final magicLinkStr = await MailosaurAPIClient.getMostRecentMagicLink();
       if (magicLinkStr.isEmpty) {
         fail('Test failed: Magic link is empty');
       }
-      await passage.magicLinkActivate(magicLinkStr);
+      await passage.magliclink.activate(magicLinkStr);
     } catch (e) {
       fail('Expected to activate login magic link, but got an exception: $e');
     }
@@ -45,15 +49,15 @@ void main() {
     test('testCurrentUser', () async {
       try {
         await loginWithMagicLink();
-        final response = await passage.getCurrentUser();
+        final response = await passage.currentUser.userInfo();
         expect(response?.id, IntegrationTestConfig.currentUser.id);
         expect(response?.email, IntegrationTestConfig.currentUser.email);
         expect(response?.status, IntegrationTestConfig.currentUser.status);
-        expect(response?.emailVerified,
-            IntegrationTestConfig.currentUser.emailVerified);
+        expect(
+            response?.emailVerified, IntegrationTestConfig.currentUser.emailVerified);
         expect(response?.phone, IntegrationTestConfig.currentUser.phone);
-        expect(response?.phoneVerified,
-            IntegrationTestConfig.currentUser.phoneVerified);
+        expect(
+            response?.phoneVerified, IntegrationTestConfig.currentUser.phoneVerified);
         expect(response?.webauthn, IntegrationTestConfig.currentUser.webauthn);
       } catch (e) {
         fail('Test failed due to unexpected exception: $e');
@@ -62,13 +66,70 @@ void main() {
 
     test('testCurrentUserNotAuthorized', () async {
       try {
-        final response = await passage.getCurrentUser();
-        if (response == null) {
-          expect(true, true);
-        } else {
-          fail('Test failed: response must be null');
-        }
+        final response = await passage.currentUser.userInfo();
+        fail('Test failed: must throw an error');
       } catch (e) {
+        //success
+      }
+    });
+
+    test('testPasskeys', () async {
+      try {
+        await loginWithMagicLink();
+        final passkeys = await passage.currentUser.passkeys();
+        expect(passkeys, isNotNull);
+        expect(passkeys, isA<List<Passkey>>());
+      } catch (e) {
+        fail('Test failed due to unexpected exception: $e');
+      }
+    });
+
+    test('testSocialConnections', () async {
+      try {
+        await loginWithMagicLink();
+        final socialConnections = await passage.currentUser.socialConnections();
+        expect(socialConnections, isNotNull);
+        expect(socialConnections, isA<UserSocialConnections>());
+      } catch (e) {
+        fail('Test failed due to unexpected exception: $e');
+      }
+    });
+
+    test('testDeleteSocialConnection', () async {
+      try {
+        await loginWithMagicLink();
+
+        final socialConnectionType = SocialConnection.github;
+        await passage.currentUser.deleteSocialConnection(socialConnectionType);
+        final socialConnections = await passage.currentUser.socialConnections();
+        expect(socialConnections, isNotNull);
+      } catch (e) {
+        fail('Test failed due to unexpected exception: $e');
+      }
+    });
+
+    test('testMetadata', () async {
+      try {
+        await loginWithMagicLink();
+        final metadata = await passage.currentUser.metadata();
+        expect(metadata, isNotNull);
+        expect(metadata, isA<Metadata>());
+      } catch (e) {
+        print(e.toString());
+        fail('Test failed due to unexpected exception: $e');
+      }
+    });
+
+    test('testUpdateMetadata', () async {
+      try {
+        await loginWithMagicLink();
+
+        Metadata newMetadata = Metadata(userMetadata: {'testkey': 'testValue'});
+        await passage.currentUser.updateMetadata(newMetadata);
+        final updatedMetadata = await passage.currentUser.metadata();
+        expect(updatedMetadata, isNotNull);
+      } catch (e) {
+        print(e.toString());
         fail('Test failed due to unexpected exception: $e');
       }
     });