Skip to content

Commit

Permalink
6.0.4 try-catch on getIdToken();
Browse files Browse the repository at this point in the history
  • Loading branch information
Drawner committed Aug 18, 2020
1 parent a243b5d commit 15363f8
Show file tree
Hide file tree
Showing 4 changed files with 206 additions and 9 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## 6.0.4
try-catch on getIdToken();

## 6.0.3
June 03, 2020
- Corrected Apache Licence.
Expand Down
184 changes: 184 additions & 0 deletions analysis_options.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,184 @@
#include: package:pedantic/analysis_options.yaml

# OR

# Strict Flutter lint Rules
# List of all rules: https://dart-lang.github.io/linter/lints/ for lint rules documentation
# Update from http://dart-lang.github.io/linter/lints/options/options.html

analyzer:
errors:
missing_required_param: error
missing_return: error
todo: ignore
language:
strict-inference: true
strict-raw-types: true

linter:
rules:
- always_declare_return_types
- always_put_control_body_on_new_line
# - always_put_required_named_parameters_first # not crucial and we do it all around
- always_require_non_null_named_parameters
# - always_specify_types # we use type inference
- annotate_overrides
# - avoid_annotating_with_dynamic # we want to be explicit with dynamic
- avoid_as
- avoid_bool_literals_in_conditional_expressions
# - avoid_catches_without_on_clauses # we catch both Exceptions and Errors
- avoid_catching_errors
- avoid_classes_with_only_static_members
- avoid_double_and_int_checks
- avoid_empty_else
- avoid_equals_and_hash_code_on_mutable_classes
- avoid_escaping_inner_quotes
- avoid_field_initializers_in_const_classes
- avoid_function_literals_in_foreach_calls
- avoid_implementing_value_types
- avoid_init_to_null
- avoid_js_rounded_ints
- avoid_null_checks_in_equality_operators
- avoid_positional_boolean_parameters
- avoid_print
- avoid_private_typedef_functions
- avoid_redundant_argument_values
- avoid_relative_lib_imports
- avoid_renaming_method_parameters
- avoid_return_types_on_setters
# - avoid_returning_null # we do this commonly
- avoid_returning_null_for_future
- avoid_returning_null_for_void
- avoid_returning_this
- avoid_setters_without_getters
- avoid_shadowing_type_parameters
- avoid_single_cascade_in_expression_statements
- avoid_slow_async_io
- avoid_types_as_parameter_names
# - avoid_types_on_closure_parameters # conflicts with always_specify_types
- avoid_unnecessary_containers
- avoid_unused_constructor_parameters
- avoid_void_async
- avoid_web_libraries_in_flutter
- await_only_futures
- camel_case_extensions
- camel_case_types
- cancel_subscriptions
- cascade_invocations
- close_sinks
- comment_references
# - constant_identifier_names # we are using those all around
- control_flow_in_finally
- curly_braces_in_flow_control_structures
# - diagnostic_describe_all_properties # nice to have for libs but overkill for applications
- directives_ordering
- empty_catches
- empty_constructor_bodies
- empty_statements
- file_names
# - flutter_style_todos # don't need those for now
- hash_and_equals
- implementation_imports
- invariant_booleans
- iterable_contains_unrelated_type
- join_return_with_assignment
- leading_newlines_in_multiline_strings
- library_names
- library_prefixes
# - lines_longer_than_80_chars # we use it when temporarily adding strings before translations
- list_remove_unrelated_type
- literal_only_boolean_expressions
- missing_whitespace_between_adjacent_strings
- no_adjacent_strings_in_list
- no_duplicate_case_values
- no_logic_in_create_state
- no_runtimeType_toString
- non_constant_identifier_names
- null_closures
# - omit_local_variable_types # opposite of always_specify_types
- one_member_abstracts
- only_throw_errors
- overridden_fields
- package_api_docs
- package_names
- package_prefixed_library_names
# - parameter_assignments # we do this commonly
- prefer_adjacent_string_concatenation
- prefer_asserts_in_initializer_lists
# - prefer_asserts_with_message # we do this commonly
- prefer_collection_literals
- prefer_conditional_assignment
- prefer_const_constructors
- prefer_const_constructors_in_immutables
- prefer_const_declarations
- prefer_const_literals_to_create_immutables
- prefer_constructors_over_static_methods
- prefer_contains
# - prefer_double_quotes We use single quotes
- prefer_equal_for_default_values
# - prefer_expression_function_bodies # conflicts with https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo#consider-using--for-short-functions-and-methods
- prefer_final_fields
- prefer_final_in_for_each
- prefer_final_locals
- prefer_for_elements_to_map_fromIterable
- prefer_foreach
- prefer_function_declarations_over_variables
- prefer_generic_function_type_aliases
- prefer_if_elements_to_conditional_expressions
- prefer_if_null_operators
- prefer_initializing_formals
- prefer_inlined_adds
- prefer_int_literals
- prefer_interpolation_to_compose_strings
- prefer_is_empty
- prefer_is_not_empty
- prefer_is_not_operator
- prefer_iterable_whereType
- prefer_mixin
- prefer_null_aware_operators
# - prefer_relative_imports # we do not use relative imports
- prefer_single_quotes
- prefer_spread_collections
- prefer_typing_uninitialized_variables
- prefer_void_to_null
- provide_deprecation_message
# - public_member_api_docs # do not use for an application, only a library
- recursive_getters
- slash_for_doc_comments
- sort_child_properties_last
- sort_constructors_first
- sort_pub_dependencies
- sort_unnamed_constructors_first
- test_types_in_equals
- throw_in_finally
# - type_annotate_public_apis # subset of always_specify_types
- type_init_formals
- unawaited_futures
- unnecessary_await_in_return
- unnecessary_brace_in_string_interps
- unnecessary_const
# - unnecessary_final # having finals is the preferred approach
- unnecessary_getters_setters
- unnecessary_lambdas
- unnecessary_new
- unnecessary_null_aware_assignments
- unnecessary_null_in_if_null_operators
- unnecessary_overrides
- unnecessary_parenthesis
- unnecessary_raw_strings
- unnecessary_statements
- unnecessary_string_escapes
- unnecessary_string_interpolations
- unnecessary_this
- unrelated_type_equality_checks
- unsafe_html
- use_full_hex_values_for_flutter_colors
- use_function_type_syntax_for_parameters
- use_key_in_widget_constructors
- use_raw_strings
- use_rethrow_when_possible
- use_setters_to_change_properties
- use_string_buffers
- use_to_and_as_if_applicable
- valid_regexps
- void_checks
18 changes: 11 additions & 7 deletions lib/src/auth.dart
Original file line number Diff line number Diff line change
Expand Up @@ -149,18 +149,18 @@ class Auth {
List<FacebookPermission> get permissions => _permissions;
final List<FacebookPermission> _permissions = List();

String get accessToken => _accessToken ?? "";
String _accessToken = "";
String get accessToken => _accessToken ?? '';
String _accessToken = '';

DateTime get authTime => _idTokenResult?.authTime ?? DateTime.now();

Map<dynamic, dynamic> get claims => _idTokenResult?.claims ?? {};

String get displayName => _displayName;
String _displayName = "";
String _displayName = '';

String get email => _email;
String _email = "";
String _email = '';

bool get eventErrors => _eventErrors.isNotEmpty;

Expand Down Expand Up @@ -1337,7 +1337,7 @@ class Auth {

_isAnonymous = _user?.isAnonymous ?? true;

_uid = _user?.uid ?? "";
_uid = _user?.uid ?? " ";

_displayName = _user?.displayName ?? "";

Expand All @@ -1347,8 +1347,12 @@ class Auth {

_phoneNumber = _user?.phoneNumber ?? "";

// Perform this 'await' near the end to assign the rest.
_idTokenResult = await _user?.getIdToken();
try {
// Perform this 'await' near the end to assign the rest.
_idTokenResult = await _user?.getIdToken();
}catch(ex){
setError(ex);
}

_idToken = _idTokenResult?.token ?? "";

Expand Down
10 changes: 8 additions & 2 deletions pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
name: auth
description: Authorization Library Package to log into Google, Facebook, or by Username and Password.

version: 6.0.3
version: 6.0.4

homepage: https://github.com/AndriousSolutions/auth
repository: https://github.com/AndriousSolutions/auth

environment:
sdk: '>=2.6.0 <3.0.0'
sdk: '>=2.7.0 <3.0.0'

dependencies:
flutter:
Expand Down Expand Up @@ -39,6 +39,12 @@ dev_dependencies:
flutter_test:
sdk: flutter

# Setting up Lint Rules
# Most of the recommended lints directly implement the guidelines set out in Effective Dart:
# https://dart.dev/guides/language/effective-dart
# https://pub.dev/packages/pedantic
pedantic: ^1.0.0

# For information on the generic Dart part of this file, see the
# following page: https://www.dartlang.org/tools/pub/pubspec

Expand Down

0 comments on commit 15363f8

Please sign in to comment.