From 2de8c951b00a4a9607fa035a1627e0ea2beb50dc Mon Sep 17 00:00:00 2001 From: NikaHsn Date: Thu, 13 Jun 2024 09:50:20 -0700 Subject: [PATCH] fix(core): improve amplify configure api error message (#5021) --- .../amplify_core/lib/src/amplify_class.dart | 3 +- .../lib/src/config/amplify_config.g.dart | 56 +++++--- .../config/analytics/analytics_config.g.dart | 12 +- .../config/analytics/pinpoint_config.g.dart | 41 ++++-- .../lib/src/config/api/api_config.g.dart | 12 +- .../src/config/api/appsync/api_config.g.dart | 23 ++- .../lib/src/config/auth/auth_config.g.dart | 12 +- .../src/config/auth/cognito/appsync.g.dart | 28 +++- .../lib/src/config/auth/cognito/auth.g.dart | 78 ++++++---- .../auth/cognito/credentials_provider.g.dart | 14 +- .../auth/cognito/identity_manager.g.dart | 9 +- .../lib/src/config/auth/cognito/oauth.g.dart | 73 +++++++--- .../password_protection_settings.g.dart | 26 ++-- .../auth/cognito/pinpoint_analytics.g.dart | 14 +- .../auth/cognito/pinpoint_targeting.g.dart | 12 +- .../auth/cognito/s3_transfer_utility.g.dart | 14 +- .../src/config/auth/cognito/user_pool.g.dart | 37 +++-- .../lib/src/config/auth/cognito_config.g.dart | 133 +++++++++++------- .../lib/src/config/config_map.g.dart | 17 ++- .../notifications/notifications_config.g.dart | 12 +- .../notifications_pinpoint_config.g.dart | 13 +- .../lib/src/config/storage/s3_config.g.dart | 13 +- .../src/config/storage/storage_config.g.dart | 12 +- .../auth_next_update_attribute_step.g.dart | 31 ++-- .../auth/attribute/auth_user_attribute.g.dart | 17 ++- ..._attribute_verification_code_result.g.dart | 15 +- .../update_user_attribute_result.g.dart | 17 ++- .../auth/auth_code_delivery_details.g.dart | 21 ++- .../auth/password/reset_password_step.g.dart | 31 ++-- .../sign_in/auth_next_sign_in_step.g.dart | 60 +++++--- .../types/auth/sign_in/sign_in_result.g.dart | 16 ++- .../sign_up/auth_next_sign_up_step.g.dart | 30 ++-- .../sign_up/resend_sign_up_code_result.g.dart | 15 +- .../types/auth/sign_up/sign_up_result.g.dart | 19 ++- .../lib/src/util/serializable.dart | 3 + ...nfirm_user_attribute_plugin_options.g.dart | 9 +- ...etch_user_attributes_plugin_options.g.dart | 9 +- ...te_verification_code_plugin_options.g.dart | 18 ++- ...pdate_user_attribute_plugin_options.g.dart | 18 ++- ...date_user_attributes_plugin_options.g.dart | 18 ++- ...to_verify_totp_setup_plugin_options.g.dart | 12 +- ...nfirm_reset_password_plugin_options.g.dart | 18 ++- ...gnito_reset_password_plugin_options.g.dart | 17 ++- .../cognito_reset_password_result.g.dart | 15 +- ...nito_update_password_plugin_options.g.dart | 9 +- .../model/session/cognito_auth_user.g.dart | 17 ++- ...o_fetch_auth_session_plugin_options.g.dart | 9 +- ...ito_get_current_user_plugin_options.g.dart | 9 +- .../session/cognito_sign_in_details.g.dart | 48 +++++-- .../session/cognito_user_pool_tokens.g.dart | 29 ++-- .../federate_to_identity_pool_options.g.dart | 13 +- .../federate_to_identity_pool_request.g.dart | 24 +++- .../federate_to_identity_pool_result.g.dart | 15 +- ...nito_confirm_sign_in_plugin_options.g.dart | 28 ++-- .../cognito_sign_in_plugin_options.g.dart | 24 +++- ..._sign_in_with_web_ui_plugin_options.g.dart | 16 ++- .../cognito_sign_out_plugin_options.g.dart | 9 +- ...nito_confirm_sign_up_plugin_options.g.dart | 20 ++- ..._resend_sign_up_code_plugin_options.g.dart | 21 ++- .../cognito_sign_up_plugin_options.g.dart | 25 +++- .../lib/src/state/state/auth_state.g.dart | 38 +++-- .../src/model/s3_copy_plugin_options.g.dart | 12 +- .../lib/src/model/s3_data_bytes_range.g.dart | 13 +- .../s3_download_data_plugin_options.g.dart | 24 +++- .../s3_download_file_plugin_options.g.dart | 15 +- .../s3_get_properties_plugin_options.g.dart | 9 +- .../model/s3_get_url_plugin_options.g.dart | 24 +++- .../lib/src/model/s3_item.g.dart | 35 +++-- .../src/model/s3_list_plugin_options.g.dart | 14 +- .../s3_remove_many_plugin_options.g.dart | 9 +- .../src/model/s3_remove_plugin_options.g.dart | 9 +- .../s3_upload_data_plugin_options.g.dart | 15 +- .../s3_upload_file_plugin_options.g.dart | 15 +- 73 files changed, 1175 insertions(+), 446 deletions(-) diff --git a/packages/amplify_core/lib/src/amplify_class.dart b/packages/amplify_core/lib/src/amplify_class.dart index 126639dd3a..f2ad8a3fdc 100644 --- a/packages/amplify_core/lib/src/amplify_class.dart +++ b/packages/amplify_core/lib/src/amplify_class.dart @@ -117,13 +117,14 @@ abstract class AmplifyClass { try { final json = jsonDecode(configuration) as Map; amplifyConfig = AmplifyConfig.fromJson(json.cast()); - } on Object { + } on Object catch (e) { throw ConfigurationError( 'The provided configuration is not a valid json. ' 'Check underlyingException.', recoverySuggestion: 'Inspect your amplifyconfiguration.dart and ensure that ' 'the string is proper json', + underlyingException: e, ); } await _configurePlugins(amplifyConfig); diff --git a/packages/amplify_core/lib/src/config/amplify_config.g.dart b/packages/amplify_core/lib/src/config/amplify_config.g.dart index c94be213cc..73b0b05295 100644 --- a/packages/amplify_core/lib/src/config/amplify_config.g.dart +++ b/packages/amplify_core/lib/src/config/amplify_config.g.dart @@ -9,25 +9,43 @@ part of 'amplify_config.dart'; // ************************************************************************** AmplifyConfig _$AmplifyConfigFromJson(Map json) => - AmplifyConfig( - userAgent: json['UserAgent'] as String? ?? 'aws-amplify-cli/2.0', - version: json['Version'] as String? ?? '1.0', - api: json['api'] == null - ? null - : ApiConfig.fromJson(json['api'] as Map), - analytics: json['analytics'] == null - ? null - : AnalyticsConfig.fromJson(json['analytics'] as Map), - auth: json['auth'] == null - ? null - : AuthConfig.fromJson(json['auth'] as Map), - notifications: json['notifications'] == null - ? null - : NotificationsConfig.fromJson( - json['notifications'] as Map), - storage: json['storage'] == null - ? null - : StorageConfig.fromJson(json['storage'] as Map), + $checkedCreate( + 'AmplifyConfig', + json, + ($checkedConvert) { + final val = AmplifyConfig( + userAgent: $checkedConvert( + 'UserAgent', (v) => v as String? ?? 'aws-amplify-cli/2.0'), + version: $checkedConvert('Version', (v) => v as String? ?? '1.0'), + api: $checkedConvert( + 'api', + (v) => v == null + ? null + : ApiConfig.fromJson(v as Map)), + analytics: $checkedConvert( + 'analytics', + (v) => v == null + ? null + : AnalyticsConfig.fromJson(v as Map)), + auth: $checkedConvert( + 'auth', + (v) => v == null + ? null + : AuthConfig.fromJson(v as Map)), + notifications: $checkedConvert( + 'notifications', + (v) => v == null + ? null + : NotificationsConfig.fromJson(v as Map)), + storage: $checkedConvert( + 'storage', + (v) => v == null + ? null + : StorageConfig.fromJson(v as Map)), + ); + return val; + }, + fieldKeyMap: const {'userAgent': 'UserAgent', 'version': 'Version'}, ); Map _$AmplifyConfigToJson(AmplifyConfig instance) { diff --git a/packages/amplify_core/lib/src/config/analytics/analytics_config.g.dart b/packages/amplify_core/lib/src/config/analytics/analytics_config.g.dart index c74d9f3bd0..b6064f19cc 100644 --- a/packages/amplify_core/lib/src/config/analytics/analytics_config.g.dart +++ b/packages/amplify_core/lib/src/config/analytics/analytics_config.g.dart @@ -9,8 +9,16 @@ part of 'analytics_config.dart'; // ************************************************************************** AnalyticsConfig _$AnalyticsConfigFromJson(Map json) => - AnalyticsConfig( - plugins: AmplifyPluginRegistry.pluginConfigsFromJson(json['plugins']), + $checkedCreate( + 'AnalyticsConfig', + json, + ($checkedConvert) { + final val = AnalyticsConfig( + plugins: $checkedConvert( + 'plugins', (v) => AmplifyPluginRegistry.pluginConfigsFromJson(v)), + ); + return val; + }, ); Map _$AnalyticsConfigToJson(AnalyticsConfig instance) => diff --git a/packages/amplify_core/lib/src/config/analytics/pinpoint_config.g.dart b/packages/amplify_core/lib/src/config/analytics/pinpoint_config.g.dart index e72a3e0dd8..e0f6f980bc 100644 --- a/packages/amplify_core/lib/src/config/analytics/pinpoint_config.g.dart +++ b/packages/amplify_core/lib/src/config/analytics/pinpoint_config.g.dart @@ -10,11 +10,18 @@ part of 'pinpoint_config.dart'; PinpointPluginConfig _$PinpointPluginConfigFromJson( Map json) => - PinpointPluginConfig( - pinpointAnalytics: PinpointAnalytics.fromJson( - json['pinpointAnalytics'] as Map), - pinpointTargeting: PinpointTargeting.fromJson( - json['pinpointTargeting'] as Map), + $checkedCreate( + 'PinpointPluginConfig', + json, + ($checkedConvert) { + final val = PinpointPluginConfig( + pinpointAnalytics: $checkedConvert('pinpointAnalytics', + (v) => PinpointAnalytics.fromJson(v as Map)), + pinpointTargeting: $checkedConvert('pinpointTargeting', + (v) => PinpointTargeting.fromJson(v as Map)), + ); + return val; + }, ); Map _$PinpointPluginConfigToJson( @@ -25,9 +32,16 @@ Map _$PinpointPluginConfigToJson( }; PinpointAnalytics _$PinpointAnalyticsFromJson(Map json) => - PinpointAnalytics( - appId: json['appId'] as String, - region: json['region'] as String, + $checkedCreate( + 'PinpointAnalytics', + json, + ($checkedConvert) { + final val = PinpointAnalytics( + appId: $checkedConvert('appId', (v) => v as String), + region: $checkedConvert('region', (v) => v as String), + ); + return val; + }, ); Map _$PinpointAnalyticsToJson(PinpointAnalytics instance) => @@ -37,8 +51,15 @@ Map _$PinpointAnalyticsToJson(PinpointAnalytics instance) => }; PinpointTargeting _$PinpointTargetingFromJson(Map json) => - PinpointTargeting( - region: json['region'] as String, + $checkedCreate( + 'PinpointTargeting', + json, + ($checkedConvert) { + final val = PinpointTargeting( + region: $checkedConvert('region', (v) => v as String), + ); + return val; + }, ); Map _$PinpointTargetingToJson(PinpointTargeting instance) => diff --git a/packages/amplify_core/lib/src/config/api/api_config.g.dart b/packages/amplify_core/lib/src/config/api/api_config.g.dart index 0c9a03cca9..f1812ea409 100644 --- a/packages/amplify_core/lib/src/config/api/api_config.g.dart +++ b/packages/amplify_core/lib/src/config/api/api_config.g.dart @@ -8,8 +8,16 @@ part of 'api_config.dart'; // JsonSerializableGenerator // ************************************************************************** -ApiConfig _$ApiConfigFromJson(Map json) => ApiConfig( - plugins: AmplifyPluginRegistry.pluginConfigsFromJson(json['plugins']), +ApiConfig _$ApiConfigFromJson(Map json) => $checkedCreate( + 'ApiConfig', + json, + ($checkedConvert) { + final val = ApiConfig( + plugins: $checkedConvert( + 'plugins', (v) => AmplifyPluginRegistry.pluginConfigsFromJson(v)), + ); + return val; + }, ); Map _$ApiConfigToJson(ApiConfig instance) => { diff --git a/packages/amplify_core/lib/src/config/api/appsync/api_config.g.dart b/packages/amplify_core/lib/src/config/api/appsync/api_config.g.dart index dce627abd2..216b39a2fb 100644 --- a/packages/amplify_core/lib/src/config/api/appsync/api_config.g.dart +++ b/packages/amplify_core/lib/src/config/api/appsync/api_config.g.dart @@ -8,13 +8,22 @@ part of 'api_config.dart'; // JsonSerializableGenerator // ************************************************************************** -AWSApiConfig _$AWSApiConfigFromJson(Map json) => AWSApiConfig( - endpointType: $enumDecode(_$EndpointTypeEnumMap, json['endpointType']), - endpoint: json['endpoint'] as String, - region: json['region'] as String, - authorizationType: - $enumDecode(_$APIAuthorizationTypeEnumMap, json['authorizationType']), - apiKey: json['apiKey'] as String?, +AWSApiConfig _$AWSApiConfigFromJson(Map json) => + $checkedCreate( + 'AWSApiConfig', + json, + ($checkedConvert) { + final val = AWSApiConfig( + endpointType: $checkedConvert( + 'endpointType', (v) => $enumDecode(_$EndpointTypeEnumMap, v)), + endpoint: $checkedConvert('endpoint', (v) => v as String), + region: $checkedConvert('region', (v) => v as String), + authorizationType: $checkedConvert('authorizationType', + (v) => $enumDecode(_$APIAuthorizationTypeEnumMap, v)), + apiKey: $checkedConvert('apiKey', (v) => v as String?), + ); + return val; + }, ); Map _$AWSApiConfigToJson(AWSApiConfig instance) { diff --git a/packages/amplify_core/lib/src/config/auth/auth_config.g.dart b/packages/amplify_core/lib/src/config/auth/auth_config.g.dart index ffe0ba3229..2f10ae171e 100644 --- a/packages/amplify_core/lib/src/config/auth/auth_config.g.dart +++ b/packages/amplify_core/lib/src/config/auth/auth_config.g.dart @@ -8,8 +8,16 @@ part of 'auth_config.dart'; // JsonSerializableGenerator // ************************************************************************** -AuthConfig _$AuthConfigFromJson(Map json) => AuthConfig( - plugins: AmplifyPluginRegistry.pluginConfigsFromJson(json['plugins']), +AuthConfig _$AuthConfigFromJson(Map json) => $checkedCreate( + 'AuthConfig', + json, + ($checkedConvert) { + final val = AuthConfig( + plugins: $checkedConvert( + 'plugins', (v) => AmplifyPluginRegistry.pluginConfigsFromJson(v)), + ); + return val; + }, ); Map _$AuthConfigToJson(AuthConfig instance) => diff --git a/packages/amplify_core/lib/src/config/auth/cognito/appsync.g.dart b/packages/amplify_core/lib/src/config/auth/cognito/appsync.g.dart index f9be7f456e..13ce05784c 100644 --- a/packages/amplify_core/lib/src/config/auth/cognito/appsync.g.dart +++ b/packages/amplify_core/lib/src/config/auth/cognito/appsync.g.dart @@ -10,12 +10,28 @@ part of 'appsync.dart'; CognitoAppSyncConfig _$CognitoAppSyncConfigFromJson( Map json) => - CognitoAppSyncConfig( - apiUrl: json['ApiUrl'] as String, - region: json['Region'] as String, - authMode: $enumDecode(_$APIAuthorizationTypeEnumMap, json['AuthMode']), - apiKey: json['ApiKey'] as String?, - clientDatabasePrefix: json['ClientDatabasePrefix'] as String, + $checkedCreate( + 'CognitoAppSyncConfig', + json, + ($checkedConvert) { + final val = CognitoAppSyncConfig( + apiUrl: $checkedConvert('ApiUrl', (v) => v as String), + region: $checkedConvert('Region', (v) => v as String), + authMode: $checkedConvert( + 'AuthMode', (v) => $enumDecode(_$APIAuthorizationTypeEnumMap, v)), + apiKey: $checkedConvert('ApiKey', (v) => v as String?), + clientDatabasePrefix: + $checkedConvert('ClientDatabasePrefix', (v) => v as String), + ); + return val; + }, + fieldKeyMap: const { + 'apiUrl': 'ApiUrl', + 'region': 'Region', + 'authMode': 'AuthMode', + 'apiKey': 'ApiKey', + 'clientDatabasePrefix': 'ClientDatabasePrefix' + }, ); Map _$CognitoAppSyncConfigToJson( diff --git a/packages/amplify_core/lib/src/config/auth/cognito/auth.g.dart b/packages/amplify_core/lib/src/config/auth/cognito/auth.g.dart index 36e2c120cc..e7fb10de12 100644 --- a/packages/amplify_core/lib/src/config/auth/cognito/auth.g.dart +++ b/packages/amplify_core/lib/src/config/auth/cognito/auth.g.dart @@ -9,34 +9,56 @@ part of 'auth.dart'; // ************************************************************************** CognitoAuthConfig _$CognitoAuthConfigFromJson(Map json) => - CognitoAuthConfig( - oAuth: json['OAuth'] == null - ? null - : CognitoOAuthConfig.fromJson(json['OAuth'] as Map), - socialProviders: (json['socialProviders'] as List?) - ?.map((e) => $enumDecode(_$SocialProviderEnumMap, e)) - .toList(), - usernameAttributes: (json['usernameAttributes'] as List?) - ?.map((e) => - const CognitoUserAttributeKeyConverter().fromJson(e as String)) - .toList(), - signupAttributes: (json['signupAttributes'] as List?) - ?.map((e) => - const CognitoUserAttributeKeyConverter().fromJson(e as String)) - .toList(), - passwordProtectionSettings: json['passwordProtectionSettings'] == null - ? null - : PasswordProtectionSettings.fromJson( - json['passwordProtectionSettings'] as Map), - mfaConfiguration: $enumDecodeNullable( - _$MfaConfigurationEnumMap, json['mfaConfiguration']), - mfaTypes: (json['mfaTypes'] as List?) - ?.map((e) => $enumDecode(_$MfaTypeEnumMap, e)) - .toList(), - verificationMechanisms: (json['verificationMechanisms'] as List?) - ?.map((e) => - const CognitoUserAttributeKeyConverter().fromJson(e as String)) - .toList(), + $checkedCreate( + 'CognitoAuthConfig', + json, + ($checkedConvert) { + final val = CognitoAuthConfig( + oAuth: $checkedConvert( + 'OAuth', + (v) => v == null + ? null + : CognitoOAuthConfig.fromJson(v as Map)), + socialProviders: $checkedConvert( + 'socialProviders', + (v) => (v as List?) + ?.map((e) => $enumDecode(_$SocialProviderEnumMap, e)) + .toList()), + usernameAttributes: $checkedConvert( + 'usernameAttributes', + (v) => (v as List?) + ?.map((e) => const CognitoUserAttributeKeyConverter() + .fromJson(e as String)) + .toList()), + signupAttributes: $checkedConvert( + 'signupAttributes', + (v) => (v as List?) + ?.map((e) => const CognitoUserAttributeKeyConverter() + .fromJson(e as String)) + .toList()), + passwordProtectionSettings: $checkedConvert( + 'passwordProtectionSettings', + (v) => v == null + ? null + : PasswordProtectionSettings.fromJson( + v as Map)), + mfaConfiguration: $checkedConvert('mfaConfiguration', + (v) => $enumDecodeNullable(_$MfaConfigurationEnumMap, v)), + mfaTypes: $checkedConvert( + 'mfaTypes', + (v) => (v as List?) + ?.map((e) => $enumDecode(_$MfaTypeEnumMap, e)) + .toList()), + verificationMechanisms: $checkedConvert( + 'verificationMechanisms', + (v) => (v as List?) + ?.map((e) => const CognitoUserAttributeKeyConverter() + .fromJson(e as String)) + .toList()), + ); + return val; + }, + fieldKeyMap: const {'oAuth': 'OAuth'}, ); Map _$CognitoAuthConfigToJson(CognitoAuthConfig instance) { diff --git a/packages/amplify_core/lib/src/config/auth/cognito/credentials_provider.g.dart b/packages/amplify_core/lib/src/config/auth/cognito/credentials_provider.g.dart index eb4d8febda..7e1aaf69d9 100644 --- a/packages/amplify_core/lib/src/config/auth/cognito/credentials_provider.g.dart +++ b/packages/amplify_core/lib/src/config/auth/cognito/credentials_provider.g.dart @@ -10,9 +10,17 @@ part of 'credentials_provider.dart'; CognitoIdentityCredentialsProvider _$CognitoIdentityCredentialsProviderFromJson( Map json) => - CognitoIdentityCredentialsProvider( - poolId: json['PoolId'] as String, - region: json['Region'] as String, + $checkedCreate( + 'CognitoIdentityCredentialsProvider', + json, + ($checkedConvert) { + final val = CognitoIdentityCredentialsProvider( + poolId: $checkedConvert('PoolId', (v) => v as String), + region: $checkedConvert('Region', (v) => v as String), + ); + return val; + }, + fieldKeyMap: const {'poolId': 'PoolId', 'region': 'Region'}, ); Map _$CognitoIdentityCredentialsProviderToJson( diff --git a/packages/amplify_core/lib/src/config/auth/cognito/identity_manager.g.dart b/packages/amplify_core/lib/src/config/auth/cognito/identity_manager.g.dart index 935810b118..e9b3c7f5af 100644 --- a/packages/amplify_core/lib/src/config/auth/cognito/identity_manager.g.dart +++ b/packages/amplify_core/lib/src/config/auth/cognito/identity_manager.g.dart @@ -10,7 +10,14 @@ part of 'identity_manager.dart'; CognitoIdentityManager _$CognitoIdentityManagerFromJson( Map json) => - CognitoIdentityManager(); + $checkedCreate( + 'CognitoIdentityManager', + json, + ($checkedConvert) { + final val = CognitoIdentityManager(); + return val; + }, + ); Map _$CognitoIdentityManagerToJson( CognitoIdentityManager instance) => diff --git a/packages/amplify_core/lib/src/config/auth/cognito/oauth.g.dart b/packages/amplify_core/lib/src/config/auth/cognito/oauth.g.dart index 7d3f636e1c..3c240bf1b5 100644 --- a/packages/amplify_core/lib/src/config/auth/cognito/oauth.g.dart +++ b/packages/amplify_core/lib/src/config/auth/cognito/oauth.g.dart @@ -9,29 +9,56 @@ part of 'oauth.dart'; // ************************************************************************** CognitoOAuthConfig _$CognitoOAuthConfigFromJson(Map json) => - CognitoOAuthConfig( - appClientId: json['AppClientId'] as String, - appClientSecret: json['AppClientSecret'] as String?, - scopes: - (json['Scopes'] as List).map((e) => e as String).toList(), - signInRedirectUri: json['SignInRedirectURI'] as String, - signOutRedirectUri: json['SignOutRedirectURI'] as String, - webDomain: json['WebDomain'] as String, - signInUri: json['SignInURI'] as String?, - signOutUri: json['SignOutURI'] as String?, - tokenUri: json['TokenURI'] as String?, - signInUriQueryParameters: - (json['SignInURIQueryParameters'] as Map?)?.map( - (k, e) => MapEntry(k, e as String), - ), - signOutUriQueryParameters: - (json['SignOutURIQueryParameters'] as Map?)?.map( - (k, e) => MapEntry(k, e as String), - ), - tokenUriQueryParameters: - (json['TokenURIQueryParameters'] as Map?)?.map( - (k, e) => MapEntry(k, e as String), - ), + $checkedCreate( + 'CognitoOAuthConfig', + json, + ($checkedConvert) { + final val = CognitoOAuthConfig( + appClientId: $checkedConvert('AppClientId', (v) => v as String), + appClientSecret: + $checkedConvert('AppClientSecret', (v) => v as String?), + scopes: $checkedConvert('Scopes', + (v) => (v as List).map((e) => e as String).toList()), + signInRedirectUri: + $checkedConvert('SignInRedirectURI', (v) => v as String), + signOutRedirectUri: + $checkedConvert('SignOutRedirectURI', (v) => v as String), + webDomain: $checkedConvert('WebDomain', (v) => v as String), + signInUri: $checkedConvert('SignInURI', (v) => v as String?), + signOutUri: $checkedConvert('SignOutURI', (v) => v as String?), + tokenUri: $checkedConvert('TokenURI', (v) => v as String?), + signInUriQueryParameters: $checkedConvert( + 'SignInURIQueryParameters', + (v) => (v as Map?)?.map( + (k, e) => MapEntry(k, e as String), + )), + signOutUriQueryParameters: $checkedConvert( + 'SignOutURIQueryParameters', + (v) => (v as Map?)?.map( + (k, e) => MapEntry(k, e as String), + )), + tokenUriQueryParameters: $checkedConvert( + 'TokenURIQueryParameters', + (v) => (v as Map?)?.map( + (k, e) => MapEntry(k, e as String), + )), + ); + return val; + }, + fieldKeyMap: const { + 'appClientId': 'AppClientId', + 'appClientSecret': 'AppClientSecret', + 'scopes': 'Scopes', + 'signInRedirectUri': 'SignInRedirectURI', + 'signOutRedirectUri': 'SignOutRedirectURI', + 'webDomain': 'WebDomain', + 'signInUri': 'SignInURI', + 'signOutUri': 'SignOutURI', + 'tokenUri': 'TokenURI', + 'signInUriQueryParameters': 'SignInURIQueryParameters', + 'signOutUriQueryParameters': 'SignOutURIQueryParameters', + 'tokenUriQueryParameters': 'TokenURIQueryParameters' + }, ); Map _$CognitoOAuthConfigToJson(CognitoOAuthConfig instance) { diff --git a/packages/amplify_core/lib/src/config/auth/cognito/password_protection_settings.g.dart b/packages/amplify_core/lib/src/config/auth/cognito/password_protection_settings.g.dart index dda3b3e909..0a1110df95 100644 --- a/packages/amplify_core/lib/src/config/auth/cognito/password_protection_settings.g.dart +++ b/packages/amplify_core/lib/src/config/auth/cognito/password_protection_settings.g.dart @@ -10,14 +10,24 @@ part of 'password_protection_settings.dart'; PasswordProtectionSettings _$PasswordProtectionSettingsFromJson( Map json) => - PasswordProtectionSettings( - passwordPolicyMinLength: const _PasswordPolicyMinLengthConverter() - .fromJson(json['passwordPolicyMinLength']), - passwordPolicyCharacters: (json['passwordPolicyCharacters'] - as List?) - ?.map((e) => $enumDecode(_$PasswordPolicyCharactersEnumMap, e)) - .toList() ?? - const [], + $checkedCreate( + 'PasswordProtectionSettings', + json, + ($checkedConvert) { + final val = PasswordProtectionSettings( + passwordPolicyMinLength: $checkedConvert('passwordPolicyMinLength', + (v) => const _PasswordPolicyMinLengthConverter().fromJson(v)), + passwordPolicyCharacters: $checkedConvert( + 'passwordPolicyCharacters', + (v) => + (v as List?) + ?.map((e) => + $enumDecode(_$PasswordPolicyCharactersEnumMap, e)) + .toList() ?? + const []), + ); + return val; + }, ); Map _$PasswordProtectionSettingsToJson( diff --git a/packages/amplify_core/lib/src/config/auth/cognito/pinpoint_analytics.g.dart b/packages/amplify_core/lib/src/config/auth/cognito/pinpoint_analytics.g.dart index edbe3f727a..1976806067 100644 --- a/packages/amplify_core/lib/src/config/auth/cognito/pinpoint_analytics.g.dart +++ b/packages/amplify_core/lib/src/config/auth/cognito/pinpoint_analytics.g.dart @@ -10,9 +10,17 @@ part of 'pinpoint_analytics.dart'; CognitoPinpointAnalyticsConfig _$CognitoPinpointAnalyticsConfigFromJson( Map json) => - CognitoPinpointAnalyticsConfig( - appId: json['AppId'] as String, - region: json['Region'] as String, + $checkedCreate( + 'CognitoPinpointAnalyticsConfig', + json, + ($checkedConvert) { + final val = CognitoPinpointAnalyticsConfig( + appId: $checkedConvert('AppId', (v) => v as String), + region: $checkedConvert('Region', (v) => v as String), + ); + return val; + }, + fieldKeyMap: const {'appId': 'AppId', 'region': 'Region'}, ); Map _$CognitoPinpointAnalyticsConfigToJson( diff --git a/packages/amplify_core/lib/src/config/auth/cognito/pinpoint_targeting.g.dart b/packages/amplify_core/lib/src/config/auth/cognito/pinpoint_targeting.g.dart index b5895fb845..a9130a51a2 100644 --- a/packages/amplify_core/lib/src/config/auth/cognito/pinpoint_targeting.g.dart +++ b/packages/amplify_core/lib/src/config/auth/cognito/pinpoint_targeting.g.dart @@ -10,8 +10,16 @@ part of 'pinpoint_targeting.dart'; CognitoPinpointTargetingConfig _$CognitoPinpointTargetingConfigFromJson( Map json) => - CognitoPinpointTargetingConfig( - region: json['Region'] as String, + $checkedCreate( + 'CognitoPinpointTargetingConfig', + json, + ($checkedConvert) { + final val = CognitoPinpointTargetingConfig( + region: $checkedConvert('Region', (v) => v as String), + ); + return val; + }, + fieldKeyMap: const {'region': 'Region'}, ); Map _$CognitoPinpointTargetingConfigToJson( diff --git a/packages/amplify_core/lib/src/config/auth/cognito/s3_transfer_utility.g.dart b/packages/amplify_core/lib/src/config/auth/cognito/s3_transfer_utility.g.dart index d4cb4dfc3e..5032deac88 100644 --- a/packages/amplify_core/lib/src/config/auth/cognito/s3_transfer_utility.g.dart +++ b/packages/amplify_core/lib/src/config/auth/cognito/s3_transfer_utility.g.dart @@ -9,9 +9,17 @@ part of 's3_transfer_utility.dart'; // ************************************************************************** S3TransferUtility _$S3TransferUtilityFromJson(Map json) => - S3TransferUtility( - bucket: json['Bucket'] as String, - region: json['Region'] as String, + $checkedCreate( + 'S3TransferUtility', + json, + ($checkedConvert) { + final val = S3TransferUtility( + bucket: $checkedConvert('Bucket', (v) => v as String), + region: $checkedConvert('Region', (v) => v as String), + ); + return val; + }, + fieldKeyMap: const {'bucket': 'Bucket', 'region': 'Region'}, ); Map _$S3TransferUtilityToJson(S3TransferUtility instance) => diff --git a/packages/amplify_core/lib/src/config/auth/cognito/user_pool.g.dart b/packages/amplify_core/lib/src/config/auth/cognito/user_pool.g.dart index 6492953bd8..7d9b5a3384 100644 --- a/packages/amplify_core/lib/src/config/auth/cognito/user_pool.g.dart +++ b/packages/amplify_core/lib/src/config/auth/cognito/user_pool.g.dart @@ -10,16 +10,33 @@ part of 'user_pool.dart'; CognitoUserPoolConfig _$CognitoUserPoolConfigFromJson( Map json) => - CognitoUserPoolConfig( - poolId: json['PoolId'] as String, - appClientId: json['AppClientId'] as String, - appClientSecret: json['AppClientSecret'] as String?, - region: json['Region'] as String, - hostedUI: json['HostedUI'] == null - ? null - : CognitoOAuthConfig.fromJson( - json['HostedUI'] as Map), - endpoint: json['Endpoint'] as String?, + $checkedCreate( + 'CognitoUserPoolConfig', + json, + ($checkedConvert) { + final val = CognitoUserPoolConfig( + poolId: $checkedConvert('PoolId', (v) => v as String), + appClientId: $checkedConvert('AppClientId', (v) => v as String), + appClientSecret: + $checkedConvert('AppClientSecret', (v) => v as String?), + region: $checkedConvert('Region', (v) => v as String), + hostedUI: $checkedConvert( + 'HostedUI', + (v) => v == null + ? null + : CognitoOAuthConfig.fromJson(v as Map)), + endpoint: $checkedConvert('Endpoint', (v) => v as String?), + ); + return val; + }, + fieldKeyMap: const { + 'poolId': 'PoolId', + 'appClientId': 'AppClientId', + 'appClientSecret': 'AppClientSecret', + 'region': 'Region', + 'hostedUI': 'HostedUI', + 'endpoint': 'Endpoint' + }, ); Map _$CognitoUserPoolConfigToJson( diff --git a/packages/amplify_core/lib/src/config/auth/cognito_config.g.dart b/packages/amplify_core/lib/src/config/auth/cognito_config.g.dart index 9378b7433f..c02214cc4c 100644 --- a/packages/amplify_core/lib/src/config/auth/cognito_config.g.dart +++ b/packages/amplify_core/lib/src/config/auth/cognito_config.g.dart @@ -9,55 +9,90 @@ part of 'cognito_config.dart'; // ************************************************************************** CognitoPluginConfig _$CognitoPluginConfigFromJson(Map json) => - CognitoPluginConfig( - userAgent: json['UserAgent'] as String? ?? 'aws-amplify-cli/0.1.0', - version: json['Version'] as String? ?? '0.1.0', - identityManager: json['IdentityManager'] == null - ? null - : AWSConfigMap.fromJson( - json['IdentityManager'] as Map, - (value) => CognitoIdentityManager.fromJson( - value as Map)), - credentialsProvider: json['CredentialsProvider'] == null - ? null - : CredentialsProviders.fromJson( - json['CredentialsProvider'] as Map), - cognitoUserPool: json['CognitoUserPool'] == null - ? null - : AWSConfigMap.fromJson( - json['CognitoUserPool'] as Map, - (value) => CognitoUserPoolConfig.fromJson( - value as Map)), - auth: json['Auth'] == null - ? null - : AWSConfigMap.fromJson( - json['Auth'] as Map, - (value) => - CognitoAuthConfig.fromJson(value as Map)), - appSync: json['AppSync'] == null - ? null - : AWSConfigMap.fromJson( - json['AppSync'] as Map, - (value) => - CognitoAppSyncConfig.fromJson(value as Map)), - pinpointAnalytics: json['PinpointAnalytics'] == null - ? null - : AWSConfigMap.fromJson( - json['PinpointAnalytics'] as Map, - (value) => CognitoPinpointAnalyticsConfig.fromJson( - value as Map)), - pinpointTargeting: json['PinpointTargeting'] == null - ? null - : AWSConfigMap.fromJson( - json['PinpointTargeting'] as Map, - (value) => CognitoPinpointTargetingConfig.fromJson( - value as Map)), - s3TransferUtility: json['S3TransferUtility'] == null - ? null - : AWSConfigMap.fromJson( - json['S3TransferUtility'] as Map, - (value) => - S3TransferUtility.fromJson(value as Map)), + $checkedCreate( + 'CognitoPluginConfig', + json, + ($checkedConvert) { + final val = CognitoPluginConfig( + userAgent: $checkedConvert( + 'UserAgent', (v) => v as String? ?? 'aws-amplify-cli/0.1.0'), + version: $checkedConvert('Version', (v) => v as String? ?? '0.1.0'), + identityManager: $checkedConvert( + 'IdentityManager', + (v) => v == null + ? null + : AWSConfigMap.fromJson( + v as Map, + (value) => CognitoIdentityManager.fromJson( + value as Map))), + credentialsProvider: $checkedConvert( + 'CredentialsProvider', + (v) => v == null + ? null + : CredentialsProviders.fromJson(v as Map)), + cognitoUserPool: $checkedConvert( + 'CognitoUserPool', + (v) => v == null + ? null + : AWSConfigMap.fromJson( + v as Map, + (value) => CognitoUserPoolConfig.fromJson( + value as Map))), + auth: $checkedConvert( + 'Auth', + (v) => v == null + ? null + : AWSConfigMap.fromJson( + v as Map, + (value) => CognitoAuthConfig.fromJson( + value as Map))), + appSync: $checkedConvert( + 'AppSync', + (v) => v == null + ? null + : AWSConfigMap.fromJson( + v as Map, + (value) => CognitoAppSyncConfig.fromJson( + value as Map))), + pinpointAnalytics: $checkedConvert( + 'PinpointAnalytics', + (v) => v == null + ? null + : AWSConfigMap.fromJson( + v as Map, + (value) => CognitoPinpointAnalyticsConfig.fromJson( + value as Map))), + pinpointTargeting: $checkedConvert( + 'PinpointTargeting', + (v) => v == null + ? null + : AWSConfigMap.fromJson( + v as Map, + (value) => CognitoPinpointTargetingConfig.fromJson( + value as Map))), + s3TransferUtility: $checkedConvert( + 'S3TransferUtility', + (v) => v == null + ? null + : AWSConfigMap.fromJson( + v as Map, + (value) => S3TransferUtility.fromJson( + value as Map))), + ); + return val; + }, + fieldKeyMap: const { + 'userAgent': 'UserAgent', + 'version': 'Version', + 'identityManager': 'IdentityManager', + 'credentialsProvider': 'CredentialsProvider', + 'cognitoUserPool': 'CognitoUserPool', + 'auth': 'Auth', + 'appSync': 'AppSync', + 'pinpointAnalytics': 'PinpointAnalytics', + 'pinpointTargeting': 'PinpointTargeting', + 's3TransferUtility': 'S3TransferUtility' + }, ); Map _$CognitoPluginConfigToJson(CognitoPluginConfig instance) { diff --git a/packages/amplify_core/lib/src/config/config_map.g.dart b/packages/amplify_core/lib/src/config/config_map.g.dart index 2178e1b59f..97dec4f7f3 100644 --- a/packages/amplify_core/lib/src/config/config_map.g.dart +++ b/packages/amplify_core/lib/src/config/config_map.g.dart @@ -12,8 +12,17 @@ AWSConfigMap _$AWSConfigMapFromJson>( Map json, T Function(Object? json) fromJsonT, ) => - AWSConfigMap( - (json['configs'] as Map).map( - (k, e) => MapEntry(k, fromJsonT(e)), - ), + $checkedCreate( + 'AWSConfigMap', + json, + ($checkedConvert) { + final val = AWSConfigMap( + $checkedConvert( + 'configs', + (v) => (v as Map).map( + (k, e) => MapEntry(k, fromJsonT(e)), + )), + ); + return val; + }, ); diff --git a/packages/amplify_core/lib/src/config/notifications/notifications_config.g.dart b/packages/amplify_core/lib/src/config/notifications/notifications_config.g.dart index 2a3a326c9f..1500a4a93a 100644 --- a/packages/amplify_core/lib/src/config/notifications/notifications_config.g.dart +++ b/packages/amplify_core/lib/src/config/notifications/notifications_config.g.dart @@ -9,8 +9,16 @@ part of 'notifications_config.dart'; // ************************************************************************** NotificationsConfig _$NotificationsConfigFromJson(Map json) => - NotificationsConfig( - plugins: AmplifyPluginRegistry.pluginConfigsFromJson(json['plugins']), + $checkedCreate( + 'NotificationsConfig', + json, + ($checkedConvert) { + final val = NotificationsConfig( + plugins: $checkedConvert( + 'plugins', (v) => AmplifyPluginRegistry.pluginConfigsFromJson(v)), + ); + return val; + }, ); Map _$NotificationsConfigToJson( diff --git a/packages/amplify_core/lib/src/config/notifications/notifications_pinpoint_config.g.dart b/packages/amplify_core/lib/src/config/notifications/notifications_pinpoint_config.g.dart index a39c3b53c3..15c4e13d62 100644 --- a/packages/amplify_core/lib/src/config/notifications/notifications_pinpoint_config.g.dart +++ b/packages/amplify_core/lib/src/config/notifications/notifications_pinpoint_config.g.dart @@ -10,9 +10,16 @@ part of 'notifications_pinpoint_config.dart'; NotificationsPinpointPluginConfig _$NotificationsPinpointPluginConfigFromJson( Map json) => - NotificationsPinpointPluginConfig( - appId: json['appId'] as String, - region: json['region'] as String, + $checkedCreate( + 'NotificationsPinpointPluginConfig', + json, + ($checkedConvert) { + final val = NotificationsPinpointPluginConfig( + appId: $checkedConvert('appId', (v) => v as String), + region: $checkedConvert('region', (v) => v as String), + ); + return val; + }, ); Map _$NotificationsPinpointPluginConfigToJson( diff --git a/packages/amplify_core/lib/src/config/storage/s3_config.g.dart b/packages/amplify_core/lib/src/config/storage/s3_config.g.dart index 889cd5f862..78080b469c 100644 --- a/packages/amplify_core/lib/src/config/storage/s3_config.g.dart +++ b/packages/amplify_core/lib/src/config/storage/s3_config.g.dart @@ -9,9 +9,16 @@ part of 's3_config.dart'; // ************************************************************************** S3PluginConfig _$S3PluginConfigFromJson(Map json) => - S3PluginConfig( - bucket: json['bucket'] as String, - region: json['region'] as String, + $checkedCreate( + 'S3PluginConfig', + json, + ($checkedConvert) { + final val = S3PluginConfig( + bucket: $checkedConvert('bucket', (v) => v as String), + region: $checkedConvert('region', (v) => v as String), + ); + return val; + }, ); Map _$S3PluginConfigToJson(S3PluginConfig instance) => diff --git a/packages/amplify_core/lib/src/config/storage/storage_config.g.dart b/packages/amplify_core/lib/src/config/storage/storage_config.g.dart index e25d12c404..87ee3b41bf 100644 --- a/packages/amplify_core/lib/src/config/storage/storage_config.g.dart +++ b/packages/amplify_core/lib/src/config/storage/storage_config.g.dart @@ -9,8 +9,16 @@ part of 'storage_config.dart'; // ************************************************************************** StorageConfig _$StorageConfigFromJson(Map json) => - StorageConfig( - plugins: AmplifyPluginRegistry.pluginConfigsFromJson(json['plugins']), + $checkedCreate( + 'StorageConfig', + json, + ($checkedConvert) { + final val = StorageConfig( + plugins: $checkedConvert( + 'plugins', (v) => AmplifyPluginRegistry.pluginConfigsFromJson(v)), + ); + return val; + }, ); Map _$StorageConfigToJson(StorageConfig instance) => diff --git a/packages/amplify_core/lib/src/types/auth/attribute/auth_next_update_attribute_step.g.dart b/packages/amplify_core/lib/src/types/auth/attribute/auth_next_update_attribute_step.g.dart index 6413ebdb35..b030a58495 100644 --- a/packages/amplify_core/lib/src/types/auth/attribute/auth_next_update_attribute_step.g.dart +++ b/packages/amplify_core/lib/src/types/auth/attribute/auth_next_update_attribute_step.g.dart @@ -10,16 +10,27 @@ part of 'auth_next_update_attribute_step.dart'; AuthNextUpdateAttributeStep _$AuthNextUpdateAttributeStepFromJson( Map json) => - AuthNextUpdateAttributeStep( - additionalInfo: (json['additionalInfo'] as Map?)?.map( - (k, e) => MapEntry(k, e as String), - ), - codeDeliveryDetails: json['codeDeliveryDetails'] == null - ? null - : AuthCodeDeliveryDetails.fromJson( - json['codeDeliveryDetails'] as Map), - updateAttributeStep: $enumDecode( - _$AuthUpdateAttributeStepEnumMap, json['updateAttributeStep']), + $checkedCreate( + 'AuthNextUpdateAttributeStep', + json, + ($checkedConvert) { + final val = AuthNextUpdateAttributeStep( + additionalInfo: $checkedConvert( + 'additionalInfo', + (v) => (v as Map?)?.map( + (k, e) => MapEntry(k, e as String), + )), + codeDeliveryDetails: $checkedConvert( + 'codeDeliveryDetails', + (v) => v == null + ? null + : AuthCodeDeliveryDetails.fromJson( + v as Map)), + updateAttributeStep: $checkedConvert('updateAttributeStep', + (v) => $enumDecode(_$AuthUpdateAttributeStepEnumMap, v)), + ); + return val; + }, ); Map _$AuthNextUpdateAttributeStepToJson( diff --git a/packages/amplify_core/lib/src/types/auth/attribute/auth_user_attribute.g.dart b/packages/amplify_core/lib/src/types/auth/attribute/auth_user_attribute.g.dart index 0752b69df0..510328babd 100644 --- a/packages/amplify_core/lib/src/types/auth/attribute/auth_user_attribute.g.dart +++ b/packages/amplify_core/lib/src/types/auth/attribute/auth_user_attribute.g.dart @@ -9,10 +9,19 @@ part of 'auth_user_attribute.dart'; // ************************************************************************** AuthUserAttribute _$AuthUserAttributeFromJson(Map json) => - AuthUserAttribute( - userAttributeKey: const AuthUserAttributeKeyConverter() - .fromJson(json['userAttributeKey'] as String), - value: json['value'] as String, + $checkedCreate( + 'AuthUserAttribute', + json, + ($checkedConvert) { + final val = AuthUserAttribute( + userAttributeKey: $checkedConvert( + 'userAttributeKey', + (v) => + const AuthUserAttributeKeyConverter().fromJson(v as String)), + value: $checkedConvert('value', (v) => v as String), + ); + return val; + }, ); Map _$AuthUserAttributeToJson(AuthUserAttribute instance) => diff --git a/packages/amplify_core/lib/src/types/auth/attribute/send_user_attribute_verification_code_result.g.dart b/packages/amplify_core/lib/src/types/auth/attribute/send_user_attribute_verification_code_result.g.dart index 5e8a9f3d8b..ea469118b1 100644 --- a/packages/amplify_core/lib/src/types/auth/attribute/send_user_attribute_verification_code_result.g.dart +++ b/packages/amplify_core/lib/src/types/auth/attribute/send_user_attribute_verification_code_result.g.dart @@ -11,9 +11,18 @@ part of 'send_user_attribute_verification_code_result.dart'; SendUserAttributeVerificationCodeResult _$SendUserAttributeVerificationCodeResultFromJson( Map json) => - SendUserAttributeVerificationCodeResult( - codeDeliveryDetails: AuthCodeDeliveryDetails.fromJson( - json['codeDeliveryDetails'] as Map), + $checkedCreate( + 'SendUserAttributeVerificationCodeResult', + json, + ($checkedConvert) { + final val = SendUserAttributeVerificationCodeResult( + codeDeliveryDetails: $checkedConvert( + 'codeDeliveryDetails', + (v) => AuthCodeDeliveryDetails.fromJson( + v as Map)), + ); + return val; + }, ); Map _$SendUserAttributeVerificationCodeResultToJson( diff --git a/packages/amplify_core/lib/src/types/auth/attribute/update_user_attribute_result.g.dart b/packages/amplify_core/lib/src/types/auth/attribute/update_user_attribute_result.g.dart index 8f6719cf8e..d81230781b 100644 --- a/packages/amplify_core/lib/src/types/auth/attribute/update_user_attribute_result.g.dart +++ b/packages/amplify_core/lib/src/types/auth/attribute/update_user_attribute_result.g.dart @@ -10,10 +10,19 @@ part of 'update_user_attribute_result.dart'; UpdateUserAttributeResult _$UpdateUserAttributeResultFromJson( Map json) => - UpdateUserAttributeResult( - isUpdated: json['isUpdated'] as bool, - nextStep: AuthNextUpdateAttributeStep.fromJson( - json['nextStep'] as Map), + $checkedCreate( + 'UpdateUserAttributeResult', + json, + ($checkedConvert) { + final val = UpdateUserAttributeResult( + isUpdated: $checkedConvert('isUpdated', (v) => v as bool), + nextStep: $checkedConvert( + 'nextStep', + (v) => AuthNextUpdateAttributeStep.fromJson( + v as Map)), + ); + return val; + }, ); Map _$UpdateUserAttributeResultToJson( diff --git a/packages/amplify_core/lib/src/types/auth/auth_code_delivery_details.g.dart b/packages/amplify_core/lib/src/types/auth/auth_code_delivery_details.g.dart index 6eb921e2e4..b1860d8e94 100644 --- a/packages/amplify_core/lib/src/types/auth/auth_code_delivery_details.g.dart +++ b/packages/amplify_core/lib/src/types/auth/auth_code_delivery_details.g.dart @@ -10,12 +10,21 @@ part of 'auth_code_delivery_details.dart'; AuthCodeDeliveryDetails _$AuthCodeDeliveryDetailsFromJson( Map json) => - AuthCodeDeliveryDetails( - deliveryMedium: - $enumDecode(_$DeliveryMediumEnumMap, json['deliveryMedium']), - destination: json['destination'] as String?, - attributeKey: _$JsonConverterFromJson( - json['attributeKey'], const AuthUserAttributeKeyConverter().fromJson), + $checkedCreate( + 'AuthCodeDeliveryDetails', + json, + ($checkedConvert) { + final val = AuthCodeDeliveryDetails( + deliveryMedium: $checkedConvert( + 'deliveryMedium', (v) => $enumDecode(_$DeliveryMediumEnumMap, v)), + destination: $checkedConvert('destination', (v) => v as String?), + attributeKey: $checkedConvert( + 'attributeKey', + (v) => _$JsonConverterFromJson( + v, const AuthUserAttributeKeyConverter().fromJson)), + ); + return val; + }, ); Map _$AuthCodeDeliveryDetailsToJson( diff --git a/packages/amplify_core/lib/src/types/auth/password/reset_password_step.g.dart b/packages/amplify_core/lib/src/types/auth/password/reset_password_step.g.dart index f5a3020e19..14d53d888a 100644 --- a/packages/amplify_core/lib/src/types/auth/password/reset_password_step.g.dart +++ b/packages/amplify_core/lib/src/types/auth/password/reset_password_step.g.dart @@ -9,16 +9,27 @@ part of 'reset_password_step.dart'; // ************************************************************************** ResetPasswordStep _$ResetPasswordStepFromJson(Map json) => - ResetPasswordStep( - additionalInfo: (json['additionalInfo'] as Map?)?.map( - (k, e) => MapEntry(k, e as String), - ), - codeDeliveryDetails: json['codeDeliveryDetails'] == null - ? null - : AuthCodeDeliveryDetails.fromJson( - json['codeDeliveryDetails'] as Map), - updateStep: - $enumDecode(_$AuthResetPasswordStepEnumMap, json['updateStep']), + $checkedCreate( + 'ResetPasswordStep', + json, + ($checkedConvert) { + final val = ResetPasswordStep( + additionalInfo: $checkedConvert( + 'additionalInfo', + (v) => (v as Map?)?.map( + (k, e) => MapEntry(k, e as String), + )), + codeDeliveryDetails: $checkedConvert( + 'codeDeliveryDetails', + (v) => v == null + ? null + : AuthCodeDeliveryDetails.fromJson( + v as Map)), + updateStep: $checkedConvert('updateStep', + (v) => $enumDecode(_$AuthResetPasswordStepEnumMap, v)), + ); + return val; + }, ); Map _$ResetPasswordStepToJson(ResetPasswordStep instance) { diff --git a/packages/amplify_core/lib/src/types/auth/sign_in/auth_next_sign_in_step.g.dart b/packages/amplify_core/lib/src/types/auth/sign_in/auth_next_sign_in_step.g.dart index 75b2ccd2b0..46d7e2de61 100644 --- a/packages/amplify_core/lib/src/types/auth/sign_in/auth_next_sign_in_step.g.dart +++ b/packages/amplify_core/lib/src/types/auth/sign_in/auth_next_sign_in_step.g.dart @@ -9,27 +9,45 @@ part of 'auth_next_sign_in_step.dart'; // ************************************************************************** AuthNextSignInStep _$AuthNextSignInStepFromJson(Map json) => - AuthNextSignInStep( - additionalInfo: (json['additionalInfo'] as Map?)?.map( - (k, e) => MapEntry(k, e as String), - ), - codeDeliveryDetails: json['codeDeliveryDetails'] == null - ? null - : AuthCodeDeliveryDetails.fromJson( - json['codeDeliveryDetails'] as Map), - signInStep: $enumDecode(_$AuthSignInStepEnumMap, json['signInStep']), - missingAttributes: (json['missingAttributes'] as List?) - ?.map((e) => - const AuthUserAttributeKeyConverter().fromJson(e as String)) - .toList() ?? - const [], - allowedMfaTypes: (json['allowedMfaTypes'] as List?) - ?.map((e) => $enumDecode(_$MfaTypeEnumMap, e)) - .toSet(), - totpSetupDetails: json['totpSetupDetails'] == null - ? null - : TotpSetupDetails.fromJson( - json['totpSetupDetails'] as Map), + $checkedCreate( + 'AuthNextSignInStep', + json, + ($checkedConvert) { + final val = AuthNextSignInStep( + additionalInfo: $checkedConvert( + 'additionalInfo', + (v) => (v as Map?)?.map( + (k, e) => MapEntry(k, e as String), + )), + codeDeliveryDetails: $checkedConvert( + 'codeDeliveryDetails', + (v) => v == null + ? null + : AuthCodeDeliveryDetails.fromJson( + v as Map)), + signInStep: $checkedConvert( + 'signInStep', (v) => $enumDecode(_$AuthSignInStepEnumMap, v)), + missingAttributes: $checkedConvert( + 'missingAttributes', + (v) => + (v as List?) + ?.map((e) => const AuthUserAttributeKeyConverter() + .fromJson(e as String)) + .toList() ?? + const []), + allowedMfaTypes: $checkedConvert( + 'allowedMfaTypes', + (v) => (v as List?) + ?.map((e) => $enumDecode(_$MfaTypeEnumMap, e)) + .toSet()), + totpSetupDetails: $checkedConvert( + 'totpSetupDetails', + (v) => v == null + ? null + : TotpSetupDetails.fromJson(v as Map)), + ); + return val; + }, ); Map _$AuthNextSignInStepToJson(AuthNextSignInStep instance) { diff --git a/packages/amplify_core/lib/src/types/auth/sign_in/sign_in_result.g.dart b/packages/amplify_core/lib/src/types/auth/sign_in/sign_in_result.g.dart index 4130d8a317..fc2fc439a1 100644 --- a/packages/amplify_core/lib/src/types/auth/sign_in/sign_in_result.g.dart +++ b/packages/amplify_core/lib/src/types/auth/sign_in/sign_in_result.g.dart @@ -8,10 +8,18 @@ part of 'sign_in_result.dart'; // JsonSerializableGenerator // ************************************************************************** -SignInResult _$SignInResultFromJson(Map json) => SignInResult( - isSignedIn: json['isSignedIn'] as bool, - nextStep: - AuthNextSignInStep.fromJson(json['nextStep'] as Map), +SignInResult _$SignInResultFromJson(Map json) => + $checkedCreate( + 'SignInResult', + json, + ($checkedConvert) { + final val = SignInResult( + isSignedIn: $checkedConvert('isSignedIn', (v) => v as bool), + nextStep: $checkedConvert('nextStep', + (v) => AuthNextSignInStep.fromJson(v as Map)), + ); + return val; + }, ); Map _$SignInResultToJson(SignInResult instance) => diff --git a/packages/amplify_core/lib/src/types/auth/sign_up/auth_next_sign_up_step.g.dart b/packages/amplify_core/lib/src/types/auth/sign_up/auth_next_sign_up_step.g.dart index ae567e329f..301300a002 100644 --- a/packages/amplify_core/lib/src/types/auth/sign_up/auth_next_sign_up_step.g.dart +++ b/packages/amplify_core/lib/src/types/auth/sign_up/auth_next_sign_up_step.g.dart @@ -9,15 +9,27 @@ part of 'auth_next_sign_up_step.dart'; // ************************************************************************** AuthNextSignUpStep _$AuthNextSignUpStepFromJson(Map json) => - AuthNextSignUpStep( - additionalInfo: (json['additionalInfo'] as Map?)?.map( - (k, e) => MapEntry(k, e as String), - ), - codeDeliveryDetails: json['codeDeliveryDetails'] == null - ? null - : AuthCodeDeliveryDetails.fromJson( - json['codeDeliveryDetails'] as Map), - signUpStep: $enumDecode(_$AuthSignUpStepEnumMap, json['signUpStep']), + $checkedCreate( + 'AuthNextSignUpStep', + json, + ($checkedConvert) { + final val = AuthNextSignUpStep( + additionalInfo: $checkedConvert( + 'additionalInfo', + (v) => (v as Map?)?.map( + (k, e) => MapEntry(k, e as String), + )), + codeDeliveryDetails: $checkedConvert( + 'codeDeliveryDetails', + (v) => v == null + ? null + : AuthCodeDeliveryDetails.fromJson( + v as Map)), + signUpStep: $checkedConvert( + 'signUpStep', (v) => $enumDecode(_$AuthSignUpStepEnumMap, v)), + ); + return val; + }, ); Map _$AuthNextSignUpStepToJson(AuthNextSignUpStep instance) { diff --git a/packages/amplify_core/lib/src/types/auth/sign_up/resend_sign_up_code_result.g.dart b/packages/amplify_core/lib/src/types/auth/sign_up/resend_sign_up_code_result.g.dart index ac701504f5..d5a19a81e7 100644 --- a/packages/amplify_core/lib/src/types/auth/sign_up/resend_sign_up_code_result.g.dart +++ b/packages/amplify_core/lib/src/types/auth/sign_up/resend_sign_up_code_result.g.dart @@ -10,9 +10,18 @@ part of 'resend_sign_up_code_result.dart'; ResendSignUpCodeResult _$ResendSignUpCodeResultFromJson( Map json) => - ResendSignUpCodeResult( - AuthCodeDeliveryDetails.fromJson( - json['codeDeliveryDetails'] as Map), + $checkedCreate( + 'ResendSignUpCodeResult', + json, + ($checkedConvert) { + final val = ResendSignUpCodeResult( + $checkedConvert( + 'codeDeliveryDetails', + (v) => + AuthCodeDeliveryDetails.fromJson(v as Map)), + ); + return val; + }, ); Map _$ResendSignUpCodeResultToJson( diff --git a/packages/amplify_core/lib/src/types/auth/sign_up/sign_up_result.g.dart b/packages/amplify_core/lib/src/types/auth/sign_up/sign_up_result.g.dart index 98c9aacc2a..e22299d2e1 100644 --- a/packages/amplify_core/lib/src/types/auth/sign_up/sign_up_result.g.dart +++ b/packages/amplify_core/lib/src/types/auth/sign_up/sign_up_result.g.dart @@ -8,11 +8,20 @@ part of 'sign_up_result.dart'; // JsonSerializableGenerator // ************************************************************************** -SignUpResult _$SignUpResultFromJson(Map json) => SignUpResult( - isSignUpComplete: json['isSignUpComplete'] as bool, - nextStep: - AuthNextSignUpStep.fromJson(json['nextStep'] as Map), - userId: json['userId'] as String?, +SignUpResult _$SignUpResultFromJson(Map json) => + $checkedCreate( + 'SignUpResult', + json, + ($checkedConvert) { + final val = SignUpResult( + isSignUpComplete: + $checkedConvert('isSignUpComplete', (v) => v as bool), + nextStep: $checkedConvert('nextStep', + (v) => AuthNextSignUpStep.fromJson(v as Map)), + userId: $checkedConvert('userId', (v) => v as String?), + ); + return val; + }, ); Map _$SignUpResultToJson(SignUpResult instance) { diff --git a/packages/amplify_core/lib/src/util/serializable.dart b/packages/amplify_core/lib/src/util/serializable.dart index e5f490c1cc..9f249d82b3 100644 --- a/packages/amplify_core/lib/src/util/serializable.dart +++ b/packages/amplify_core/lib/src/util/serializable.dart @@ -22,6 +22,7 @@ export 'package:json_annotation/json_annotation.dart' const zAmplifySerializable = JsonSerializable( includeIfNull: false, explicitToJson: true, + checked: true, converters: [ AuthUserAttributeKeyConverter(), CognitoUserAttributeKeyConverter(), @@ -34,6 +35,7 @@ const zAwsSerializable = JsonSerializable( fieldRename: FieldRename.pascal, includeIfNull: false, explicitToJson: true, + checked: true, ); /// Serialization options for [ConfigMap] types. @@ -42,6 +44,7 @@ const zConfigMapSerializable = JsonSerializable( genericArgumentFactories: true, ignoreUnannotated: true, createToJson: false, + checked: true, ); /// {@template amplify_flutter.serializable_map} diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/model/attribute/cognito_confirm_user_attribute_plugin_options.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/model/attribute/cognito_confirm_user_attribute_plugin_options.g.dart index ee8636e482..7cfb2cfbdc 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/model/attribute/cognito_confirm_user_attribute_plugin_options.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/model/attribute/cognito_confirm_user_attribute_plugin_options.g.dart @@ -9,7 +9,14 @@ part of 'cognito_confirm_user_attribute_plugin_options.dart'; CognitoConfirmUserAttributePluginOptions _$CognitoConfirmUserAttributePluginOptionsFromJson( Map json) => - CognitoConfirmUserAttributePluginOptions(); + $checkedCreate( + 'CognitoConfirmUserAttributePluginOptions', + json, + ($checkedConvert) { + final val = CognitoConfirmUserAttributePluginOptions(); + return val; + }, + ); Map _$CognitoConfirmUserAttributePluginOptionsToJson( CognitoConfirmUserAttributePluginOptions instance) => diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/model/attribute/cognito_fetch_user_attributes_plugin_options.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/model/attribute/cognito_fetch_user_attributes_plugin_options.g.dart index b8d9b17024..dbafe4fb8d 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/model/attribute/cognito_fetch_user_attributes_plugin_options.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/model/attribute/cognito_fetch_user_attributes_plugin_options.g.dart @@ -9,7 +9,14 @@ part of 'cognito_fetch_user_attributes_plugin_options.dart'; CognitoFetchUserAttributesPluginOptions _$CognitoFetchUserAttributesPluginOptionsFromJson( Map json) => - CognitoFetchUserAttributesPluginOptions(); + $checkedCreate( + 'CognitoFetchUserAttributesPluginOptions', + json, + ($checkedConvert) { + final val = CognitoFetchUserAttributesPluginOptions(); + return val; + }, + ); Map _$CognitoFetchUserAttributesPluginOptionsToJson( CognitoFetchUserAttributesPluginOptions instance) => diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/model/attribute/cognito_send_user_attribute_verification_code_plugin_options.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/model/attribute/cognito_send_user_attribute_verification_code_plugin_options.g.dart index 1b681a0876..3fd5fa70f8 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/model/attribute/cognito_send_user_attribute_verification_code_plugin_options.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/model/attribute/cognito_send_user_attribute_verification_code_plugin_options.g.dart @@ -9,11 +9,19 @@ part of 'cognito_send_user_attribute_verification_code_plugin_options.dart'; CognitoSendUserAttributeVerificationCodePluginOptions _$CognitoSendUserAttributeVerificationCodePluginOptionsFromJson( Map json) => - CognitoSendUserAttributeVerificationCodePluginOptions( - clientMetadata: - (json['clientMetadata'] as Map?)?.map( - (k, e) => MapEntry(k, e as String), - ), + $checkedCreate( + 'CognitoSendUserAttributeVerificationCodePluginOptions', + json, + ($checkedConvert) { + final val = CognitoSendUserAttributeVerificationCodePluginOptions( + clientMetadata: $checkedConvert( + 'clientMetadata', + (v) => (v as Map?)?.map( + (k, e) => MapEntry(k, e as String), + )), + ); + return val; + }, ); Map diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/model/attribute/cognito_update_user_attribute_plugin_options.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/model/attribute/cognito_update_user_attribute_plugin_options.g.dart index c04dd58504..ef3097f86f 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/model/attribute/cognito_update_user_attribute_plugin_options.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/model/attribute/cognito_update_user_attribute_plugin_options.g.dart @@ -9,11 +9,19 @@ part of 'cognito_update_user_attribute_plugin_options.dart'; CognitoUpdateUserAttributePluginOptions _$CognitoUpdateUserAttributePluginOptionsFromJson( Map json) => - CognitoUpdateUserAttributePluginOptions( - clientMetadata: - (json['clientMetadata'] as Map?)?.map( - (k, e) => MapEntry(k, e as String), - ), + $checkedCreate( + 'CognitoUpdateUserAttributePluginOptions', + json, + ($checkedConvert) { + final val = CognitoUpdateUserAttributePluginOptions( + clientMetadata: $checkedConvert( + 'clientMetadata', + (v) => (v as Map?)?.map( + (k, e) => MapEntry(k, e as String), + )), + ); + return val; + }, ); Map _$CognitoUpdateUserAttributePluginOptionsToJson( diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/model/attribute/cognito_update_user_attributes_plugin_options.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/model/attribute/cognito_update_user_attributes_plugin_options.g.dart index 26089c86b2..d18072732d 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/model/attribute/cognito_update_user_attributes_plugin_options.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/model/attribute/cognito_update_user_attributes_plugin_options.g.dart @@ -9,11 +9,19 @@ part of 'cognito_update_user_attributes_plugin_options.dart'; CognitoUpdateUserAttributesPluginOptions _$CognitoUpdateUserAttributesPluginOptionsFromJson( Map json) => - CognitoUpdateUserAttributesPluginOptions( - clientMetadata: - (json['clientMetadata'] as Map?)?.map( - (k, e) => MapEntry(k, e as String), - ), + $checkedCreate( + 'CognitoUpdateUserAttributesPluginOptions', + json, + ($checkedConvert) { + final val = CognitoUpdateUserAttributesPluginOptions( + clientMetadata: $checkedConvert( + 'clientMetadata', + (v) => (v as Map?)?.map( + (k, e) => MapEntry(k, e as String), + )), + ); + return val; + }, ); Map _$CognitoUpdateUserAttributesPluginOptionsToJson( diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/model/mfa/cognito_verify_totp_setup_plugin_options.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/model/mfa/cognito_verify_totp_setup_plugin_options.g.dart index 3b89501e07..8960279098 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/model/mfa/cognito_verify_totp_setup_plugin_options.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/model/mfa/cognito_verify_totp_setup_plugin_options.g.dart @@ -8,8 +8,16 @@ part of 'cognito_verify_totp_setup_plugin_options.dart'; CognitoVerifyTotpSetupPluginOptions _$CognitoVerifyTotpSetupPluginOptionsFromJson(Map json) => - CognitoVerifyTotpSetupPluginOptions( - friendlyDeviceName: json['friendlyDeviceName'] as String?, + $checkedCreate( + 'CognitoVerifyTotpSetupPluginOptions', + json, + ($checkedConvert) { + final val = CognitoVerifyTotpSetupPluginOptions( + friendlyDeviceName: + $checkedConvert('friendlyDeviceName', (v) => v as String?), + ); + return val; + }, ); Map _$CognitoVerifyTotpSetupPluginOptionsToJson( diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/model/password/cognito_confirm_reset_password_plugin_options.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/model/password/cognito_confirm_reset_password_plugin_options.g.dart index 465c48282f..59289f61da 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/model/password/cognito_confirm_reset_password_plugin_options.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/model/password/cognito_confirm_reset_password_plugin_options.g.dart @@ -9,11 +9,19 @@ part of 'cognito_confirm_reset_password_plugin_options.dart'; CognitoConfirmResetPasswordPluginOptions _$CognitoConfirmResetPasswordPluginOptionsFromJson( Map json) => - CognitoConfirmResetPasswordPluginOptions( - clientMetadata: - (json['clientMetadata'] as Map?)?.map( - (k, e) => MapEntry(k, e as String), - ), + $checkedCreate( + 'CognitoConfirmResetPasswordPluginOptions', + json, + ($checkedConvert) { + final val = CognitoConfirmResetPasswordPluginOptions( + clientMetadata: $checkedConvert( + 'clientMetadata', + (v) => (v as Map?)?.map( + (k, e) => MapEntry(k, e as String), + )), + ); + return val; + }, ); Map _$CognitoConfirmResetPasswordPluginOptionsToJson( diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/model/password/cognito_reset_password_plugin_options.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/model/password/cognito_reset_password_plugin_options.g.dart index e2b6b6958d..9c50b24837 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/model/password/cognito_reset_password_plugin_options.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/model/password/cognito_reset_password_plugin_options.g.dart @@ -8,10 +8,19 @@ part of 'cognito_reset_password_plugin_options.dart'; CognitoResetPasswordPluginOptions _$CognitoResetPasswordPluginOptionsFromJson( Map json) => - CognitoResetPasswordPluginOptions( - clientMetadata: (json['clientMetadata'] as Map?)?.map( - (k, e) => MapEntry(k, e as String), - ), + $checkedCreate( + 'CognitoResetPasswordPluginOptions', + json, + ($checkedConvert) { + final val = CognitoResetPasswordPluginOptions( + clientMetadata: $checkedConvert( + 'clientMetadata', + (v) => (v as Map?)?.map( + (k, e) => MapEntry(k, e as String), + )), + ); + return val; + }, ); Map _$CognitoResetPasswordPluginOptionsToJson( diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/model/password/cognito_reset_password_result.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/model/password/cognito_reset_password_result.g.dart index 9ccfbe8682..3994d0e9e2 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/model/password/cognito_reset_password_result.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/model/password/cognito_reset_password_result.g.dart @@ -8,10 +8,17 @@ part of 'cognito_reset_password_result.dart'; CognitoResetPasswordResult _$CognitoResetPasswordResultFromJson( Map json) => - CognitoResetPasswordResult( - isPasswordReset: json['isPasswordReset'] as bool, - nextStep: - ResetPasswordStep.fromJson(json['nextStep'] as Map), + $checkedCreate( + 'CognitoResetPasswordResult', + json, + ($checkedConvert) { + final val = CognitoResetPasswordResult( + isPasswordReset: $checkedConvert('isPasswordReset', (v) => v as bool), + nextStep: $checkedConvert('nextStep', + (v) => ResetPasswordStep.fromJson(v as Map)), + ); + return val; + }, ); Map _$CognitoResetPasswordResultToJson( diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/model/password/cognito_update_password_plugin_options.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/model/password/cognito_update_password_plugin_options.g.dart index b01231b189..133e8125fe 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/model/password/cognito_update_password_plugin_options.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/model/password/cognito_update_password_plugin_options.g.dart @@ -8,7 +8,14 @@ part of 'cognito_update_password_plugin_options.dart'; CognitoUpdatePasswordPluginOptions _$CognitoUpdatePasswordPluginOptionsFromJson( Map json) => - CognitoUpdatePasswordPluginOptions(); + $checkedCreate( + 'CognitoUpdatePasswordPluginOptions', + json, + ($checkedConvert) { + final val = CognitoUpdatePasswordPluginOptions(); + return val; + }, + ); Map _$CognitoUpdatePasswordPluginOptionsToJson( CognitoUpdatePasswordPluginOptions instance) => diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/cognito_auth_user.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/cognito_auth_user.g.dart index 5ab047f36d..1c65f38ca2 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/cognito_auth_user.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/cognito_auth_user.g.dart @@ -7,11 +7,18 @@ part of 'cognito_auth_user.dart'; // ************************************************************************** CognitoAuthUser _$CognitoAuthUserFromJson(Map json) => - CognitoAuthUser( - userId: json['userId'] as String, - username: json['username'] as String, - signInDetails: CognitoSignInDetails.fromJson( - json['signInDetails'] as Map), + $checkedCreate( + 'CognitoAuthUser', + json, + ($checkedConvert) { + final val = CognitoAuthUser( + userId: $checkedConvert('userId', (v) => v as String), + username: $checkedConvert('username', (v) => v as String), + signInDetails: $checkedConvert('signInDetails', + (v) => CognitoSignInDetails.fromJson(v as Map)), + ); + return val; + }, ); Map _$CognitoAuthUserToJson(CognitoAuthUser instance) => diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/cognito_fetch_auth_session_plugin_options.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/cognito_fetch_auth_session_plugin_options.g.dart index 7a499ab8c5..877f68e0de 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/cognito_fetch_auth_session_plugin_options.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/cognito_fetch_auth_session_plugin_options.g.dart @@ -8,7 +8,14 @@ part of 'cognito_fetch_auth_session_plugin_options.dart'; CognitoFetchAuthSessionPluginOptions _$CognitoFetchAuthSessionPluginOptionsFromJson(Map json) => - CognitoFetchAuthSessionPluginOptions(); + $checkedCreate( + 'CognitoFetchAuthSessionPluginOptions', + json, + ($checkedConvert) { + final val = CognitoFetchAuthSessionPluginOptions(); + return val; + }, + ); Map _$CognitoFetchAuthSessionPluginOptionsToJson( CognitoFetchAuthSessionPluginOptions instance) => diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/cognito_get_current_user_plugin_options.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/cognito_get_current_user_plugin_options.g.dart index 4d6fbc8752..1fa04ec718 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/cognito_get_current_user_plugin_options.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/cognito_get_current_user_plugin_options.g.dart @@ -8,7 +8,14 @@ part of 'cognito_get_current_user_plugin_options.dart'; CognitoGetCurrentUserPluginOptions _$CognitoGetCurrentUserPluginOptionsFromJson( Map json) => - CognitoGetCurrentUserPluginOptions(); + $checkedCreate( + 'CognitoGetCurrentUserPluginOptions', + json, + ($checkedConvert) { + final val = CognitoGetCurrentUserPluginOptions(); + return val; + }, + ); Map _$CognitoGetCurrentUserPluginOptionsToJson( CognitoGetCurrentUserPluginOptions instance) => diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/cognito_sign_in_details.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/cognito_sign_in_details.g.dart index 0e7a88de9d..ee8064d2d8 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/cognito_sign_in_details.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/cognito_sign_in_details.g.dart @@ -34,10 +34,19 @@ final BuiltSet _$CognitoSignInMethodValues = CognitoSignInDetailsApiBased _$CognitoSignInDetailsApiBasedFromJson( Map json) => - CognitoSignInDetailsApiBased( - username: json['username'] as String, - authFlowType: _$JsonConverterFromJson( - json['authFlowType'], const _AuthFlowTypeSerializer().fromJson), + $checkedCreate( + 'CognitoSignInDetailsApiBased', + json, + ($checkedConvert) { + final val = CognitoSignInDetailsApiBased( + username: $checkedConvert('username', (v) => v as String), + authFlowType: $checkedConvert( + 'authFlowType', + (v) => _$JsonConverterFromJson( + v, const _AuthFlowTypeSerializer().fromJson)), + ); + return val; + }, ); Map _$CognitoSignInDetailsApiBasedToJson( @@ -73,10 +82,19 @@ Json? _$JsonConverterToJson( CognitoSignInDetailsHostedUi _$CognitoSignInDetailsHostedUiFromJson( Map json) => - CognitoSignInDetailsHostedUi( - provider: json['provider'] == null - ? null - : AuthProvider.fromJson(json['provider'] as Map), + $checkedCreate( + 'CognitoSignInDetailsHostedUi', + json, + ($checkedConvert) { + final val = CognitoSignInDetailsHostedUi( + provider: $checkedConvert( + 'provider', + (v) => v == null + ? null + : AuthProvider.fromJson(v as Map)), + ); + return val; + }, ); Map _$CognitoSignInDetailsHostedUiToJson( @@ -95,9 +113,17 @@ Map _$CognitoSignInDetailsHostedUiToJson( CognitoSignInDetailsFederated _$CognitoSignInDetailsFederatedFromJson( Map json) => - CognitoSignInDetailsFederated( - token: json['token'] as String, - provider: AuthProvider.fromJson(json['provider'] as Map), + $checkedCreate( + 'CognitoSignInDetailsFederated', + json, + ($checkedConvert) { + final val = CognitoSignInDetailsFederated( + token: $checkedConvert('token', (v) => v as String), + provider: $checkedConvert('provider', + (v) => AuthProvider.fromJson(v as Map)), + ); + return val; + }, ); Map _$CognitoSignInDetailsFederatedToJson( diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/cognito_user_pool_tokens.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/cognito_user_pool_tokens.g.dart index 90126b1443..cb043c9fe2 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/cognito_user_pool_tokens.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/cognito_user_pool_tokens.g.dart @@ -142,16 +142,25 @@ class CognitoUserPoolTokensBuilder CognitoUserPoolTokens _$CognitoUserPoolTokensFromJson( Map json) => - CognitoUserPoolTokens( - signInMethod: json['signInMethod'] == null - ? CognitoSignInMethod.default$ - : const _CognitoSignInMethodSerializer() - .fromJson(json['signInMethod'] as String), - accessToken: const _JsonWebTokenSerializer() - .fromJson(json['accessToken'] as String), - refreshToken: json['refreshToken'] as String, - idToken: - const _JsonWebTokenSerializer().fromJson(json['idToken'] as String), + $checkedCreate( + 'CognitoUserPoolTokens', + json, + ($checkedConvert) { + final val = CognitoUserPoolTokens( + signInMethod: $checkedConvert( + 'signInMethod', + (v) => v == null + ? CognitoSignInMethod.default$ + : const _CognitoSignInMethodSerializer() + .fromJson(v as String)), + accessToken: $checkedConvert('accessToken', + (v) => const _JsonWebTokenSerializer().fromJson(v as String)), + refreshToken: $checkedConvert('refreshToken', (v) => v as String), + idToken: $checkedConvert('idToken', + (v) => const _JsonWebTokenSerializer().fromJson(v as String)), + ); + return val; + }, ); Map _$CognitoUserPoolTokensToJson( diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/federate_to_identity_pool_options.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/federate_to_identity_pool_options.g.dart index 921e51c183..74de29c120 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/federate_to_identity_pool_options.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/federate_to_identity_pool_options.g.dart @@ -8,9 +8,16 @@ part of 'federate_to_identity_pool_options.dart'; FederateToIdentityPoolOptions _$FederateToIdentityPoolOptionsFromJson( Map json) => - FederateToIdentityPoolOptions( - developerProvidedIdentityId: - json['developerProvidedIdentityId'] as String?, + $checkedCreate( + 'FederateToIdentityPoolOptions', + json, + ($checkedConvert) { + final val = FederateToIdentityPoolOptions( + developerProvidedIdentityId: $checkedConvert( + 'developerProvidedIdentityId', (v) => v as String?), + ); + return val; + }, ); Map _$FederateToIdentityPoolOptionsToJson( diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/federate_to_identity_pool_request.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/federate_to_identity_pool_request.g.dart index fb806fa847..e8668ad2e1 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/federate_to_identity_pool_request.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/federate_to_identity_pool_request.g.dart @@ -8,13 +8,23 @@ part of 'federate_to_identity_pool_request.dart'; FederateToIdentityPoolRequest _$FederateToIdentityPoolRequestFromJson( Map json) => - FederateToIdentityPoolRequest( - token: json['token'] as String, - provider: _authProviderFromJson(json['provider'] as String), - options: json['options'] == null - ? null - : FederateToIdentityPoolOptions.fromJson( - json['options'] as Map), + $checkedCreate( + 'FederateToIdentityPoolRequest', + json, + ($checkedConvert) { + final val = FederateToIdentityPoolRequest( + token: $checkedConvert('token', (v) => v as String), + provider: $checkedConvert( + 'provider', (v) => _authProviderFromJson(v as String)), + options: $checkedConvert( + 'options', + (v) => v == null + ? null + : FederateToIdentityPoolOptions.fromJson( + v as Map)), + ); + return val; + }, ); Map _$FederateToIdentityPoolRequestToJson( diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/federate_to_identity_pool_result.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/federate_to_identity_pool_result.g.dart index 930a452720..082ac6ece4 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/federate_to_identity_pool_result.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/federate_to_identity_pool_result.g.dart @@ -8,10 +8,17 @@ part of 'federate_to_identity_pool_result.dart'; FederateToIdentityPoolResult _$FederateToIdentityPoolResultFromJson( Map json) => - FederateToIdentityPoolResult( - identityId: json['identityId'] as String, - credentials: - AWSCredentials.fromJson(json['credentials'] as Map), + $checkedCreate( + 'FederateToIdentityPoolResult', + json, + ($checkedConvert) { + final val = FederateToIdentityPoolResult( + identityId: $checkedConvert('identityId', (v) => v as String), + credentials: $checkedConvert('credentials', + (v) => AWSCredentials.fromJson(v as Map)), + ); + return val; + }, ); Map _$FederateToIdentityPoolResultToJson( diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/model/signin/cognito_confirm_sign_in_plugin_options.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/model/signin/cognito_confirm_sign_in_plugin_options.g.dart index a4479535f3..ca2f11b894 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/model/signin/cognito_confirm_sign_in_plugin_options.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/model/signin/cognito_confirm_sign_in_plugin_options.g.dart @@ -8,14 +8,26 @@ part of 'cognito_confirm_sign_in_plugin_options.dart'; CognitoConfirmSignInPluginOptions _$CognitoConfirmSignInPluginOptionsFromJson( Map json) => - CognitoConfirmSignInPluginOptions( - clientMetadata: (json['clientMetadata'] as Map?)?.map( - (k, e) => MapEntry(k, e as String), - ), - userAttributes: _$JsonConverterFromJson, - Map>(json['userAttributes'], - const CognitoUserAttributeMapConverter().fromJson), - friendlyDeviceName: json['friendlyDeviceName'] as String?, + $checkedCreate( + 'CognitoConfirmSignInPluginOptions', + json, + ($checkedConvert) { + final val = CognitoConfirmSignInPluginOptions( + clientMetadata: $checkedConvert( + 'clientMetadata', + (v) => (v as Map?)?.map( + (k, e) => MapEntry(k, e as String), + )), + userAttributes: $checkedConvert( + 'userAttributes', + (v) => _$JsonConverterFromJson, + Map>( + v, const CognitoUserAttributeMapConverter().fromJson)), + friendlyDeviceName: + $checkedConvert('friendlyDeviceName', (v) => v as String?), + ); + return val; + }, ); Map _$CognitoConfirmSignInPluginOptionsToJson( diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/model/signin/cognito_sign_in_plugin_options.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/model/signin/cognito_sign_in_plugin_options.g.dart index 7cf95cfd65..f2bb4c3c05 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/model/signin/cognito_sign_in_plugin_options.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/model/signin/cognito_sign_in_plugin_options.g.dart @@ -8,13 +8,23 @@ part of 'cognito_sign_in_plugin_options.dart'; CognitoSignInPluginOptions _$CognitoSignInPluginOptionsFromJson( Map json) => - CognitoSignInPluginOptions( - authFlowType: $enumDecodeNullable( - _$AuthenticationFlowTypeEnumMap, json['authFlowType']), - clientMetadata: (json['clientMetadata'] as Map?)?.map( - (k, e) => MapEntry(k, e as String), - ) ?? - const {}, + $checkedCreate( + 'CognitoSignInPluginOptions', + json, + ($checkedConvert) { + final val = CognitoSignInPluginOptions( + authFlowType: $checkedConvert('authFlowType', + (v) => $enumDecodeNullable(_$AuthenticationFlowTypeEnumMap, v)), + clientMetadata: $checkedConvert( + 'clientMetadata', + (v) => + (v as Map?)?.map( + (k, e) => MapEntry(k, e as String), + ) ?? + const {}), + ); + return val; + }, ); Map _$CognitoSignInPluginOptionsToJson( diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/model/signin/cognito_sign_in_with_web_ui_plugin_options.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/model/signin/cognito_sign_in_with_web_ui_plugin_options.g.dart index 8e3f5a0ea1..3ebc7c5915 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/model/signin/cognito_sign_in_with_web_ui_plugin_options.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/model/signin/cognito_sign_in_with_web_ui_plugin_options.g.dart @@ -8,10 +8,18 @@ part of 'cognito_sign_in_with_web_ui_plugin_options.dart'; CognitoSignInWithWebUIPluginOptions _$CognitoSignInWithWebUIPluginOptionsFromJson(Map json) => - CognitoSignInWithWebUIPluginOptions( - isPreferPrivateSession: - json['isPreferPrivateSession'] as bool? ?? false, - browserPackageName: json['browserPackageName'] as String?, + $checkedCreate( + 'CognitoSignInWithWebUIPluginOptions', + json, + ($checkedConvert) { + final val = CognitoSignInWithWebUIPluginOptions( + isPreferPrivateSession: $checkedConvert( + 'isPreferPrivateSession', (v) => v as bool? ?? false), + browserPackageName: + $checkedConvert('browserPackageName', (v) => v as String?), + ); + return val; + }, ); Map _$CognitoSignInWithWebUIPluginOptionsToJson( diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/model/signout/cognito_sign_out_plugin_options.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/model/signout/cognito_sign_out_plugin_options.g.dart index f953473a16..efc6803763 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/model/signout/cognito_sign_out_plugin_options.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/model/signout/cognito_sign_out_plugin_options.g.dart @@ -8,7 +8,14 @@ part of 'cognito_sign_out_plugin_options.dart'; CognitoSignOutPluginOptions _$CognitoSignOutPluginOptionsFromJson( Map json) => - CognitoSignOutPluginOptions(); + $checkedCreate( + 'CognitoSignOutPluginOptions', + json, + ($checkedConvert) { + final val = CognitoSignOutPluginOptions(); + return val; + }, + ); Map _$CognitoSignOutPluginOptionsToJson( CognitoSignOutPluginOptions instance) => diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/model/signup/cognito_confirm_sign_up_plugin_options.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/model/signup/cognito_confirm_sign_up_plugin_options.g.dart index 8543e48d40..71f2c82488 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/model/signup/cognito_confirm_sign_up_plugin_options.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/model/signup/cognito_confirm_sign_up_plugin_options.g.dart @@ -8,11 +8,21 @@ part of 'cognito_confirm_sign_up_plugin_options.dart'; CognitoConfirmSignUpPluginOptions _$CognitoConfirmSignUpPluginOptionsFromJson( Map json) => - CognitoConfirmSignUpPluginOptions( - clientMetadata: (json['clientMetadata'] as Map?)?.map( - (k, e) => MapEntry(k, e as String), - ) ?? - const {}, + $checkedCreate( + 'CognitoConfirmSignUpPluginOptions', + json, + ($checkedConvert) { + final val = CognitoConfirmSignUpPluginOptions( + clientMetadata: $checkedConvert( + 'clientMetadata', + (v) => + (v as Map?)?.map( + (k, e) => MapEntry(k, e as String), + ) ?? + const {}), + ); + return val; + }, ); Map _$CognitoConfirmSignUpPluginOptionsToJson( diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/model/signup/cognito_resend_sign_up_code_plugin_options.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/model/signup/cognito_resend_sign_up_code_plugin_options.g.dart index 5eb703ce57..626dc10535 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/model/signup/cognito_resend_sign_up_code_plugin_options.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/model/signup/cognito_resend_sign_up_code_plugin_options.g.dart @@ -8,12 +8,21 @@ part of 'cognito_resend_sign_up_code_plugin_options.dart'; CognitoResendSignUpCodePluginOptions _$CognitoResendSignUpCodePluginOptionsFromJson(Map json) => - CognitoResendSignUpCodePluginOptions( - clientMetadata: - (json['clientMetadata'] as Map?)?.map( - (k, e) => MapEntry(k, e as String), - ) ?? - const {}, + $checkedCreate( + 'CognitoResendSignUpCodePluginOptions', + json, + ($checkedConvert) { + final val = CognitoResendSignUpCodePluginOptions( + clientMetadata: $checkedConvert( + 'clientMetadata', + (v) => + (v as Map?)?.map( + (k, e) => MapEntry(k, e as String), + ) ?? + const {}), + ); + return val; + }, ); Map _$CognitoResendSignUpCodePluginOptionsToJson( diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/model/signup/cognito_sign_up_plugin_options.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/model/signup/cognito_sign_up_plugin_options.g.dart index 109e8dff92..1e20a391f2 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/model/signup/cognito_sign_up_plugin_options.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/model/signup/cognito_sign_up_plugin_options.g.dart @@ -8,13 +8,24 @@ part of 'cognito_sign_up_plugin_options.dart'; CognitoSignUpPluginOptions _$CognitoSignUpPluginOptionsFromJson( Map json) => - CognitoSignUpPluginOptions( - clientMetadata: (json['clientMetadata'] as Map?)?.map( - (k, e) => MapEntry(k, e as String), - ), - validationData: (json['validationData'] as Map?)?.map( - (k, e) => MapEntry(k, e as String), - ), + $checkedCreate( + 'CognitoSignUpPluginOptions', + json, + ($checkedConvert) { + final val = CognitoSignUpPluginOptions( + clientMetadata: $checkedConvert( + 'clientMetadata', + (v) => (v as Map?)?.map( + (k, e) => MapEntry(k, e as String), + )), + validationData: $checkedConvert( + 'validationData', + (v) => (v as Map?)?.map( + (k, e) => MapEntry(k, e as String), + )), + ); + return val; + }, ); Map _$CognitoSignUpPluginOptionsToJson( diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/state/state/auth_state.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/state/state/auth_state.g.dart index 6e6f1f62ef..8087e4b411 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/state/state/auth_state.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/state/state/auth_state.g.dart @@ -7,20 +7,30 @@ part of 'auth_state.dart'; // ************************************************************************** CredentialStoreData _$CredentialStoreDataFromJson(Map json) => - CredentialStoreData( - identityId: json['identityId'] as String?, - awsCredentials: json['awsCredentials'] == null - ? null - : AWSCredentials.fromJson( - json['awsCredentials'] as Map), - userPoolTokens: json['userPoolTokens'] == null - ? null - : CognitoUserPoolTokens.fromJson( - json['userPoolTokens'] as Map), - signInDetails: json['signInDetails'] == null - ? null - : CognitoSignInDetails.fromJson( - json['signInDetails'] as Map), + $checkedCreate( + 'CredentialStoreData', + json, + ($checkedConvert) { + final val = CredentialStoreData( + identityId: $checkedConvert('identityId', (v) => v as String?), + awsCredentials: $checkedConvert( + 'awsCredentials', + (v) => v == null + ? null + : AWSCredentials.fromJson(v as Map)), + userPoolTokens: $checkedConvert( + 'userPoolTokens', + (v) => v == null + ? null + : CognitoUserPoolTokens.fromJson(v as Map)), + signInDetails: $checkedConvert( + 'signInDetails', + (v) => v == null + ? null + : CognitoSignInDetails.fromJson(v as Map)), + ); + return val; + }, ); Map _$CredentialStoreDataToJson(CredentialStoreData instance) { diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_copy_plugin_options.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_copy_plugin_options.g.dart index 70d04f3f91..0aec183f11 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_copy_plugin_options.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_copy_plugin_options.g.dart @@ -7,8 +7,16 @@ part of 's3_copy_plugin_options.dart'; // ************************************************************************** S3CopyPluginOptions _$S3CopyPluginOptionsFromJson(Map json) => - S3CopyPluginOptions( - getProperties: json['getProperties'] as bool? ?? false, + $checkedCreate( + 'S3CopyPluginOptions', + json, + ($checkedConvert) { + final val = S3CopyPluginOptions( + getProperties: + $checkedConvert('getProperties', (v) => v as bool? ?? false), + ); + return val; + }, ); Map _$S3CopyPluginOptionsToJson( diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_data_bytes_range.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_data_bytes_range.g.dart index 402ae8c116..c9c93d11bb 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_data_bytes_range.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_data_bytes_range.g.dart @@ -7,9 +7,16 @@ part of 's3_data_bytes_range.dart'; // ************************************************************************** S3DataBytesRange _$S3DataBytesRangeFromJson(Map json) => - S3DataBytesRange( - start: json['start'] as int, - end: json['end'] as int, + $checkedCreate( + 'S3DataBytesRange', + json, + ($checkedConvert) { + final val = S3DataBytesRange( + start: $checkedConvert('start', (v) => v as int), + end: $checkedConvert('end', (v) => v as int), + ); + return val; + }, ); Map _$S3DataBytesRangeToJson(S3DataBytesRange instance) => diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_download_data_plugin_options.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_download_data_plugin_options.g.dart index 8214b35534..6a0a5c7bfb 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_download_data_plugin_options.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_download_data_plugin_options.g.dart @@ -8,13 +8,23 @@ part of 's3_download_data_plugin_options.dart'; S3DownloadDataPluginOptions _$S3DownloadDataPluginOptionsFromJson( Map json) => - S3DownloadDataPluginOptions( - getProperties: json['getProperties'] as bool? ?? false, - bytesRange: json['bytesRange'] == null - ? null - : S3DataBytesRange.fromJson( - json['bytesRange'] as Map), - useAccelerateEndpoint: json['useAccelerateEndpoint'] as bool? ?? false, + $checkedCreate( + 'S3DownloadDataPluginOptions', + json, + ($checkedConvert) { + final val = S3DownloadDataPluginOptions( + getProperties: + $checkedConvert('getProperties', (v) => v as bool? ?? false), + bytesRange: $checkedConvert( + 'bytesRange', + (v) => v == null + ? null + : S3DataBytesRange.fromJson(v as Map)), + useAccelerateEndpoint: $checkedConvert( + 'useAccelerateEndpoint', (v) => v as bool? ?? false), + ); + return val; + }, ); Map _$S3DownloadDataPluginOptionsToJson( diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_download_file_plugin_options.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_download_file_plugin_options.g.dart index 5e1e07d2b1..0814648e87 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_download_file_plugin_options.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_download_file_plugin_options.g.dart @@ -8,9 +8,18 @@ part of 's3_download_file_plugin_options.dart'; S3DownloadFilePluginOptions _$S3DownloadFilePluginOptionsFromJson( Map json) => - S3DownloadFilePluginOptions( - getProperties: json['getProperties'] as bool? ?? false, - useAccelerateEndpoint: json['useAccelerateEndpoint'] as bool? ?? false, + $checkedCreate( + 'S3DownloadFilePluginOptions', + json, + ($checkedConvert) { + final val = S3DownloadFilePluginOptions( + getProperties: + $checkedConvert('getProperties', (v) => v as bool? ?? false), + useAccelerateEndpoint: $checkedConvert( + 'useAccelerateEndpoint', (v) => v as bool? ?? false), + ); + return val; + }, ); Map _$S3DownloadFilePluginOptionsToJson( diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_get_properties_plugin_options.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_get_properties_plugin_options.g.dart index 8fb778b9e2..5ab7534aba 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_get_properties_plugin_options.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_get_properties_plugin_options.g.dart @@ -8,7 +8,14 @@ part of 's3_get_properties_plugin_options.dart'; S3GetPropertiesPluginOptions _$S3GetPropertiesPluginOptionsFromJson( Map json) => - S3GetPropertiesPluginOptions(); + $checkedCreate( + 'S3GetPropertiesPluginOptions', + json, + ($checkedConvert) { + final val = S3GetPropertiesPluginOptions(); + return val; + }, + ); Map _$S3GetPropertiesPluginOptionsToJson( S3GetPropertiesPluginOptions instance) => diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_get_url_plugin_options.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_get_url_plugin_options.g.dart index c12e545a60..f9bc6d5650 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_get_url_plugin_options.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_get_url_plugin_options.g.dart @@ -8,13 +8,23 @@ part of 's3_get_url_plugin_options.dart'; S3GetUrlPluginOptions _$S3GetUrlPluginOptionsFromJson( Map json) => - S3GetUrlPluginOptions( - expiresIn: json['expiresIn'] == null - ? const Duration(minutes: 15) - : Duration(microseconds: json['expiresIn'] as int), - validateObjectExistence: - json['validateObjectExistence'] as bool? ?? false, - useAccelerateEndpoint: json['useAccelerateEndpoint'] as bool? ?? false, + $checkedCreate( + 'S3GetUrlPluginOptions', + json, + ($checkedConvert) { + final val = S3GetUrlPluginOptions( + expiresIn: $checkedConvert( + 'expiresIn', + (v) => v == null + ? const Duration(minutes: 15) + : Duration(microseconds: v as int)), + validateObjectExistence: $checkedConvert( + 'validateObjectExistence', (v) => v as bool? ?? false), + useAccelerateEndpoint: $checkedConvert( + 'useAccelerateEndpoint', (v) => v as bool? ?? false), + ); + return val; + }, ); Map _$S3GetUrlPluginOptionsToJson( diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_item.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_item.g.dart index 6ba820001c..18ff5a5a67 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_item.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_item.g.dart @@ -6,19 +6,28 @@ part of 's3_item.dart'; // JsonSerializableGenerator // ************************************************************************** -S3Item _$S3ItemFromJson(Map json) => S3Item( - path: json['path'] as String, - size: json['size'] as int?, - lastModified: json['lastModified'] == null - ? null - : DateTime.parse(json['lastModified'] as String), - eTag: json['eTag'] as String?, - metadata: (json['metadata'] as Map?)?.map( - (k, e) => MapEntry(k, e as String), - ) ?? - const {}, - versionId: json['versionId'] as String?, - contentType: json['contentType'] as String?, +S3Item _$S3ItemFromJson(Map json) => $checkedCreate( + 'S3Item', + json, + ($checkedConvert) { + final val = S3Item( + path: $checkedConvert('path', (v) => v as String), + size: $checkedConvert('size', (v) => v as int?), + lastModified: $checkedConvert('lastModified', + (v) => v == null ? null : DateTime.parse(v as String)), + eTag: $checkedConvert('eTag', (v) => v as String?), + metadata: $checkedConvert( + 'metadata', + (v) => + (v as Map?)?.map( + (k, e) => MapEntry(k, e as String), + ) ?? + const {}), + versionId: $checkedConvert('versionId', (v) => v as String?), + contentType: $checkedConvert('contentType', (v) => v as String?), + ); + return val; + }, ); Map _$S3ItemToJson(S3Item instance) { diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_list_plugin_options.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_list_plugin_options.g.dart index 66af0a459f..05d787e2a7 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_list_plugin_options.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_list_plugin_options.g.dart @@ -7,9 +7,17 @@ part of 's3_list_plugin_options.dart'; // ************************************************************************** S3ListPluginOptions _$S3ListPluginOptionsFromJson(Map json) => - S3ListPluginOptions( - excludeSubPaths: json['excludeSubPaths'] as bool? ?? false, - delimiter: json['delimiter'] as String? ?? '/', + $checkedCreate( + 'S3ListPluginOptions', + json, + ($checkedConvert) { + final val = S3ListPluginOptions( + excludeSubPaths: + $checkedConvert('excludeSubPaths', (v) => v as bool? ?? false), + delimiter: $checkedConvert('delimiter', (v) => v as String? ?? '/'), + ); + return val; + }, ); Map _$S3ListPluginOptionsToJson( diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_remove_many_plugin_options.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_remove_many_plugin_options.g.dart index 82482bd7d4..05964fdb72 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_remove_many_plugin_options.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_remove_many_plugin_options.g.dart @@ -8,7 +8,14 @@ part of 's3_remove_many_plugin_options.dart'; S3RemoveManyPluginOptions _$S3RemoveManyPluginOptionsFromJson( Map json) => - S3RemoveManyPluginOptions(); + $checkedCreate( + 'S3RemoveManyPluginOptions', + json, + ($checkedConvert) { + final val = S3RemoveManyPluginOptions(); + return val; + }, + ); Map _$S3RemoveManyPluginOptionsToJson( S3RemoveManyPluginOptions instance) => diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_remove_plugin_options.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_remove_plugin_options.g.dart index 4f5ccafaf3..ec245ea093 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_remove_plugin_options.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_remove_plugin_options.g.dart @@ -8,7 +8,14 @@ part of 's3_remove_plugin_options.dart'; S3RemovePluginOptions _$S3RemovePluginOptionsFromJson( Map json) => - S3RemovePluginOptions(); + $checkedCreate( + 'S3RemovePluginOptions', + json, + ($checkedConvert) { + final val = S3RemovePluginOptions(); + return val; + }, + ); Map _$S3RemovePluginOptionsToJson( S3RemovePluginOptions instance) => diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_upload_data_plugin_options.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_upload_data_plugin_options.g.dart index 0cb4a8566b..9c9d5cfe8c 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_upload_data_plugin_options.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_upload_data_plugin_options.g.dart @@ -8,9 +8,18 @@ part of 's3_upload_data_plugin_options.dart'; S3UploadDataPluginOptions _$S3UploadDataPluginOptionsFromJson( Map json) => - S3UploadDataPluginOptions( - getProperties: json['getProperties'] as bool? ?? false, - useAccelerateEndpoint: json['useAccelerateEndpoint'] as bool? ?? false, + $checkedCreate( + 'S3UploadDataPluginOptions', + json, + ($checkedConvert) { + final val = S3UploadDataPluginOptions( + getProperties: + $checkedConvert('getProperties', (v) => v as bool? ?? false), + useAccelerateEndpoint: $checkedConvert( + 'useAccelerateEndpoint', (v) => v as bool? ?? false), + ); + return val; + }, ); Map _$S3UploadDataPluginOptionsToJson( diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_upload_file_plugin_options.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_upload_file_plugin_options.g.dart index 4830440351..498eeaf4e5 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_upload_file_plugin_options.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_upload_file_plugin_options.g.dart @@ -8,9 +8,18 @@ part of 's3_upload_file_plugin_options.dart'; S3UploadFilePluginOptions _$S3UploadFilePluginOptionsFromJson( Map json) => - S3UploadFilePluginOptions( - getProperties: json['getProperties'] as bool? ?? false, - useAccelerateEndpoint: json['useAccelerateEndpoint'] as bool? ?? false, + $checkedCreate( + 'S3UploadFilePluginOptions', + json, + ($checkedConvert) { + final val = S3UploadFilePluginOptions( + getProperties: + $checkedConvert('getProperties', (v) => v as bool? ?? false), + useAccelerateEndpoint: $checkedConvert( + 'useAccelerateEndpoint', (v) => v as bool? ?? false), + ); + return val; + }, ); Map _$S3UploadFilePluginOptionsToJson(