Skip to content

Commit d4752b8

Browse files
committed
Fix auto signin
1 parent 17b3fb4 commit d4752b8

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

GoogleSignIn/Impl/GoogleSignInImplEditor.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,9 @@ void SigningIn()
120120
context.Response.OutputStream.Write(Encoding.UTF8.GetBytes("Can close this page"));
121121
context.Response.Close();
122122

123-
var result = await HttpWebRequest.CreateHttp("https://www.googleapis.com/oauth2/v4/token").Post("application/x-www-form-urlencoded","code=" + code + "&client_id=" + configuration.WebClientId + "&client_secret=" + configuration.ClientSecret + "&redirect_uri=" + httpListener.Prefixes.FirstOrDefault() + "&grant_type=authorization_code").ContinueWith((task) => task.Result,taskScheduler);
124-
var jobj = JObject.Parse(result);
123+
var jobj = await HttpWebRequest.CreateHttp("https://www.googleapis.com/oauth2/v4/token").Post("application/x-www-form-urlencoded","code=" + code + "&client_id=" + configuration.WebClientId + "&client_secret=" + configuration.ClientSecret + "&redirect_uri=" + httpListener.Prefixes.FirstOrDefault() + "&grant_type=authorization_code").ContinueWith((task) => {
124+
return JObject.Parse(task.Result);
125+
},taskScheduler);
125126

126127
var accessToken = (string)jobj.GetValue("access_token");
127128
var expiresIn = (int)jobj.GetValue("expires_in");

Plugins/Android/src/main/java/com/google/googlesignin/GoogleSignInHelper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ public Task<AuthorizationResult> apply(@NonNull Boolean silent) {
150150

151151
if(silent) {
152152
GetGoogleIdOption.Builder getGoogleIdOptionBuilder = new GetGoogleIdOption.Builder()
153-
.setFilterByAuthorizedAccounts(false)
153+
.setFilterByAuthorizedAccounts(hideUiPopups)
154154
.setAutoSelectEnabled(hideUiPopups);
155155

156156
if(defaultAccountName != null)

0 commit comments

Comments
 (0)