chore(version): 0.6.8 (#2135)

* chore(deps): bump file_picker from 4.6.1 to 5.0.1 in /example (#1944) Bumps [file_picker](https://github.com/miguelpruivo/flutter_file_picker) from 4.6.1 to 5.0.1. - [Release notes](https://github.com/miguelpruivo/flutter_file_picker/releases) - [Changelog](https://github.com/miguelpruivo/flutter_file_picker/blob/master/CHANGELOG.md) - [Commits](https://github.com/miguelpruivo/flutter_file_picker/commits) --- updated-dependencies: - dependency-name: file_picker dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jordan Nelson <[email protected]> * chore(auth): enable integration tests in CI (#1886) * chore(repo): Update bug report to include deployment option (#1928) Adds the following info to the bug report template: - Whether the CLI or another mechanism was used to deploy their backend - Their sanitized amplifyconfig These both seem to provide a lot of insight and they can be missed in the conversation, especially the first one. We cannot assume that people filing issues are using pristine Amplify-generated backends. * feat(authenticator): listen to all auth hub events (#2053) * feat: listen to hub events * chore: wait for config completion to listen to hub * chore(api): add field to schema in provision script (#1909) * fix(core): Podspec deployment target (#2099) Fixes an issue surfaced in Flutter 3.3.0 which configures XCode projects based off this value. Previously, if the value was <9, the logic would apply. Now if the value is <11, the logic applies. We don't want this logic to apply. The previous value was incorrect anyway so it's a good change to make regardless. * chore(core): Export `safePrint` from amplify_core And, by extension `amplify_flutter` which already exports `amplify_core`. This aligns the exports with `next`. Fixes #2092. commit-id:4afa07da * fix(storage): Download to existing file Fixes #2105. Fixes an issue where downloading to an existing file will not work on iOS. For whatever reason, it will report progress and success, but will ultimately not overwrite the contents of the file. commit-id:157d4ea3 * chore(storage): Update dependencies commit-id:fa7c4c42 * chore(storage): Download to temp file First downloads to a non-existent file, then copies the file to the location of the original in order to avoid iOS restrictions on overwriting data and potential failures which would result in deletion of the original file. commit-id:7fbfb559 * fix(datastore): cpk errors on a custom type (#2134) * chore: adds platform/category table (#2115) * chore: adds platform/category table * added dev preview matrix to amplify-flutter + root README; removed from package READMEs Co-authored-by: Dustin Noyes <[email protected]> * chore(version): 0.6.8 * ad PR numbers to changelogs Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jordan Nelson <[email protected]> Co-authored-by: Travis Sheppard <[email protected]> Co-authored-by: Dillon Nys <[email protected]> Co-authored-by: Dillon Nys <[email protected]> Co-authored-by: Dustin Noyes <[email protected]> Co-authored-by: Dustin Noyes <[email protected]>
aws-amplify · Sep 19, 2022 · 52a105f · 52a105f
1 parent 8671019
commit 52a105f
Show file tree

Hide file tree

Showing 69 changed files with 766 additions and 470 deletions.
diff --git a/.github/ISSUE_TEMPLATE/BUG-REPORT.yaml b/.github/ISSUE_TEMPLATE/BUG-REPORT.yaml
@@ -128,19 +128,44 @@ body:
       placeholder: "iOS 15.1, Android 11, macOS 12.1, Chrome 101"
     validations:
       required: true
+  - type: dropdown
+    id: deployment-method
+    attributes:
+      label: Deployment Method
+      description: "How do you currently deploy your backend?"
+      multiple: false
+      options:
+        - Amplify CLI
+        - Amplify CLI + Custom Pipeline
+        - Custom Pipeline
+    validations:
+      required: true
   - type: input
     id: cli-version
     attributes:
       label: CLI Version
       description: "Which version of the Amplify CLI are you running? (`amplify -v`)"
       placeholder: "9.1.0"
-    validations:
-      required: true
   - type: textarea
     id: additional-context
     attributes:
       label: Additional Context
-      description: Please add any other context about the problem here.
+      description: > 
+        Please add any other context about the problem here. If you are currently using a custom deployment
+        pipeline, it is helpful to understand how your cloud resources might differ from those provisioned by
+        the Amplify CLI, for example.
       placeholder: "No additional context provided"
     validations:
       required: false
+  - type: textarea
+    id: amplify-config
+    attributes:
+      label: Amplify Config
+      description: Please provide a sanitized version of your Amplify config.
+      placeholder: |
+        {
+          "UserAgent": "aws-amplify-cli/2.0",
+          "Version": "1.0"
+        }
+    validations:
+      required: true
diff --git a/.github/workflows/amplify_integration_tests.yaml b/.github/workflows/amplify_integration_tests.yaml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        scope: ["amplify_api_example", "amplify_storage_s3_example"] # , "amplify_auth_cognito_example"]
+        scope: ["amplify_api_example", "amplify_storage_s3_example", "amplify_auth_cognito_example"]
     steps:
       - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
         with:
@@ -67,7 +67,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        scope: ["amplify_api_example", "amplify_storage_s3_example"] # "amplify_auth_cognito_example"]
+        scope: ["amplify_api_example", "amplify_storage_s3_example", "amplify_auth_cognito_example"]
     steps:
       - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # 2.4.0
         with:

diff --git a/README.md b/README.md
@@ -53,6 +53,30 @@ We are iterating and looking for feedback and collaboration, so please [**let us
   <img src="https://img.shields.io/pub/v/amplify_api.svg">
 </a>
 
+## Category / Platform Support
+
+### Stable Release
+
+| Category       | Android | iOS | Web | Windows | MacOS | Linux |
+| -------------- | ------- | --- | --- | ------- | ----- | ----- |
+| Analytics      | [X]     | [X] | [ ] | [ ]     | [ ]   | [ ]   |
+| API (REST)     | [X]     | [X] | [ ] | [ ]     | [ ]   | [ ]   |
+| API (GraphQL)  | [X]     | [X] | [ ] | [ ]     | [ ]   | [ ]   |
+| Authentication | [X]     | [X] | [ ] | [ ]     | [ ]   | [ ]   |
+| DataStore      | [X]     | [X] | [ ] | [ ]     | [ ]   | [ ]   |
+| Storage        | [X]     | [X] | [ ] | [ ]     | [ ]   | [ ]   |
+
+### Developer Preview Release
+
+| Category       | Android | iOS | Web | Windows | MacOS | Linux |
+| -------------- | ------- | --- | --- | ------- | ----- | ----- |
+| Analytics      | [ ]     | [X] | [ ] | [ ]     | [ ]   | [ ]   |
+| API (REST)     | [X]     | [X] | [ ] | [ ]     | [ ]   | [ ]   |
+| API (GraphQL)  | [X]     | [X] | [ ] | [ ]     | [ ]   | [ ]   |
+| Authentication | [X]     | [X] | [X] | [X]     | [X]   | [X]   |
+| DataStore      | [X]     | [X] | [ ] | [ ]     | [ ]   | [ ]   |
+| Storage        | [X]     | [X] | [ ] | [ ]     | [ ]   | [ ]   |
+
 ### To Be Implemented
 
 - [ ] Predictions

diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -24,7 +24,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  file_picker: ^4.0.0
+  file_picker: ^5.0.1
   amplify_flutter: 0.6.5
   amplify_analytics_pinpoint: 0.6.5
   amplify_auth_cognito: 0.6.5

diff --git a/packages/amplify/amplify_flutter/CHANGELOG.md b/packages/amplify/amplify_flutter/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 0.6.8 (2022-09-19)
+
+- feat(authenticator): listen to all auth hub events (#2053)
+
+- fix(core): Podspec deployment target (#2099)
+- fix(storage): Download to existing file (#2116)
+- fix(datastore): cpk errors on a custom type (#2134)
+
+- chore(core): Export `safePrint` from amplify_core (#2114)
+- chore(auth): enable integration tests in CI (#1886)
+- chore(repo): Update bug report to include deployment option (#1928)
+- chore(api): add field to schema in provision script (#1909)
+- chore(storage): Update dependencies (#2116)
+- chore(storage): Download to temp file (#2116)
+- chore: adds platform/category table (#2115)
+
 ## 0.6.7 (2022-09-07)
 
 - fix: Podspec deployment target ([#2099](https://github.com/aws-amplify/amplify-flutter/pull/2099))

diff --git a/packages/amplify/amplify_flutter/README.md b/packages/amplify/amplify_flutter/README.md
@@ -2,6 +2,30 @@
 
 The top level module for Amplify Flutter.
 
+## Category / Platform Support
+
+### Stable Release
+
+| Category       | Android | iOS | Web | Windows | MacOS | Linux |
+| -------------- | ------- | --- | --- | ------- | ----- | ----- |
+| Analytics      | [X]     | [X] | [ ] | [ ]     | [ ]   | [ ]   |
+| API (REST)     | [X]     | [X] | [ ] | [ ]     | [ ]   | [ ]   |
+| API (GraphQL)  | [X]     | [X] | [ ] | [ ]     | [ ]   | [ ]   |
+| Authentication | [X]     | [X] | [ ] | [ ]     | [ ]   | [ ]   |
+| DataStore      | [X]     | [X] | [ ] | [ ]     | [ ]   | [ ]   |
+| Storage        | [X]     | [X] | [ ] | [ ]     | [ ]   | [ ]   |
+
+### Developer Preview Release
+
+| Category       | Android | iOS | Web | Windows | MacOS | Linux |
+| -------------- | ------- | --- | --- | ------- | ----- | ----- |
+| Analytics      | [ ]     | [X] | [ ] | [ ]     | [ ]   | [ ]   |
+| API (REST)     | [X]     | [X] | [ ] | [ ]     | [ ]   | [ ]   |
+| API (GraphQL)  | [X]     | [X] | [ ] | [ ]     | [ ]   | [ ]   |
+| Authentication | [X]     | [X] | [X] | [X]     | [X]   | [X]   |
+| DataStore      | [X]     | [X] | [ ] | [ ]     | [ ]   | [ ]   |
+| Storage        | [X]     | [X] | [ ] | [ ]     | [ ]   | [ ]   |
+
 ## Getting Started
 
 ### Visit our [Web Site](https://docs.amplify.aws/) to learn more about AWS Amplify.
diff --git a/packages/amplify/amplify_flutter/lib/src/amplify_impl.dart b/packages/amplify/amplify_flutter/lib/src/amplify_impl.dart
@@ -133,7 +133,7 @@ abstract class AmplifyClass {
   static AmplifyClass instance = AmplifyClass();
 
   /// The library version.
-  String get version => '0.6.7';
+  String get version => '0.6.8';
 
   /// Resets the Amplify implementation, removing all traces of Amplify from
   /// the device.

diff --git a/packages/amplify/amplify_flutter/pubspec.yaml b/packages/amplify/amplify_flutter/pubspec.yaml
@@ -1,6 +1,6 @@
 name: amplify_flutter
 description: The top level Flutter package for the AWS Amplify libraries.
-version: 0.6.7
+version: 0.6.8
 homepage: https://docs.amplify.aws/lib/q/platform/flutter/
 repository: https://github.com/aws-amplify/amplify-flutter
 issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues
@@ -10,10 +10,10 @@ environment:
   flutter: ">=2.10.0"
 
 dependencies:
-  amplify_core: 0.6.7
-  amplify_datastore_plugin_interface: 0.6.7
-  amplify_flutter_android: 0.6.7
-  amplify_flutter_ios: 0.6.7
+  amplify_core: 0.6.8
+  amplify_datastore_plugin_interface: 0.6.8
+  amplify_flutter_android: 0.6.8
+  amplify_flutter_ios: 0.6.8
   aws_common: ^0.1.1
   collection: ^1.15.0
   flutter:
@@ -39,12 +39,12 @@ dependencies:
 #     path: ../amplify_storage_s3
 
 dev_dependencies:
-  amplify_analytics_pinpoint: 0.6.7
-  amplify_api: 0.6.7
-  amplify_auth_cognito: 0.6.7
-  amplify_datastore: 0.6.7
+  amplify_analytics_pinpoint: 0.6.8
+  amplify_api: 0.6.8
+  amplify_auth_cognito: 0.6.8
+  amplify_datastore: 0.6.8
   amplify_lints: ^1.0.0
-  amplify_storage_s3: 0.6.7
+  amplify_storage_s3: 0.6.8
   amplify_test:
     path: ../../amplify_test
   build_runner: ^2.0.0

diff --git a/packages/amplify/amplify_flutter_android/CHANGELOG.md b/packages/amplify/amplify_flutter_android/CHANGELOG.md
@@ -1,3 +1,5 @@
+## 0.6.8 (2022-09-19)
+
 ## 0.6.7 (2022-09-07)
 
 ## 0.6.6 (2022-08-16)

diff --git a/packages/amplify/amplify_flutter_android/pubspec.yaml b/packages/amplify/amplify_flutter_android/pubspec.yaml
@@ -1,6 +1,6 @@
 name: amplify_flutter_android
 description: The method channel implementation for amplify_flutter on Android
-version: 0.6.7
+version: 0.6.8
 homepage: https://docs.amplify.aws/lib/q/platform/flutter/
 repository: https://github.com/aws-amplify/amplify-flutter
 issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues

diff --git a/packages/amplify/amplify_flutter_ios/CHANGELOG.md b/packages/amplify/amplify_flutter_ios/CHANGELOG.md
@@ -1,3 +1,5 @@
+## 0.6.8 (2022-09-19)
+
 ## 0.6.7 (2022-09-07)
 
 ## 0.6.6 (2022-08-16)

diff --git a/packages/amplify/amplify_flutter_ios/pubspec.yaml b/packages/amplify/amplify_flutter_ios/pubspec.yaml
@@ -1,6 +1,6 @@
 name: amplify_flutter_ios
 description: The method channel implementation for amplify_flutter on iOS
-version: 0.6.7
+version: 0.6.8
 homepage: https://docs.amplify.aws/lib/q/platform/flutter/
 repository: https://github.com/aws-amplify/amplify-flutter
 issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues
@@ -10,7 +10,7 @@ environment:
   flutter: ">=2.10.0"
 
 dependencies:
-  amplify_core: 0.6.7
+  amplify_core: 0.6.8
   flutter:
     sdk: flutter
 

diff --git a/packages/amplify_authenticator/CHANGELOG.md b/packages/amplify_authenticator/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.2.3 (2022-09-19)
+
+- feat(authenticator): listen to all auth hub events (#2053)
+
 ## 0.2.2 (2022-06-30)
 
 - chore(authenticator): Update versions on the README ([#1854](https://github.com/aws-amplify/amplify-flutter/pull/1854))

diff --git a/packages/amplify_authenticator/example/integration_test/pages/authenticator_page.dart b/packages/amplify_authenticator/example/integration_test/pages/authenticator_page.dart
@@ -97,6 +97,15 @@ abstract class AuthenticatorPage {
     expect(inheritedBloc.authBloc.currentState, isA<AuthenticatedState>());
   }
 
+  Future<void> expectState(AuthState state) async {
+    final inheritedBloc =
+        tester.widget<InheritedAuthBloc>(find.byKey(keyInheritedAuthBloc));
+    if (inheritedBloc.authBloc.currentState != state) {
+      await nextBlocEvent(tester);
+    }
+    expect(inheritedBloc.authBloc.currentState, state);
+  }
+
   /// Then I see User not found banner
   Future<void> expectUserNotFound() async => expectError(
         Platform.isAndroid ? 'User not found' : 'User does not exist',

diff --git a/packages/amplify_authenticator/example/integration_test/verify_user_test.dart b/packages/amplify_authenticator/example/integration_test/verify_user_test.dart
@@ -17,6 +17,7 @@
 // https://github.com/aws-amplify/amplify-ui/blob/main/packages/e2e/features/ui/components/authenticator/verify-user.feature
 
 import 'package:amplify_authenticator/amplify_authenticator.dart';
+import 'package:amplify_authenticator/src/state/auth_state.dart';
 import 'package:amplify_flutter/amplify_flutter.dart';
 import 'package:amplify_test/amplify_test.dart';
 import 'package:flutter/material.dart';
@@ -78,6 +79,9 @@ void main() {
       // And I click the "Sign in" button
       await signInPage.submitSignIn();
 
+      // Wait for verify user state
+      await verifyUserPage.expectState(UnauthenticatedState.verifyUser);
+
       // Then I see "Account recovery requires verified contact information"
       verifyUserPage.expectTitleIsVisible();
     });
@@ -102,6 +106,9 @@ void main() {
       // And I click the "Sign in" button
       await signInPage.submitSignIn();
 
+      // Wait for verify user state
+      await verifyUserPage.expectState(UnauthenticatedState.verifyUser);
+
       // And I click the "Skip" button
       await verifyUserPage.tapSkipButton();
 
@@ -132,6 +139,9 @@ void main() {
       // And I click the "Sign in" button
       await signInPage.submitSignIn();
 
+      // Wait for verify user state
+      await verifyUserPage.expectState(UnauthenticatedState.verifyUser);
+
       // And I see "Account recovery requires verified contact information"
       verifyUserPage.expectTitleIsVisible();
 
@@ -144,5 +154,24 @@ void main() {
       // Then I see "Code"
       confirmVerifyUserPage.expectCodeFieldIsPresent();
     });
+
+    testWidgets('Auth.signIn does not redirect to "Verify" page',
+        (tester) async {
+      SignInPage signInPage = SignInPage(tester: tester);
+      await loadAuthenticator(tester: tester, authenticator: authenticator);
+
+      final username = generateEmail();
+      final password = generatePassword();
+
+      await adminCreateUser(username, password, autoConfirm: true);
+
+      // When I sign in with username and password.
+      await Amplify.Auth.signIn(username: username, password: password);
+
+      await tester.pumpAndSettle();
+
+      // Then I see "Sign out"
+      await signInPage.expectAuthenticated();
+    });
   });
 }
diff --git a/packages/amplify_authenticator/example/pubspec.yaml b/packages/amplify_authenticator/example/pubspec.yaml
@@ -22,10 +22,10 @@ environment:
   flutter: ">=2.10.0"
 
 dependencies:
-  amplify_auth_cognito: 0.6.7
+  amplify_auth_cognito: 0.6.8
   amplify_authenticator:
     path: ../
-  amplify_flutter: 0.6.7
+  amplify_flutter: 0.6.8
 
   flutter:
     sdk: flutter
@@ -38,7 +38,7 @@ dependencies:
     sdk: flutter
 
 dev_dependencies:
-  amplify_api: 0.6.7
+  amplify_api: 0.6.8
   amplify_lints: ^1.0.0
   amplify_test:
     path: ../../amplify_test

diff --git a/packages/amplify_authenticator/lib/amplify_authenticator.dart b/packages/amplify_authenticator/lib/amplify_authenticator.dart
@@ -483,7 +483,6 @@ class _AuthenticatorState extends State<Authenticator> {
     _subscribeToInfoMessages();
     _subscribeToSuccessEvents();
     _waitForConfiguration();
-    _setUpHubSubscription();
   }
 
   void _subscribeToExceptions() {
@@ -571,20 +570,6 @@ class _AuthenticatorState extends State<Authenticator> {
     });
   }
 
-  Future<void> _setUpHubSubscription() async {
-    // the stream does not exist until configuration is complete
-    await Amplify.asyncConfig;
-    _hubSubscription = Amplify.Hub.listen([HubChannel.Auth], (event) {
-      switch (event.eventName) {
-        case 'SIGNED_OUT':
-          _stateMachineBloc.add(
-            const AuthChangeScreen(AuthenticatorStep.signIn),
-          );
-          break;
-      }
-    });
-  }
-
   @override
   void dispose() {
     _exceptionSub.cancel();