Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

Commit b2fe01b

Browse files
authored
[google_sign_in] Correctly passes serverClientId to native libs (#6691)
* Correctly passes serverClientId to native libs * Bumps versions
1 parent 51d0844 commit b2fe01b

File tree

8 files changed

+17
-4
lines changed

8 files changed

+17
-4
lines changed

packages/google_sign_in/google_sign_in_android/CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 6.1.2
2+
3+
* Fixes passing `serverClientId` via the channelled `init` call
4+
15
## 6.1.1
26

37
* Corrects typos in plugin error logs and removes not actionable warnings.

packages/google_sign_in/google_sign_in_android/lib/google_sign_in_android.dart

+1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ class GoogleSignInAndroid extends GoogleSignInPlatform {
4545
'scopes': params.scopes,
4646
'hostedDomain': params.hostedDomain,
4747
'clientId': params.clientId,
48+
'serverClientId': params.serverClientId,
4849
'forceCodeForRefreshToken': params.forceCodeForRefreshToken,
4950
});
5051
}

packages/google_sign_in/google_sign_in_android/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: google_sign_in_android
22
description: Android implementation of the google_sign_in plugin.
33
repository: https://github.com/flutter/plugins/tree/main/packages/google_sign_in/google_sign_in_android
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+google_sign_in%22
5-
version: 6.1.1
5+
version: 6.1.2
66

77
environment:
88
sdk: ">=2.14.0 <3.0.0"

packages/google_sign_in/google_sign_in_android/test/google_sign_in_android_test.dart

+3
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ void main() {
111111
'scopes': <String>['two', 'scopes'],
112112
'signInOption': 'SignInOption.games',
113113
'clientId': 'fakeClientId',
114+
'serverClientId': null,
114115
'forceCodeForRefreshToken': false,
115116
}),
116117
() {
@@ -119,12 +120,14 @@ void main() {
119120
scopes: <String>['two', 'scopes'],
120121
signInOption: SignInOption.games,
121122
clientId: 'fakeClientId',
123+
serverClientId: 'fakeServerClientId',
122124
forceCodeForRefreshToken: true));
123125
}: isMethodCall('init', arguments: <String, dynamic>{
124126
'hostedDomain': 'example.com',
125127
'scopes': <String>['two', 'scopes'],
126128
'signInOption': 'SignInOption.games',
127129
'clientId': 'fakeClientId',
130+
'serverClientId': 'fakeServerClientId',
128131
'forceCodeForRefreshToken': true,
129132
}),
130133
() {

packages/google_sign_in/google_sign_in_ios/CHANGELOG.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
## NEXT
1+
## 5.5.1
22

3+
* Fixes passing `serverClientId` via the channelled `init` call
34
* Updates minimum Flutter version to 2.10.
45

56
## 5.5.0

packages/google_sign_in/google_sign_in_ios/lib/google_sign_in_ios.dart

+1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class GoogleSignInIOS extends GoogleSignInPlatform {
4949
'scopes': params.scopes,
5050
'hostedDomain': params.hostedDomain,
5151
'clientId': params.clientId,
52+
'serverClientId': params.serverClientId,
5253
});
5354
}
5455

packages/google_sign_in/google_sign_in_ios/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: google_sign_in_ios
22
description: iOS implementation of the google_sign_in plugin.
33
repository: https://github.com/flutter/plugins/tree/main/packages/google_sign_in/google_sign_in_ios
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+google_sign_in%22
5-
version: 5.5.0
5+
version: 5.5.1
66

77
environment:
88
sdk: ">=2.14.0 <3.0.0"

packages/google_sign_in/google_sign_in_ios/test/google_sign_in_ios_test.dart

+4-1
Original file line numberDiff line numberDiff line change
@@ -124,16 +124,19 @@ void main() {
124124
'hostedDomain': 'example.com',
125125
'scopes': <String>['two', 'scopes'],
126126
'clientId': 'fakeClientId',
127+
'serverClientId': null,
127128
}),
128129
() {
129130
googleSignIn.initWithParams(const SignInInitParameters(
130131
hostedDomain: 'example.com',
131132
scopes: <String>['two', 'scopes'],
132-
clientId: 'fakeClientId'));
133+
clientId: 'fakeClientId',
134+
serverClientId: 'fakeServerClientId'));
133135
}: isMethodCall('init', arguments: <String, dynamic>{
134136
'hostedDomain': 'example.com',
135137
'scopes': <String>['two', 'scopes'],
136138
'clientId': 'fakeClientId',
139+
'serverClientId': 'fakeServerClientId',
137140
}),
138141
() {
139142
googleSignIn.getTokens(

0 commit comments

Comments
 (0)