From 5335ccefd0c44d6f6b35b43087a9c018c0bd1aa3 Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Thu, 7 Feb 2019 14:59:56 -0800 Subject: [PATCH 1/3] pass the exception to dart so user can have clearer knowledge what went wrong --- packages/google_sign_in/ios/Classes/GoogleSignInPlugin.m | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/google_sign_in/ios/Classes/GoogleSignInPlugin.m b/packages/google_sign_in/ios/Classes/GoogleSignInPlugin.m index 58401cd11696..7f913f713d45 100644 --- a/packages/google_sign_in/ios/Classes/GoogleSignInPlugin.m +++ b/packages/google_sign_in/ios/Classes/GoogleSignInPlugin.m @@ -96,7 +96,12 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result result(@([[GIDSignIn sharedInstance] hasAuthInKeychain])); } else if ([call.method isEqualToString:@"signIn"]) { if ([self setAccountRequest:result]) { - [[GIDSignIn sharedInstance] signIn]; + @try { + [[GIDSignIn sharedInstance] signIn]; + } @catch (NSException *e) { + result([FlutterError errorWithCode:@"google_sign_in" message:e.reason details:e.name]); + [e raise]; + } } } else if ([call.method isEqualToString:@"getTokens"]) { GIDGoogleUser *currentUser = [GIDSignIn sharedInstance].currentUser; From c49bef8d9eb816f2c7577d0725cb9fd8e918c037 Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Thu, 7 Feb 2019 15:17:20 -0800 Subject: [PATCH 2/3] update pubspec and changlog --- packages/google_sign_in/CHANGELOG.md | 4 ++++ packages/google_sign_in/pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/google_sign_in/CHANGELOG.md b/packages/google_sign_in/CHANGELOG.md index 28b7df523c5b..69d5d77f2e22 100644 --- a/packages/google_sign_in/CHANGELOG.md +++ b/packages/google_sign_in/CHANGELOG.md @@ -1,3 +1,7 @@ +## 4.0.0+1 + +* Added better error message for iOS when the app is missing necessary URL schemes. + ## 4.0.0 * **Breaking change**. Migrate from the deprecated original Android Support diff --git a/packages/google_sign_in/pubspec.yaml b/packages/google_sign_in/pubspec.yaml index 52a53b865d19..92e80ab5caba 100755 --- a/packages/google_sign_in/pubspec.yaml +++ b/packages/google_sign_in/pubspec.yaml @@ -3,7 +3,7 @@ description: Flutter plugin for Google Sign-In, a secure authentication system for signing in with a Google account on Android and iOS. author: Flutter Team homepage: https://github.com/flutter/plugins/tree/master/packages/google_sign_in -version: 4.0.0 +version: 4.0.0+1 flutter: plugin: From 290957262aeccd69218fd5745511893a06284459 Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Thu, 7 Feb 2019 15:30:34 -0800 Subject: [PATCH 3/3] nit fix --- packages/google_sign_in/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/google_sign_in/CHANGELOG.md b/packages/google_sign_in/CHANGELOG.md index 69d5d77f2e22..d1da1336cc38 100644 --- a/packages/google_sign_in/CHANGELOG.md +++ b/packages/google_sign_in/CHANGELOG.md @@ -1,6 +1,6 @@ ## 4.0.0+1 -* Added better error message for iOS when the app is missing necessary URL schemes. +* Added a better error message for iOS when the app is missing necessary URL schemes. ## 4.0.0