fix(auth): Await signInUri in Hosted UI platform

packages/auth/amplify_auth_cognito/example/integration_test/main_test.dart

@@ -17,6 +17,7 @@ import 'get_current_user_test.dart' as get_current_user_tests;
 import 'hosted_ui_webview_test.dart' as hosted_ui_webview_tests;
 import 'hub_events_test.dart' as hub_events_tests;
 import 'mfa_sms_test.dart' as mfa_sms_tests;
+import 'native_auth_bridge_test.dart' as native_auth_bridge_tests;
 import 'reset_password_test.dart' as reset_password_tests;
 import 'security_test.dart' as security_tests;
 import 'sign_in_test.dart' as sign_in_tests;
@@ -43,6 +44,7 @@ void main() async {
     hosted_ui_webview_tests.main();
     hub_events_tests.main();
     mfa_sms_tests.main();
+    native_auth_bridge_tests.main();
     reset_password_tests.main();
     security_tests.main();
     sign_in_tests.main();

packages/auth/amplify_auth_cognito/example/integration_test/native_auth_bridge_test.dart

@@ -0,0 +1,153 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+// ignore_for_file: invalid_use_of_protected_member, invalid_use_of_internal_member
+
+import 'dart:io';
+
+import 'package:amplify_auth_cognito/amplify_auth_cognito.dart';
+import 'package:amplify_auth_cognito/src/flows/hosted_ui/hosted_ui_platform_flutter.dart';
+import 'package:amplify_auth_cognito/src/native_auth_plugin.g.dart';
+import 'package:amplify_auth_cognito_dart/src/state/state.dart';
+import 'package:amplify_auth_cognito_test/amplify_auth_cognito_test.dart';
+import 'package:amplify_flutter/amplify_flutter.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:http/http.dart' as http;
+import 'package:http/testing.dart';
+
+void main() {
+  group(
+    'NativeAuthBridge',
+    skip: zIsWeb || !(Platform.isIOS || Platform.isAndroid),
+    () {
+      const browserPackage = 'browserPackage';
+
+      late DependencyManager dependencyManager;
+      late HostedUiPlatformImpl platform;
+
+      setUp(() async {
+        dependencyManager = DependencyManager()
+          ..addInstance<CognitoOAuthConfig>(hostedUiConfig)
+          ..addInstance<SecureStorageInterface>(MockSecureStorage())
+          ..addInstance<http.Client>(
+            MockClient((request) {
+              throw UnimplementedError();
+            }),
+          );
+        platform = HostedUiPlatformImpl(dependencyManager);
+      });
+
+      tearDown(Amplify.reset);
+
+      test('signInWithUrl', () async {
+        const options = CognitoSignInWithWebUIOptions(
+          isPreferPrivateSession: true,
+          browserPackageName: browserPackage,
+        );
+        dependencyManager
+          ..addInstance<NativeAuthBridge>(
+            MockNativeAuthBridge(
+              signInWithUrl: expectAsync4((
+                argUrl,
+                argCallbackurlscheme,
+                argPreferprivatesession,
+                argBrowserpackagename,
+              ) async {
+                expect(argUrl, contains(hostedUiConfig.webDomain));
+                expect(argCallbackurlscheme, testUrlScheme);
+                expect(argPreferprivatesession, isTrue);
+                expect(argBrowserpackagename, browserPackage);
+                return {'code': 'code', 'state': 'state'};
+              }),
+            ),
+          )
+          ..addInstance<Dispatcher<AuthEvent, AuthState>>(
+            const MockDispatcher(),
+          );
+        await platform.signIn(options: options);
+      });
+
+      test('signOutWithUrl', () async {
+        const options = CognitoSignOutWithWebUIOptions(
+          browserPackageName: browserPackage,
+        );
+        dependencyManager
+          ..addInstance<NativeAuthBridge>(
+            MockNativeAuthBridge(
+              signOutWithUrl: expectAsync4((
+                argUrl,
+                argCallbackurlscheme,
+                argPreferprivatesession,
+                argBrowserpackagename,
+              ) async {
+                expect(argUrl, contains(hostedUiConfig.webDomain));
+                expect(argCallbackurlscheme, testUrlScheme);
+                expect(argPreferprivatesession, isTrue);
+                expect(argBrowserpackagename, browserPackage);
+              }),
+            ),
+          )
+          ..addInstance<Dispatcher<AuthEvent, AuthState>>(
+            const MockDispatcher(),
+          );
+        await platform.signOut(
+          options: options,
+          isPreferPrivateSession: true,
+        );
+      });
+    },
+  );
+}
+
+typedef SignInOutFn<T> = Future<T> Function(
+  String argUrl,
+  String argCallbackurlscheme,
+  bool argPreferprivatesession,
+  String? argBrowserpackagename,
+);
+
+class MockNativeAuthBridge extends Fake implements NativeAuthBridge {
+  MockNativeAuthBridge({
+    SignInOutFn<Map<String?, String?>>? signInWithUrl,
+    SignInOutFn<void>? signOutWithUrl,
+  })  : _signInWithUrl = signInWithUrl,
+        _signOutWithUrl = signOutWithUrl;
+
+  final SignInOutFn<Map<String?, String?>>? _signInWithUrl;
+  final SignInOutFn<void>? _signOutWithUrl;
+
+  @override
+  Future<void> addPlugin() async {}
+
+  @override
+  Future<Map<String?, String?>> signInWithUrl(
+    String argUrl,
+    String argCallbackurlscheme,
+    bool argPreferprivatesession,
+    String? argBrowserpackagename,
+  ) async {
+    return _signInWithUrl?.call(
+          argUrl,
+          argCallbackurlscheme,
+          argPreferprivatesession,
+          argBrowserpackagename,
+        ) ??
+        (throw UnimplementedError());
+  }
+
+  @override
+  Future<void> signOutWithUrl(
+    String argUrl,
+    String argCallbackurlscheme,
+    bool argPreferprivatesession,
+    String? argBrowserpackagename,
+  ) async {
+    return _signOutWithUrl?.call(
+          argUrl,
+          argCallbackurlscheme,
+          argPreferprivatesession,
+          argBrowserpackagename,
+        ) ??
+        (throw UnimplementedError());
+  }
+}

packages/auth/amplify_auth_cognito/example/pubspec.yaml

@@ -37,6 +37,7 @@ dev_dependencies:
     sdk: flutter
   flutter_test:
     sdk: flutter
+  http: ^0.13.5
   integration_test:
     sdk: flutter
   io: ^1.0.0

packages/auth/amplify_auth_cognito/lib/src/flows/hosted_ui/hosted_ui_platform_flutter.dart

@@ -66,7 +66,7 @@ class HostedUiPlatformImpl extends io.HostedUiPlatformImpl {
     if (!_isMobile) {
       return super.signIn(options: options, provider: provider);
     }
-    final signInUri = getSignInUri(provider: provider);
+    final signInUri = await getSignInUri(provider: provider);
     try {
       final queryParameters = await _nativeAuthBridge.signInWithUrl(
         signInUri.toString(),

packages/auth/amplify_auth_cognito_test/analysis_options.yaml

@@ -2,6 +2,8 @@ include: package:amplify_lints/library.yaml
 
 analyzer:
   errors:
+    implementation_imports: ignore
     invalid_use_of_internal_member: ignore
+    public_member_api_docs: ignore
   exclude:
     - '**/*.g.dart'

packages/auth/amplify_auth_cognito_test/lib/amplify_auth_cognito_test.dart

@@ -3,3 +3,13 @@
 
 /// Tests for the `amplify_auth_cognito_dart` package.
 library amplify_auth_cognito_test;
+
+export 'common/jwt.dart';
+export 'common/matchers.dart';
+export 'common/mock_clients.dart';
+export 'common/mock_config.dart';
+export 'common/mock_dispatcher.dart';
+export 'common/mock_hosted_ui.dart';
+export 'common/mock_legacy_credential_provider.dart';
+export 'common/mock_oauth_server.dart';
+export 'common/mock_secure_storage.dart';

packages/auth/amplify_auth_cognito_test/test/common/jwt.dart → packages/auth/amplify_auth_cognito_test/lib/common/jwt.dart

@@ -2,8 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import 'package:amplify_auth_cognito_dart/src/jwt/jwt.dart';
-
-import 'mock_config.dart';
+import 'package:amplify_auth_cognito_test/common/mock_config.dart';
 
 enum TokenType { access, id }
 

packages/auth/amplify_auth_cognito_test/test/common/mock_config.dart → packages/auth/amplify_auth_cognito_test/lib/common/mock_config.dart

@@ -12,7 +12,8 @@ const testAppClientId = 'appClientId';
 const testIdentityPoolId = 'identityPoolId';
 const testRegion = 'region';
 const scopes = ['profile'];
-const redirectUri = 'http://localhost:9999/';
+const testUrlScheme = 'authtest';
+const redirectUri = '$testUrlScheme:/,http://localhost:9999/';
 const webDomain = 'example.com';
 const hostedUiConfig = CognitoOAuthConfig(
   appClientId: testAppClientId,

packages/auth/amplify_auth_cognito_test/test/common/mock_oauth_server.dart → packages/auth/amplify_auth_cognito_test/lib/common/mock_oauth_server.dart

@@ -5,12 +5,11 @@ import 'dart:convert';
 
 import 'package:amplify_auth_cognito_dart/amplify_auth_cognito_dart.dart';
 import 'package:amplify_auth_cognito_dart/src/crypto/oauth.dart';
+import 'package:amplify_auth_cognito_test/common/jwt.dart';
 import 'package:amplify_core/amplify_core.dart';
 import 'package:http/http.dart';
 import 'package:http/testing.dart';
 
-import 'jwt.dart';
-
 class _Request {
   _Request({
     required this.clientId,

packages/auth/amplify_auth_cognito_test/test/common/mock_secure_storage.dart → packages/auth/amplify_auth_cognito_test/lib/common/mock_secure_storage.dart

@@ -3,10 +3,9 @@
 
 import 'package:amplify_auth_cognito_dart/src/credentials/cognito_keys.dart';
 import 'package:amplify_auth_cognito_dart/src/credentials/credential_store_keys.dart';
+import 'package:amplify_auth_cognito_test/common/mock_config.dart';
 import 'package:amplify_secure_storage_dart/amplify_secure_storage_dart.dart';
 
-import 'mock_config.dart';
-
 class MockSecureStorage implements SecureStorageInterface {
   final Map<String, String> _storage = {};
 

packages/auth/amplify_auth_cognito_test/pubspec.yaml

@@ -10,26 +10,26 @@ dependencies:
   amplify_core: ">=1.0.0-next.5 <1.0.0-next.6"
   amplify_secure_storage_dart: ">=0.2.0 <0.3.0"
   aws_common: ">=0.4.0 <0.5.0"
+  built_collection: ^5.0.0
+  built_value: ">=8.4.0 <8.5.0"
+  convert: ^3.0.0
+  http: ^0.13.0
   io: ^1.0.0
   json_rpc_2: ^3.0.0
   shelf: ^1.4.0
   shelf_web_socket: ^1.0.0
+  smithy: ">=0.4.0+1 <0.5.0"
+  smithy_aws: ">=0.4.0+1 <0.5.0"
   stream_channel: ^2.0.0
+  stream_transform: ^2.0.0
   test: ^1.22.0
   web_socket_channel: ^2.3.0
   webdriver: ^3.0.0
+  worker_bee: ">=0.1.3+2 <0.2.0"
 
 dev_dependencies:
   amplify_lints:
     path: ../../amplify_lints
   build_runner: ^2.0.0
   build_test: ^2.0.0
   build_web_compilers: ^3.2.2
-  built_collection: ^5.0.0
-  built_value: ">=8.4.0 <8.5.0"
-  convert: ^3.0.0
-  http: ^0.13.0
-  smithy: ">=0.4.0+1 <0.5.0"
-  smithy_aws: ">=0.4.0+1 <0.5.0"
-  stream_transform: ^2.0.0
-  worker_bee: ">=0.1.3+2 <0.2.0"

packages/auth/amplify_auth_cognito_test/test/credentials/auth_plugin_credentials_provider_test.dart

@@ -6,14 +6,13 @@ import 'dart:async';
 import 'package:amplify_auth_cognito_dart/amplify_auth_cognito_dart.dart';
 import 'package:amplify_auth_cognito_dart/src/credentials/auth_plugin_credentials_provider.dart';
 import 'package:amplify_auth_cognito_dart/src/sdk/cognito_identity.dart';
+import 'package:amplify_auth_cognito_test/common/mock_clients.dart';
+import 'package:amplify_auth_cognito_test/common/mock_config.dart';
+import 'package:amplify_auth_cognito_test/common/mock_secure_storage.dart';
 import 'package:amplify_core/amplify_core.dart';
 import 'package:amplify_secure_storage_dart/amplify_secure_storage_dart.dart';
 import 'package:test/test.dart';
 
-import '../common/mock_clients.dart';
-import '../common/mock_config.dart';
-import '../common/mock_secure_storage.dart';
-
 void main() {
   group('AuthPluginCredentialsProvider', () {
     late AuthPluginCredentialsProviderImpl provider;

packages/auth/amplify_auth_cognito_test/test/flows/device/confirm_device_worker_test.dart

@@ -4,12 +4,11 @@
 import 'dart:async';
 
 import 'package:amplify_auth_cognito_dart/src/flows/device/confirm_device_worker.dart';
+import 'package:amplify_auth_cognito_test/common/mock_config.dart';
 import 'package:amplify_core/amplify_core.dart';
 import 'package:test/test.dart';
 import 'package:worker_bee/worker_bee.dart';
 
-import '../../common/mock_config.dart';
-
 void main() {
   AWSLogger().logLevel = LogLevel.verbose;
 

packages/auth/amplify_auth_cognito_test/test/flows/hostedui/hosted_ui_platform_io_test.dart

@@ -9,16 +9,15 @@ import 'dart:io';
 import 'package:amplify_auth_cognito_dart/amplify_auth_cognito_dart.dart';
 import 'package:amplify_auth_cognito_dart/src/flows/hosted_ui/hosted_ui_platform_io.dart';
 import 'package:amplify_auth_cognito_dart/src/state/state.dart';
+import 'package:amplify_auth_cognito_test/common/mock_config.dart';
+import 'package:amplify_auth_cognito_test/common/mock_dispatcher.dart';
+import 'package:amplify_auth_cognito_test/common/mock_hosted_ui.dart';
+import 'package:amplify_auth_cognito_test/common/mock_secure_storage.dart';
 import 'package:amplify_core/amplify_core.dart';
 import 'package:amplify_secure_storage_dart/amplify_secure_storage_dart.dart';
 import 'package:http/http.dart' as http;
 import 'package:test/test.dart';
 
-import '../../common/mock_config.dart';
-import '../../common/mock_dispatcher.dart';
-import '../../common/mock_hosted_ui.dart';
-import '../../common/mock_secure_storage.dart';
-
 class MockHostedUiPlatform extends HostedUiPlatformImpl {
   MockHostedUiPlatform(super.dependencyManager);
 
@@ -151,7 +150,9 @@ void main() {
           ..addInstance<Dispatcher<AuthEvent, AuthState>>(dispatcher);
         final hostedUiPlatform = MockHostedUiPlatform(dependencyManager);
 
-        final redirect = Uri.parse(redirectUri);
+        final redirect = Uri.parse(
+          redirectUri.split(',').firstWhere((uri) => uri.contains('localhost')),
+        );
         expect(hostedUiPlatform.signInRedirectUri, redirect);
         expect(hostedUiPlatform.signOutRedirectUri, redirect);
 

packages/auth/amplify_auth_cognito_test/test/flows/hostedui/hosted_ui_platform_test.dart

@@ -4,16 +4,15 @@
 import 'package:amplify_auth_cognito_dart/amplify_auth_cognito_dart.dart';
 import 'package:amplify_auth_cognito_dart/src/credentials/cognito_keys.dart';
 import 'package:amplify_auth_cognito_dart/src/state/state.dart';
+import 'package:amplify_auth_cognito_test/common/mock_config.dart';
+import 'package:amplify_auth_cognito_test/common/mock_dispatcher.dart';
+import 'package:amplify_auth_cognito_test/common/mock_oauth_server.dart';
+import 'package:amplify_auth_cognito_test/common/mock_secure_storage.dart';
 import 'package:amplify_core/amplify_core.dart';
 import 'package:amplify_secure_storage_dart/amplify_secure_storage_dart.dart';
 import 'package:http/http.dart' as http;
 import 'package:test/test.dart';
 
-import '../../common/mock_config.dart';
-import '../../common/mock_dispatcher.dart';
-import '../../common/mock_oauth_server.dart';
-import '../../common/mock_secure_storage.dart';
-
 final throwsInvalidStateException = throwsA(isA<InvalidStateException>());
 
 void main() {

packages/auth/amplify_auth_cognito_test/test/flows/srp/srp_device_password_verifier_worker_test.dart

@@ -11,12 +11,13 @@ import 'package:amplify_auth_cognito_dart/src/flows/srp/srp_device_password_veri
 import 'package:amplify_auth_cognito_dart/src/model/cognito_device_secrets.dart';
 import 'package:amplify_auth_cognito_dart/src/model/sign_in_parameters.dart';
 import 'package:amplify_auth_cognito_dart/src/sdk/src/cognito_identity_provider/model/respond_to_auth_challenge_request.dart';
+import 'package:amplify_auth_cognito_test/common/mock_config.dart'
+    hide username;
 import 'package:amplify_core/amplify_core.dart';
 import 'package:built_collection/built_collection.dart';
 import 'package:test/test.dart';
 import 'package:worker_bee/worker_bee.dart';
 
-import '../../common/mock_config.dart' hide username;
 import 'srp_helper_test.dart';
 
 void main() {