Merge branch 'feat/storage-gen-2' into feat/storage-gen-2-remove-prefix

aws-amplify · Apr 10, 2024 · 257e5bb · 257e5bb
2 parents 0b071ef + 78886e0
commit 257e5bb
Show file tree

Hide file tree

Showing 61 changed files with 329 additions and 151 deletions.
diff --git a/canaries/integration_test/main_test.dart b/canaries/integration_test/main_test.dart
@@ -70,7 +70,7 @@ void main() {
     // Upload data to Storage
     await Amplify.Storage.uploadData(
       data: HttpPayload.string(data),
-      path: StoragePath.withIdentityId(
+      path: StoragePath.fromIdentityId(
         (String identityId) => 'private/$identityId/hello',
       ),
     ).result;

diff --git a/packages/aft/pubspec.yaml b/packages/aft/pubspec.yaml
@@ -11,7 +11,7 @@ dependencies:
   async: ^2.10.0
   aws_common: ">=0.4.2+5 <0.5.0"
   built_collection: ^5.0.0
-  built_value: ">=8.6.0 <8.9.0"
+  built_value: ^8.6.0
   checked_yaml: ^2.0.0
   cli_util: ^0.3.5
   code_builder: 4.10.0

diff --git a/packages/amplify_core/lib/src/category/amplify_storage_category.dart b/packages/amplify_core/lib/src/category/amplify_storage_category.dart
@@ -9,9 +9,6 @@ part of 'amplify_categories.dart';
 ///
 /// It comes with default, built-in support for Amazon S3 service
 /// leveraging Amplify Auth Category for authorization.
-///
-/// The Amplify CLI helps you to create and configure the storage category
-/// and auth category.
 /// {@endtemplate}
 class StorageCategory extends AmplifyCategory<StoragePluginInterface> {
   @override

diff --git a/packages/amplify_core/lib/src/types/storage/storage_path.dart b/packages/amplify_core/lib/src/types/storage/storage_path.dart
@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import 'package:amplify_core/src/types/storage/storage_path_with_identity_id.dart';
+import 'package:amplify_core/src/types/storage/storage_path_from_identity_id.dart';
 import 'package:meta/meta.dart';
 
 /// And Object that represents the full remote path of a storage item.
@@ -16,8 +16,8 @@ import 'package:meta/meta.dart';
 class StoragePath {
   /// Creates a [StoragePath] from a static string.
   ///
-  /// To create a [StoragePath] with the current user's identity Id, see
-  /// [StoragePath.withIdentityId]
+  /// To create a [StoragePath] from the current user's identity Id, see
+  /// [StoragePath.fromIdentityId]
   ///
   /// ### Example
   /// {@template amplify_core.storage.storage_path.from_string.example}
@@ -27,18 +27,18 @@ class StoragePath {
   /// {@endtemplate}
   const StoragePath.fromString(String path) : _path = path;
 
-  /// {@macro amplify_core.storage.storage_path_with_identity_id}
+  /// {@macro amplify_core.storage.storage_path_from_identity_id}
   ///
   /// ### Example
   /// {@template amplify_core.storage.storage_path.with_identity_id.example}
   /// ```
-  /// const p = StoragePath.withIdentityId((String identityId) => 'users/$identityId/object.png');
+  /// const p = StoragePath.fromIdentityId((String identityId) => 'users/$identityId/object.png');
   /// ```
   /// {@endtemplate}
-  factory StoragePath.withIdentityId(
+  factory StoragePath.fromIdentityId(
     String Function(String identityId) pathBuilder,
   ) =>
-      StoragePathWithIdentityId(pathBuilder);
+      StoragePathFromIdentityId(pathBuilder);
 
   final String _path;
 

diff --git a/packages/amplify_core/lib/src/types/storage/storage_path_from_identity_id.dart b/packages/amplify_core/lib/src/types/storage/storage_path_from_identity_id.dart
@@ -0,0 +1,25 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import 'package:amplify_core/amplify_core.dart';
+import 'package:meta/meta.dart';
+
+/// {@template amplify_core.storage.storage_path_from_identity_id}
+/// Creates a [StoragePath] from the current user's identityId.
+/// {@endtemplate}
+class StoragePathFromIdentityId implements StoragePath {
+  /// {@macro amplify_core.storage.storage_path_from_identity_id}
+  const StoragePathFromIdentityId(this._pathBuilder);
+  final String Function(String identityId) _pathBuilder;
+
+  @internal
+  @override
+  String resolvePath({
+    String? identityId,
+  }) {
+    // identityId has to be optional in order for this to be a valid override.
+    // This API is internal, and is only invoked with non-null values
+    assert(identityId != null, 'identityId must be defined.');
+    return _pathBuilder(identityId!);
+  }
+}
diff --git a/packages/analytics/amplify_analytics_pinpoint/CHANGELOG.md b/packages/analytics/amplify_analytics_pinpoint/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 1.7.1
+
+### Fixes
+- fix: correct `package_info_plus` version constraint ([#4583](https://github.com/aws-amplify/amplify-flutter/pull/4583))
+
 ## 1.7.0
 
 - Minor bug fixes and improvements

diff --git a/packages/analytics/amplify_analytics_pinpoint/example/pubspec.yaml b/packages/analytics/amplify_analytics_pinpoint/example/pubspec.yaml
@@ -25,7 +25,7 @@ dev_dependencies:
     path: ../../../amplify_lints
   aws_common: ">=0.4.0 <0.5.0"
   build_runner: ^2.4.0
-  built_value: ">=8.6.0 <8.9.0"
+  built_value: ^8.6.0
   flutter_test:
     sdk: flutter
   integration_test:

diff --git a/packages/analytics/amplify_analytics_pinpoint/pubspec.yaml b/packages/analytics/amplify_analytics_pinpoint/pubspec.yaml
@@ -1,6 +1,6 @@
 name: amplify_analytics_pinpoint
 description: The Amplify Flutter Analytics category plugin using the AWS Pinpoint provider.
-version: 1.7.0
+version: 1.7.1
 homepage: https://docs.amplify.aws/lib/q/platform/flutter/
 repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/analytics/amplify_analytics_pinpoint
 issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues

diff --git a/...nt_dart/lib/src/impl/analytics_client/endpoint_client/endpoint_global_fields_manager.dart b/...nt_dart/lib/src/impl/analytics_client/endpoint_client/endpoint_global_fields_manager.dart
@@ -76,22 +76,24 @@ class EndpointGlobalFieldsManager {
 
   String _processKey(String key) {
     if (key.length > maxKeyLength) {
+      final trimmedKey = key.substring(0, maxKeyLength);
       _logger.warn(
-        'The key: "$key" ',
+        'The key beginning with: "$trimmedKey" ',
         'has been trimmed to a length of $maxKeyLength characters.',
       );
-      return key.substring(0, maxKeyLength);
+      return trimmedKey;
     }
     return key;
   }
 
   String _processAttributeValue(String value) {
     if (value.length > maxAttributeValueLength) {
+      final trimmedValue = value.substring(0, maxAttributeValueLength);
       _logger.warn(
-        'The attribute value: "$value" ',
+        'The attribute value beginning with: "$trimmedValue" ',
         'has been trimmed to a length of $maxAttributeValueLength characters.',
       );
-      return value.substring(0, maxAttributeValueLength);
+      return trimmedValue;
     }
     return value;
   }

diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/pubspec.yaml b/packages/analytics/amplify_analytics_pinpoint_dart/pubspec.yaml
@@ -15,7 +15,7 @@ dependencies:
   aws_common: ">=0.6.3 <0.7.0"
   aws_signature_v4: ">=0.5.1 <0.6.0"
   built_collection: ^5.0.0
-  built_value: ">=8.6.0 <8.9.0"
+  built_value: ^8.6.0
   collection: ^1.15.0
   drift: ">=2.14.0 <2.15.0"
   intl: ">=0.18.0 <1.0.0"

diff --git a/packages/api/amplify_api_dart/lib/src/graphql/helpers/graphql_response_decoder.dart b/packages/api/amplify_api_dart/lib/src/graphql/helpers/graphql_response_decoder.dart
@@ -99,6 +99,8 @@ class GraphQLResponseDecoder {
           decodePath: request.decodePath,
           variables: variablesWithNextToken,
           modelType: request.modelType,
+          authorizationMode: request.authorizationMode,
+          apiName: request.apiName,
         );
       }
       decodedData = modelType.fromJson(

diff --git a/packages/api/amplify_api_dart/test/graphql_helpers_test.dart b/packages/api/amplify_api_dart/test/graphql_helpers_test.dart
@@ -231,7 +231,11 @@ void main() {
           () async {
         const limit = 2;
         final GraphQLRequest<PaginatedResult<Blog>> req =
-            ModelQueries.list<Blog>(Blog.classType, limit: limit);
+            ModelQueries.list<Blog>(
+          Blog.classType,
+          limit: limit,
+          authorizationMode: APIAuthorizationType.iam,
+        );
 
         const data = '''{
           "listBlogs": {
@@ -263,6 +267,8 @@ void main() {
           response.data?.nextToken,
         );
         expect(resultRequest?.variables['limit'], limit);
+        expect(resultRequest?.authorizationMode, req.authorizationMode);
+        expect(resultRequest?.apiName, req.apiName);
       });
 
       test(

diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/asf/asf_device_info_collector.windows.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/asf/asf_device_info_collector.windows.dart
@@ -214,9 +214,15 @@ final class ASFDeviceInfoWindows extends ASFDeviceInfoPlatform {
   });
 
   @override
+  // TODO(Jordan-Nelson): Use new enums when min win32 version is v5.4.0 or
+  // higher
+  // ignore: deprecated_member_use
   Future<int?> get screenHeightPixels async => GetSystemMetrics(SM_CYSCREEN);
 
   @override
+  // TODO(Jordan-Nelson): Use new enums when min win32 version is v5.4.0 or
+  // higher
+  // ignore: deprecated_member_use
   Future<int?> get screenWidthPixels async => GetSystemMetrics(SM_CXSCREEN);
 
   @override

diff --git a/packages/auth/amplify_auth_cognito_dart/pubspec.yaml b/packages/auth/amplify_auth_cognito_dart/pubspec.yaml
@@ -16,7 +16,7 @@ dependencies:
   aws_common: ">=0.6.3 <0.7.0"
   aws_signature_v4: ">=0.5.1 <0.6.0"
   built_collection: ^5.0.0
-  built_value: ">=8.6.0 <8.9.0"
+  built_value: ^8.6.0
   clock: ^1.1.1
   collection: ^1.15.0
   convert: ^3.0.1

diff --git a/packages/auth/amplify_auth_cognito_test/pubspec.yaml b/packages/auth/amplify_auth_cognito_test/pubspec.yaml
@@ -13,7 +13,7 @@ dependencies:
   async: ^2.10.0
   aws_common: any
   built_collection: ^5.0.0
-  built_value: ">=8.6.0 <8.9.0"
+  built_value: ^8.6.0
   collection: ^1.15.0
   convert: ^3.0.0
   http: ">=0.13.0 <2.0.0"

diff --git a/packages/authenticator/amplify_authenticator/CHANGELOG.md b/packages/authenticator/amplify_authenticator/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 1.5.5
+
+### Fixes
+- fix: correct `package_info_plus` version constraint ([#4583](https://github.com/aws-amplify/amplify-flutter/pull/4583))
+
 ## 1.5.4
 
 - Minor bug fixes and improvements## 1.5.3

diff --git a/packages/authenticator/amplify_authenticator/lib/src/version.dart b/packages/authenticator/amplify_authenticator/lib/src/version.dart
diff --git a/packages/authenticator/amplify_authenticator/pubspec.yaml b/packages/authenticator/amplify_authenticator/pubspec.yaml
@@ -1,6 +1,6 @@
 name: amplify_authenticator
 description: A prebuilt Sign In and Sign Up experience for the Amplify Auth category
-version: 1.5.4
+version: 1.5.5
 homepage: https://ui.docs.amplify.aws/flutter/connected-components/authenticator
 repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/authenticator/amplify_authenticator
 issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues

diff --git a/packages/aws_common/pubspec.yaml b/packages/aws_common/pubspec.yaml
@@ -11,7 +11,7 @@ environment:
 dependencies:
   async: ^2.10.0
   built_collection: ^5.0.0
-  built_value: ">=8.6.0 <8.9.0"
+  built_value: ^8.6.0
   collection: ^1.15.0
   http2: ^2.0.0
   js: ^0.6.4

diff --git a/packages/secure_storage/amplify_secure_storage_dart/lib/src/ffi/win32/data_protection.dart b/packages/secure_storage/amplify_secure_storage_dart/lib/src/ffi/win32/data_protection.dart
@@ -10,6 +10,9 @@ import 'package:win32/win32.dart'
         CryptUnprotectData,
         CRYPT_INTEGER_BLOB,
         GetLastError,
+        // TODO(Jordan-Nelson): Use new enums when min win32 version is v5.4.0 or
+        // higher
+        // ignore: deprecated_member_use
         ERROR_SUCCESS;
 
 /// Encrypts the provided string as a [Uint8List].
@@ -42,6 +45,9 @@ Uint8List encrypt(Uint8List list) {
       encryptedPtr,
     );
     final errorCode = GetLastError();
+    // TODO(Jordan-Nelson): Use new enums when min win32 version is v5.4.0 or
+    // higher
+    // ignore: deprecated_member_use
     if (errorCode != ERROR_SUCCESS) {
       throw getExceptionFromErrorCode(errorCode);
     }
@@ -68,6 +74,9 @@ Uint8List decrypt(Uint8List list) {
       unencryptedPtr,
     );
     final errorCode = GetLastError();
+    // TODO(Jordan-Nelson): Use new enums when min win32 version is v5.4.0 or
+    // higher
+    // ignore: deprecated_member_use
     if (errorCode != ERROR_SUCCESS) {
       throw getExceptionFromErrorCode(errorCode);
     }

diff --git a/packages/secure_storage/amplify_secure_storage_dart/pubspec.yaml b/packages/secure_storage/amplify_secure_storage_dart/pubspec.yaml
@@ -23,7 +23,7 @@ dependencies:
   async: ^2.10.0
   aws_common: ">=0.6.3 <0.7.0"
   built_collection: ^5.0.0
-  built_value: ">=8.6.0 <8.9.0"
+  built_value: ^8.6.0
   ffi: ^2.0.0
   file: ">=6.0.0 <8.0.0"
   js: ^0.6.4

diff --git a/packages/smithy/goldens/lib/awsJson1_0/pubspec.yaml b/packages/smithy/goldens/lib/awsJson1_0/pubspec.yaml
diff --git a/packages/smithy/goldens/lib/awsJson1_1/pubspec.yaml b/packages/smithy/goldens/lib/awsJson1_1/pubspec.yaml
diff --git a/packages/smithy/goldens/lib/awsQuery/pubspec.yaml b/packages/smithy/goldens/lib/awsQuery/pubspec.yaml
diff --git a/packages/smithy/goldens/lib/ec2Query/pubspec.yaml b/packages/smithy/goldens/lib/ec2Query/pubspec.yaml
diff --git a/packages/smithy/goldens/lib/restJson1/pubspec.yaml b/packages/smithy/goldens/lib/restJson1/pubspec.yaml
diff --git a/packages/smithy/goldens/lib/restXml/pubspec.yaml b/packages/smithy/goldens/lib/restXml/pubspec.yaml
diff --git a/packages/smithy/goldens/lib/restXmlWithNamespace/pubspec.yaml b/packages/smithy/goldens/lib/restXmlWithNamespace/pubspec.yaml
diff --git a/packages/smithy/goldens/lib2/awsJson1_0/pubspec.yaml b/packages/smithy/goldens/lib2/awsJson1_0/pubspec.yaml
diff --git a/packages/smithy/goldens/lib2/awsJson1_1/pubspec.yaml b/packages/smithy/goldens/lib2/awsJson1_1/pubspec.yaml
diff --git a/packages/smithy/goldens/lib2/awsQuery/pubspec.yaml b/packages/smithy/goldens/lib2/awsQuery/pubspec.yaml
diff --git a/packages/smithy/goldens/lib2/custom/pubspec.yaml b/packages/smithy/goldens/lib2/custom/pubspec.yaml