Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Null safety branch #698

Merged
merged 19 commits into from
Jul 6, 2021

Conversation

cshfang
Copy link
Member

@cshfang cshfang commented Jul 3, 2021

Description of changes:

This PR merges master back into null-safety (essentially only adds an empty merge commit but will allow a clean merge to bring the branch back into the master history)

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

Jordan-Nelson and others added 19 commits June 7, 2021 09:56
* set amplify ios to '~> 1.9'

* set amplify ios to '~> 1.9.2'

* add 'ObjectMapper' back to podspec

Co-authored-by: Ashish Nanda <[email protected]>
* feat: add auth.updateUserAttributes

* Apply suggestions from code review

Co-authored-by: Chris F <[email protected]>

* address pr comments

* refactor android user attributes

* consolidate user attr logic on iOS

* refactor deliveryDetails serialization

* add missing newline

* revert missing attribute changes

* update serializeAuthUpdateAttributeResult for nil

* move comment to to of file

* bump amplify-android to 1.17.7

Co-authored-by: Chris F <[email protected]>
…available from REST response (aws-amplify#590)

Add integer property httpStatusCode to ApiException. In android and iOS, look for the status code in the response/error object and add to the serialized map. In flutter, add the new property to the serialization logic specifically for ApiException.
* remove check for dup err cb

* bump amplify-android to version 1.17.8
* feat: add auth.updateUserAttributes

* Apply suggestions from code review

Co-authored-by: Chris F <[email protected]>

* address pr comments

* refactor android user attributes

* consolidate user attr logic on iOS

* refactor deliveryDetails serialization

* add missing newline

* revert missing attribute changes

* update serializeAuthUpdateAttributeResult for nil

* move comment to to of file

* bump amplify-android to 1.17.7

* iOS: handle missing and custom attributes

* add constant for customKeyPrefix

Co-authored-by: Chris F <[email protected]>
* refactor: Minor refactor of DataStore methods

* Free up `configure` method for native passthrough

* Move observe configuration into its own explicit method

* Corrected observe setup method in swift to call the invokeMethod callback so the call can be properly awaited upon in dart layer

* Broaden `configureDataStore` naming to convey more than model provider being able to be configured through this method

* Allow plugins to be added in parallel instead of in a series

* Update unit tests to correctly assert observe call result

* Remove setUpObserve API. Restore setUpObserve call to configure

* feat(datastore) Allow configure DataStore with custom configuration

* Reintroduce configureModelProvider as deprecated method

* chore(datastore) Add unit tests for custom DataStore configuration

* Update configure to not throw error if DataStore plugin is not found

* Split datastore configuration unit tests by use cases

Co-authored-by: Chris Fang <[email protected]>
* Use dart pub in melos.yaml

* Fix all references to 'pub _' with 'flutter pub _'

* Work around hanging build; don't install in postbootstrap
* add --no-pub to integration tests

* fix typo
* chore: Add CircleCI badge

* fix: changed badge hyperlink

* fix: badage now points towards master branch

* Update README.md

Co-authored-by: Jordan Nelson <[email protected]>

Co-authored-by: Jordan Nelson <[email protected]>
* fix: amplify-ios version bump ~> 1.11.0

* chore: release 0.1.6

* Update CHANGELOG.md

Co-authored-by: Noyes <[email protected]>
@fjnoyp fjnoyp assigned fjnoyp and unassigned fjnoyp Jul 6, 2021
@fjnoyp fjnoyp self-requested a review July 6, 2021 13:32
Copy link
Contributor

@fjnoyp fjnoyp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good thanks again for doing this! This is the same result I got when doing the merge as well.

@cshfang cshfang merged commit c3112be into aws-amplify:null-safety-branch Jul 6, 2021
@cshfang cshfang deleted the null-safety-branch branch July 6, 2021 16:58
cshfang added a commit that referenced this pull request Jul 6, 2021
* feat(amplify): Null Safety Core (#492)

Null Safety upgrade for (to min Dart 2.12):
Core
Flutter
All Plugin Interface Packages

* feat(amplify_auth): Null Safety Auth (#536)

* feat(amplify_analytics): Null safety (#483)

* feat(amplify_storage_s3): Null safety (#485)

* feat(amplify_api): Null safety api (#484)

* fix: Broken Unit Tests

* fix: upgrade Auth changes to null safety

* fix: Broken Auth Unit Tests

* fix(amplify_auth_cognito): fixes auth null safety issues (#613)

* Example app null safety fixes (#617)

* Null safety master fixes pr (#614)

* chore(release): 0.2.0-nullsafety.0 (#622)

* Version Update to 0.2.0-nullsafety.0

* Update amplify.dart

Co-authored-by: Dustin Noyes <[email protected]>

* Update FlutterFetchCognitoAuthSessionResult.kt (#653)

* Null safety datastore (#649)

* chore: release 0.2.0-nullsafety.1 (#656)

* bug(datastore): HubEvent null check (#670)

* Fix HubEventElements for NS

* Refactor and add tests

* Null safety master rebase (#676)

* chore: pin Amplify iOS to '~> 1.9.2' (#589)

* set amplify ios to '~> 1.9'

* set amplify ios to '~> 1.9.2'

* add 'ObjectMapper' back to podspec

Co-authored-by: Ashish Nanda <[email protected]>

* chore: foundation for integration tests and basic auth suite with signIn and signOut (#568)

* feat(auth): add updateUserAttributes (batch) (#601)

* feat: add auth.updateUserAttributes

* Apply suggestions from code review

Co-authored-by: Chris F <[email protected]>

* address pr comments

* refactor android user attributes

* consolidate user attr logic on iOS

* refactor deliveryDetails serialization

* add missing newline

* revert missing attribute changes

* update serializeAuthUpdateAttributeResult for nil

* move comment to to of file

* bump amplify-android to 1.17.7

Co-authored-by: Chris F <[email protected]>

* chore(amplify_api): add httpStatusCode property to ApiException when available from REST response (#590)

Add integer property httpStatusCode to ApiException. In android and iOS, look for the status code in the response/error object and add to the serialized map. In flutter, add the new property to the serialization logic specifically for ApiException.

* fix(auth): Add clientMetadata to confirmSignUp API options (#619)

* Chore: remove check for duplicate error in Storage (#618)

* remove check for dup err cb

* bump amplify-android to version 1.17.8

* fix(auth): iOS/Android user attribute inconsistencies  (#620)

* feat: add auth.updateUserAttributes

* Apply suggestions from code review

Co-authored-by: Chris F <[email protected]>

* address pr comments

* refactor android user attributes

* consolidate user attr logic on iOS

* refactor deliveryDetails serialization

* add missing newline

* revert missing attribute changes

* update serializeAuthUpdateAttributeResult for nil

* move comment to to of file

* bump amplify-android to 1.17.7

* iOS: handle missing and custom attributes

* add constant for customKeyPrefix

Co-authored-by: Chris F <[email protected]>

* Add support of DataStore custom configuration (#610)

* refactor: Minor refactor of DataStore methods

* Free up `configure` method for native passthrough

* Move observe configuration into its own explicit method

* Corrected observe setup method in swift to call the invokeMethod callback so the call can be properly awaited upon in dart layer

* Broaden `configureDataStore` naming to convey more than model provider being able to be configured through this method

* Allow plugins to be added in parallel instead of in a series

* Update unit tests to correctly assert observe call result

* Remove setUpObserve API. Restore setUpObserve call to configure

* feat(datastore) Allow configure DataStore with custom configuration

* Reintroduce configureModelProvider as deprecated method

* chore(datastore) Add unit tests for custom DataStore configuration

* Update configure to not throw error if DataStore plugin is not found

* Split datastore configuration unit tests by use cases

Co-authored-by: Chris Fang <[email protected]>

* Use "flutter pub" in melos.yaml (and everywhere else) (#603)

* Use dart pub in melos.yaml

* Fix all references to 'pub _' with 'flutter pub _'

* Work around hanging build; don't install in postbootstrap

* fix(tests): add --no-pub to integration tests (#637)

* add --no-pub to integration tests

* fix typo

* fix: CONTRIBUTING Dead Links (#630)

* fix(amplify_auth_cognito): adds userAttributes to confirmSignIn (#607)

* chore: Add CircleCI badge (#631)

* chore: Add CircleCI badge

* fix: changed badge hyperlink

* fix: badage now points towards master branch

* Update README.md

Co-authored-by: Jordan Nelson <[email protected]>

Co-authored-by: Jordan Nelson <[email protected]>

* chore: upgrade amplify-android to 1.19.0 (#650)

* fix: amplify-ios version bump (#648)

* fix: amplify-ios version bump ~> 1.11.0 (#665)

* chore: release 0.1.6 (#667)

* fix: amplify-ios version bump ~> 1.11.0

* chore: release 0.1.6

* Update CHANGELOG.md

Co-authored-by: Noyes <[email protected]>

* Pagination with Datastore #500 (#673)

* Fix compile errors

* Fix broken unit tests

* Fix Android Unit Tests

* fix(amplify_datastore): force cast exception codegen

1) add new exception for force cast in codegen models

# Conflicts:
#	packages/amplify_datastore_plugin_interface/lib/src/publicTypes.dart

* Fix ios unit tests

This file was corrupted during the rebase

* Update codegen models to latest

* PR Comments

* Fix Android Unit Tests

* Last PR Comment

Co-authored-by: Jordan Nelson <[email protected]>
Co-authored-by: Ashish Nanda <[email protected]>
Co-authored-by: Travis Sheppard <[email protected]>
Co-authored-by: Chris F <[email protected]>
Co-authored-by: Hui Zhao <[email protected]>
Co-authored-by: Chris Fang <[email protected]>
Co-authored-by: A.J. Gardner <[email protected]>
Co-authored-by: Elijah Quartey <[email protected]>
Co-authored-by: Dustin Noyes <[email protected]>
Co-authored-by: Noyes <[email protected]>
Co-authored-by: Mo Malaka <[email protected]>

* fix(amplify_datstore): mprovider compile issue (#681)

* chore: remove deprecated method - configureModelProvider

* Revert "chore: remove deprecated method - configureModelProvider"

This reverts commit 00dbc7a.

* Revert "Revert "chore: remove deprecated method - configureModelProvider"" (#682)

remove deprecated method - configureModelProvider

Co-authored-by: Chris Fang <[email protected]>

* fix(Auth): Remove use of TypeToken (#683)

* remove use of type token from auth session

* remove TypeToken from exception util

* fix(auth): update user attribute serialization (#684)

* update user attr res serialization

* update unit tests

* Fix enum string function (#687)

* Fix enum string function

* Update logic

* Revert "Update logic"

This reverts commit 75d257a.

* fix(auth): uses nextStep helper for signInResult on Android (#689)

* chore: release 0.2.0 (#690)

* Null safety branch (#698)

* chore: pin Amplify iOS to '~> 1.9.2' (#589)

* set amplify ios to '~> 1.9'

* set amplify ios to '~> 1.9.2'

* add 'ObjectMapper' back to podspec

Co-authored-by: Ashish Nanda <[email protected]>

* chore: foundation for integration tests and basic auth suite with signIn and signOut (#568)

* feat(auth): add updateUserAttributes (batch) (#601)

* feat: add auth.updateUserAttributes

* Apply suggestions from code review

Co-authored-by: Chris F <[email protected]>

* address pr comments

* refactor android user attributes

* consolidate user attr logic on iOS

* refactor deliveryDetails serialization

* add missing newline

* revert missing attribute changes

* update serializeAuthUpdateAttributeResult for nil

* move comment to to of file

* bump amplify-android to 1.17.7

Co-authored-by: Chris F <[email protected]>

* chore(amplify_api): add httpStatusCode property to ApiException when available from REST response (#590)

Add integer property httpStatusCode to ApiException. In android and iOS, look for the status code in the response/error object and add to the serialized map. In flutter, add the new property to the serialization logic specifically for ApiException.

* fix(auth): Add clientMetadata to confirmSignUp API options (#619)

* Chore: remove check for duplicate error in Storage (#618)

* remove check for dup err cb

* bump amplify-android to version 1.17.8

* fix(auth): iOS/Android user attribute inconsistencies  (#620)

* feat: add auth.updateUserAttributes

* Apply suggestions from code review

Co-authored-by: Chris F <[email protected]>

* address pr comments

* refactor android user attributes

* consolidate user attr logic on iOS

* refactor deliveryDetails serialization

* add missing newline

* revert missing attribute changes

* update serializeAuthUpdateAttributeResult for nil

* move comment to to of file

* bump amplify-android to 1.17.7

* iOS: handle missing and custom attributes

* add constant for customKeyPrefix

Co-authored-by: Chris F <[email protected]>

* Add support of DataStore custom configuration (#610)

* refactor: Minor refactor of DataStore methods

* Free up `configure` method for native passthrough

* Move observe configuration into its own explicit method

* Corrected observe setup method in swift to call the invokeMethod callback so the call can be properly awaited upon in dart layer

* Broaden `configureDataStore` naming to convey more than model provider being able to be configured through this method

* Allow plugins to be added in parallel instead of in a series

* Update unit tests to correctly assert observe call result

* Remove setUpObserve API. Restore setUpObserve call to configure

* feat(datastore) Allow configure DataStore with custom configuration

* Reintroduce configureModelProvider as deprecated method

* chore(datastore) Add unit tests for custom DataStore configuration

* Update configure to not throw error if DataStore plugin is not found

* Split datastore configuration unit tests by use cases

Co-authored-by: Chris Fang <[email protected]>

* Use "flutter pub" in melos.yaml (and everywhere else) (#603)

* Use dart pub in melos.yaml

* Fix all references to 'pub _' with 'flutter pub _'

* Work around hanging build; don't install in postbootstrap

* fix(tests): add --no-pub to integration tests (#637)

* add --no-pub to integration tests

* fix typo

* fix: CONTRIBUTING Dead Links (#630)

* fix(amplify_auth_cognito): adds userAttributes to confirmSignIn (#607)

* chore: Add CircleCI badge (#631)

* chore: Add CircleCI badge

* fix: changed badge hyperlink

* fix: badage now points towards master branch

* Update README.md

Co-authored-by: Jordan Nelson <[email protected]>

Co-authored-by: Jordan Nelson <[email protected]>

* chore: upgrade amplify-android to 1.19.0 (#650)

* fix: amplify-ios version bump (#648)

* fix: amplify-ios version bump ~> 1.11.0 (#665)

* chore: release 0.1.6 (#667)

* fix: amplify-ios version bump ~> 1.11.0

* chore: release 0.1.6

* Update CHANGELOG.md

Co-authored-by: Noyes <[email protected]>

* Pagination with Datastore #500 (#673)

Co-authored-by: Jordan Nelson <[email protected]>
Co-authored-by: Ashish Nanda <[email protected]>
Co-authored-by: Travis Sheppard <[email protected]>
Co-authored-by: Hui Zhao <[email protected]>
Co-authored-by: Chris Fang <[email protected]>
Co-authored-by: A.J. Gardner <[email protected]>
Co-authored-by: Elijah Quartey <[email protected]>
Co-authored-by: Dustin Noyes <[email protected]>
Co-authored-by: Noyes <[email protected]>
Co-authored-by: Mo Malaka <[email protected]>

Co-authored-by: Kyle <[email protected]>
Co-authored-by: Dustin Noyes <[email protected]>
Co-authored-by: Mo Malaka <[email protected]>
Co-authored-by: Leonardo Custodio <[email protected]>
Co-authored-by: Dillon Nys <[email protected]>
Co-authored-by: Jordan Nelson <[email protected]>
Co-authored-by: Ashish Nanda <[email protected]>
Co-authored-by: Travis Sheppard <[email protected]>
Co-authored-by: Hui Zhao <[email protected]>
Co-authored-by: Chris Fang <[email protected]>
Co-authored-by: A.J. Gardner <[email protected]>
Co-authored-by: Elijah Quartey <[email protected]>
Co-authored-by: Noyes <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants