aws-amplify · tyllark · Apr 28, 2025 · Apr 28, 2025 · Apr 28, 2025 · Apr 28, 2025
@@ -3,8 +3,6 @@
 
 import 'dart:convert';
 import 'dart:js_interop';
-//ignore: deprecated_member_use
-import 'dart:js_util';
 
 @JS()
 external Exec get exec;
@@ -46,9 +44,14 @@ extension type Exec._(JSObject it) {
       ignoreReturnCode: !failOnNonZeroExit,
     );
     try {
-      final exitCode = await promiseToFuture<int>(
-        _exec(commandLine, args.map((arg) => arg.toJS).toList().toJS, options),
-      );
+      final jsExitCode =
+          await _exec(
+            commandLine,
+            args.map((arg) => arg.toJS).toList().toJS,
+            options,
+          ).toDart;
+
+      final exitCode = (jsExitCode as JSNumber).toDartInt;
       return ExecResult(
         exitCode: exitCode,
         stdout: stdout.toString(),

@@ -3,6 +3,8 @@
 
 import 'dart:js_interop';
 
+import 'package:web/web.dart';
+
 @JS()
 extension type HttpClient._(JSObject it) {
   external HttpClient([
@@ -18,7 +20,11 @@ extension type HttpClient._(JSObject it) {
     String requestUrl, {
     Map<String, String> headers = const {},
   }) async {
-    final jsHeaders = headers.jsify() as JSObject;
+    final jsHeaders = Headers();
+      for(final entry in headers.entries) {
+        jsHeaders.append(entry.key, entry.value);
+      }
+
     final response = await _getJson(requestUrl, jsHeaders).toDart;
     final result = response as TypedResponse<JSObject>;
     if (result.statusCode != 200) {

@@ -18,6 +18,7 @@ dependencies:
   source_maps: ^0.10.12
   stack_trace: ^1.10.0
   stream_transform: ^2.1.0
+  web: ^1.1.1
 
 dev_dependencies:
   amplify_lints: ^3.0.0

@@ -1,8 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-//ignore: deprecated_member_use
-import 'dart:html';
+import 'package:web/web.dart';
 
 final RegExp _edgeRegex = RegExp(r'Edg/[\d\.]+');
 final RegExp _operaRegex = RegExp(r'OPR/[\d\.]+');

@@ -21,6 +21,7 @@ dependencies:
   retry: ^3.1.0
   stack_trace: ^1.10.0
   uuid: ">=3.0.6 <5.0.0"
+  web: ^1.1.1
 
 dev_dependencies:
   amplify_lints: ">=3.1.1 <3.2.0"

@@ -2,14 +2,15 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import 'dart:async';
-//ignore: deprecated_member_use
-import 'dart:js_util';
+import 'dart:js_interop';
+import 'dart:js_interop_unsafe';
 
 import 'package:amplify_analytics_pinpoint_dart/src/impl/analytics_client/event_client/queued_item_store/queued_item_store.dart';
 import 'package:amplify_core/amplify_core.dart';
 // ignore: implementation_imports
 import 'package:aws_common/src/js/indexed_db.dart';
 import 'package:collection/collection.dart';
+import 'package:web/web.dart';
 
 // TODO(kylechen): Consider merging/refactoring with existing 'amplify_secure_storage_web - _IndexedDBStorage' class
 /// {@template amplify_analytics_pinpoint_dart.indexed_db_adapter}
@@ -39,36 +40,43 @@ class IndexedDbAdapter implements QueuedItemStore {
     if (db == null) {
       throw const InvalidStateException('IndexedDB is not available');
     }
+    void onUpgradeNeeded(IDBVersionChangeEvent event) {
+      final database = event.target?.getProperty<IDBDatabase>('result'.toJS);
+      final objectStoreNames = database?.objectStoreNames;
+      if (!(objectStoreNames?.contains(storeName) ?? false)) {
+        database?.createObjectStore(
+          storeName,
+          IDBObjectStoreParameters(keyPath: 'id'.toJS, autoIncrement: true),
+        );
+      }
+    }
+
     final openRequest = db.open(databaseName, 1)
-      ..onupgradeneeded = (event) {
-        final database = event.target.result;
-        final objectStoreNames = database.objectStoreNames;
-        if (!objectStoreNames.contains(storeName)) {
-          database.createObjectStore(
-            storeName,
-            keyPath: 'id',
-            autoIncrement: true,
-          );
-        }
-      };
-    _database = await openRequest.future;
+      ..onupgradeneeded = onUpgradeNeeded.toJS;
+
+    final result = await openRequest.future;
+    if (result.isA<IDBDatabase>()) {
+      result as IDBDatabase;
+      _database = result;
+    } else {
+      throw const InvalidStateException('IDBOpenDBRequest failed');
+    }
   }
 
   /// Returns a new [IDBObjectStore] instance after waiting for initialization
   /// to complete.
   IDBObjectStore _getObjectStore() {
-    final transaction = _database.transaction(
-      storeName,
-      mode: IDBTransactionMode.readwrite,
-    );
+    final transaction = _database.transaction(storeName.toJS, 'readwrite');
     final store = transaction.objectStore(storeName);
     return store;
   }
 
   @override
   Future<void> addItem(String string) async {
     await _databaseOpenEvent;
-    await _getObjectStore().push({'value': string}).future;
+    final item = JSObject()..setProperty('value'.toJS, string.toJS);
+
+    await _getObjectStore().add(item).future;
   }
 
   @override
@@ -77,14 +85,26 @@ class IndexedDbAdapter implements QueuedItemStore {
 
     await _databaseOpenEvent;
     final store = _getObjectStore();
-    final request = store.getAll(null, count);
+
+    late IDBRequest request;
+    if (count == null) {
+      request = store.getAll();
+    } else {
+      request = store.getAll(null, count);
+    }
 
     await request.future;
+    final jsResult = request.result;
+    var result = <JSObject>[];
+    if (jsResult.isA<JSArray<JSObject>>()) {
+      jsResult as JSArray<JSObject>;
+      result = jsResult.toDart;
+    }
+
+    for (final elem in result) {
+      final id = elem.getProperty<JSNumber>('id'.toJS).toDartInt;
+      final string = elem.getProperty<JSString>('value'.toJS).toDart;
 
-    for (final elem in request.result) {
-      final value = elem as Object;
-      final id = getProperty<int>(value, 'id');
-      final string = getProperty<String>(value, 'value');
       readValues.add(QueuedItem(id: id, value: string));
     }
     return readValues;
@@ -101,10 +121,8 @@ class IndexedDbAdapter implements QueuedItemStore {
 
     final ranges = idsToDelete
         .splitBetween((a, b) => b != a + 1)
-        .map((range) => IDBKeyRange.bound(range.first, range.last));
-    await Future.wait<void>(
-      ranges.map((range) => store.deleteByKeyRange(range).future),
-    );
+        .map((range) => IDBKeyRange.bound(range.first.toJS, range.last.toJS));
+    await Future.wait<void>(ranges.map((range) => store.delete(range).future));
   }
 
   /// Clear the database.

@@ -24,6 +24,7 @@ dependencies:
   smithy: ">=0.7.4 <0.8.0"
   smithy_aws: ">=0.7.4 <0.8.0"
   uuid: ">=3.0.6 <5.0.0"
+  web: ^1.1.1
 
 dev_dependencies:
   amplify_lints: ">=3.1.1 <3.2.0"

@@ -62,6 +62,7 @@ void main() {
           username: username,
           password: password,
         );
+
         check(
           resignInRes.nextStep.signInStep,
         ).equals(AuthSignInStep.confirmSignInWithOtpCode);
@@ -99,9 +100,18 @@ void main() {
           username: username,
           password: password,
         );
+
         check(
           signInRes.nextStep.signInStep,
-          because: 'MFA is required so Cognito automatically enables SMS MFA',
+          because: 'MFA is required so Cognito will ask for MFA type',
+        ).equals(AuthSignInStep.continueSignInWithMfaSelection);
+
+        final selectMfaRes = await Amplify.Auth.confirmSignIn(
+          confirmationValue: 'SMS',
+        );
+
+        check(
+          selectMfaRes.nextStep.signInStep,
         ).equals(AuthSignInStep.confirmSignInWithSmsMfaCode);
 
         final confirmRes = await Amplify.Auth.confirmSignIn(
@@ -215,9 +225,18 @@ void main() {
           username: username,
           password: password,
         );
+
         check(
           signInRes.nextStep.signInStep,
-          because: 'MFA is required so Cognito automatically enables SMS MFA',
+          because: 'MFA is required so Cognito prompts MFA type selection',
+        ).equals(AuthSignInStep.continueSignInWithMfaSelection);
+
+        final selectMfaRes = await Amplify.Auth.confirmSignIn(
+          confirmationValue: 'SMS',
+        );
+
+        check(
+          selectMfaRes.nextStep.signInStep,
         ).equals(AuthSignInStep.confirmSignInWithSmsMfaCode);
 
         final confirmRes = await Amplify.Auth.confirmSignIn(
@@ -227,44 +246,15 @@ void main() {
 
         check(
           await cognitoPlugin.fetchMfaPreference(),
-          because: 'MFA is required so Cognito automatically enables SMS MFA',
+          because:
+              'SMS MFA has been selected so Cognito fetches SMS as preferred',
         ).equals(
           const UserMfaPreference(
             enabled: {MfaType.sms},
             preferred: MfaType.sms,
           ),
         );
 
-        // Verify we can set SMS as preferred and forego selection.
-
-        {
-          await signOutUser(assertComplete: true);
-
-          final mfaCode = await getOtpCode(UserAttribute.phone(phoneNumber));
-          final signInRes = await Amplify.Auth.signIn(
-            username: username,
-            password: password,
-          );
-          check(
-            signInRes.nextStep.signInStep,
-            because: 'Preference is SMS MFA now',
-          ).equals(AuthSignInStep.confirmSignInWithSmsMfaCode);
-          check(signInRes.nextStep.codeDeliveryDetails).isNotNull()
-            ..has(
-              (d) => d.deliveryMedium,
-              'deliveryMedium',
-            ).equals(DeliveryMedium.sms)
-            ..has(
-              (d) => d.destination,
-              'destination',
-            ).isNotNull().startsWith('+');
-
-          final confirmRes = await Amplify.Auth.confirmSignIn(
-            confirmationValue: await mfaCode.code,
-          );
-          check(confirmRes.nextStep.signInStep).equals(AuthSignInStep.done);
-        }
-
         // Verify we can switch to EMAIL as preferred.
 
         await cognitoPlugin.updateMfaPreference(email: MfaPreference.preferred);

@@ -15,6 +15,7 @@ dependencies:
   example_common:
     path: ../../../example_common
   qr: ^3.0.1
+  web: ^1.1.1
 
 dev_dependencies:
   amplify_api_dart: any

@@ -1,13 +1,11 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-//ignore: deprecated_member_use
-import 'dart:html';
-
 import 'package:amplify_auth_cognito_dart/amplify_auth_cognito_dart.dart';
 import 'package:amplify_core/amplify_core.dart';
 import 'package:cognito_example/common.dart';
 import 'package:example_common/example_common.dart';
+import 'package:web/web.dart';
 
 import 'app_component.dart';
 

@@ -1,20 +1,17 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-// TODO(dnys1): Migrate to `js_interop`.
 library;
 
 import 'dart:convert';
+import 'dart:js_interop';
 
 import 'package:amplify_auth_cognito_dart/src/asf/asf_device_info_collector.dart';
 import 'package:amplify_auth_cognito_dart/src/asf/package_info.dart';
 import 'package:async/async.dart';
 import 'package:aws_common/aws_common.dart';
-// ignore: implementation_imports
-import 'package:aws_common/src/js/common.dart';
-//ignore: deprecated_member_use
-import 'package:js/js.dart';
 import 'package:path/path.dart';
+import 'package:web/web.dart';
 
 /// {@template amplify_auth_cognito_dart.asf.asf_device_info_js}
 /// The JS/Browser implementation of [NativeASFDeviceInfoCollector].
@@ -65,10 +62,10 @@ final class ASFDeviceInfoPlatform extends NativeASFDeviceInfoCollector {
       window.navigator.userAgentData?.platform ?? window.navigator.platform;
 
   @override
-  Future<int?> get screenHeightPixels async => window.screen.height?.toInt();
+  Future<int?> get screenHeightPixels async => window.screen.height;
 
   @override
-  Future<int?> get screenWidthPixels async => window.screen.width?.toInt();
+  Future<int?> get screenWidthPixels async => window.screen.width;
 
   @override
   Future<String?> get thirdPartyDeviceId async => null;
@@ -81,34 +78,11 @@ String get _baseUrl {
   return url.join(window.location.origin, basePath);
 }
 
-extension on Window {
-  external _Screen get screen;
-  external _Navigator get navigator;
-}
-
-@JS('Screen')
-@staticInterop
-class _Screen {}
-
-extension on _Screen {
-  external double? get width;
-  external double? get height;
-}
-
-@JS('Navigator')
-@staticInterop
-class _Navigator {}
-
-extension on _Navigator {
-  external String? get language;
-  external String? get platform;
+extension _PropsNavigator on Navigator {
   external _NavigatorUAData? get userAgentData;
 }
 
 @JS('NavigatorUAData')
-@staticInterop
-class _NavigatorUAData {}
-
-extension on _NavigatorUAData {
+extension type _NavigatorUAData._(JSObject _) implements JSObject {
   external String? get platform;
 }