Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Address PR feedback
  • Loading branch information
ditman committed Nov 8, 2019
commit f0b24d98bccee1a80c7f3b948a44026fd2eaaa0e
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ abstract class GoogleSignInPlatform {
throw UnimplementedError('init() has not been implemented.');
}

/// Attempts to reuse pre-existing credentials to sign in again, without user interaction
/// Attempts to reuse pre-existing credentials to sign in again, without user interaction.
Future<GoogleSignInUserData> signInSilently() async {
throw UnimplementedError('signInSilently() has not been implemented.');
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,25 +31,26 @@ class MethodChannelGoogleSignIn extends GoogleSignInPlatform {

@override
Future<GoogleSignInUserData> signInSilently() {
return channel.invokeMapMethod<String, dynamic>('signInSilently').then(
(Map<String, dynamic> data) => nativeUserDataToPluginUserData(data));
return channel
.invokeMapMethod<String, dynamic>('signInSilently')
.then(getUserDataFromMap);
}

@override
Future<GoogleSignInUserData> signIn() {
return channel.invokeMapMethod<String, dynamic>('signIn').then(
(Map<String, dynamic> data) => nativeUserDataToPluginUserData(data));
return channel
.invokeMapMethod<String, dynamic>('signIn')
.then(getUserDataFromMap);
}

@override
Future<GoogleSignInTokenData> getTokens(
{String email, bool shouldRecoverAuth = true}) {
return channel.invokeMapMethod<String, dynamic>(
'getTokens', <String, dynamic>{
return channel
.invokeMapMethod<String, dynamic>('getTokens', <String, dynamic>{
'email': email,
'shouldRecoverAuth': shouldRecoverAuth,
}).then(
(Map<String, dynamic> data) => nativeTokenDataToPluginTokenData(data));
}).then(getTokenDataFromMap);
}

@override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,12 @@ class GoogleSignInUserData {
bool operator ==(dynamic other) {
if (identical(this, other)) return true;
if (other is! GoogleSignInUserData) return false;
return other.displayName == displayName &&
other.email == email &&
other.id == id &&
other.photoUrl == photoUrl &&
other.idToken == idToken;
final GoogleSignInUserData otherUserData = other;
return otherUserData.displayName == displayName &&
otherUserData.email == email &&
otherUserData.id == id &&
otherUserData.photoUrl == photoUrl &&
otherUserData.idToken == idToken;
}
}

Expand All @@ -39,6 +40,8 @@ class GoogleSignInTokenData {
bool operator ==(dynamic other) {
if (identical(this, other)) return true;
if (other is! GoogleSignInTokenData) return false;
return other.idToken == idToken && other.accessToken == accessToken;
final GoogleSignInTokenData otherTokenData = other;
return otherTokenData.idToken == idToken &&
otherTokenData.accessToken == accessToken;
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import '../google_sign_in_platform_interface.dart';

GoogleSignInUserData nativeUserDataToPluginUserData(Map<String, dynamic> data) {
/// Converts user data coming from native code into the proper platform interface type.
GoogleSignInUserData getUserDataFromMap(Map<String, dynamic> data) {
if (data == null) {
return null;
}
Expand All @@ -12,8 +13,8 @@ GoogleSignInUserData nativeUserDataToPluginUserData(Map<String, dynamic> data) {
idToken: data['idToken']);
}

GoogleSignInTokenData nativeTokenDataToPluginTokenData(
Map<String, dynamic> data) {
/// Converts token data coming from native code into the proper platform interface type.
GoogleSignInTokenData getTokenDataFromMap(Map<String, dynamic> data) {
if (data == null) {
return null;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,8 @@ const Map<String, dynamic> kDefaultResponses = <String, dynamic>{
'getTokens': kTokenData,
};

final GoogleSignInUserData kUser = nativeUserDataToPluginUserData(kUserData);
final GoogleSignInTokenData kToken =
nativeTokenDataToPluginTokenData(kTokenData);
final GoogleSignInUserData kUser = getUserDataFromMap(kUserData);
final GoogleSignInTokenData kToken = getTokenDataFromMap(kTokenData);

void main() {
TestWidgetsFlutterBinding.ensureInitialized();
Expand Down