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

[google_sign_in] Slight cleanup in GoogleSignInPlugin #7013

Merged
auto-submit merged 9 commits into from
Feb 10, 2023
Merged

[google_sign_in] Slight cleanup in GoogleSignInPlugin #7013

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2898b57
Slight cleanup in GoogleSignInPlugin
tvolkert Jan 24, 2023
82a3823
Run formatter and fix some compilation errors
tvolkert Jan 24, 2023
ef8ec2f
Version bump
tvolkert Jan 24, 2023
7d74bdd
Declare throws
tvolkert Jan 24, 2023
2801767
Update error text expectation
tvolkert Jan 24, 2023
eadf792
Diagnose failing test
tvolkert Jan 24, 2023
6608fbb
Code
tvolkert Jan 24, 2023
7663e8d
Code
tvolkert Jan 24, 2023
75ccc3a
Fix test
tvolkert Jan 24, 2023
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
Run formatter and fix some compilation errors
  • Loading branch information
@tvolkert
tvolkert committed Jan 25, 2023
commit 82a3823f69d33c419e44816902c28d4502b27d92
10 changes: 5 additions & 5 deletions ..._in_android/android/src/main/java/io/flutter/plugins/googlesignin/GoogleSignInPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,18 +540,18 @@ private void onSignInAccount(GoogleSignInAccount account) {
private String errorCodeForStatus(int statusCode) {
switch (statusCode) {
case GoogleSignInStatusCodes.SIGN_IN_CANCELLED:
return ERROR_REASON_SIGN_IN_CANCELED;
return ERROR_REASON_SIGN_IN_CANCELED;
case CommonStatusCodes.SIGN_IN_REQUIRED:
return ERROR_REASON_SIGN_IN_REQUIRED;
return ERROR_REASON_SIGN_IN_REQUIRED;
case CommonStatusCodes.NETWORK_ERROR:
return ERROR_REASON_NETWORK_ERROR;
return ERROR_REASON_NETWORK_ERROR;
case GoogleSignInStatusCodes.SIGN_IN_CURRENTLY_IN_PROGRESS:
case GoogleSignInStatusCodes.SIGN_IN_FAILED:
case CommonStatusCodes.INVALID_ACCOUNT:
case CommonStatusCodes.INTERNAL_ERROR:
return ERROR_REASON_SIGN_IN_FAILED;
return ERROR_REASON_SIGN_IN_FAILED;
default:
return ERROR_REASON_SIGN_IN_FAILED;
return ERROR_REASON_SIGN_IN_FAILED;
}
}

Expand Down
7 changes: 4 additions & 3 deletions ...gn_in_android/android/src/test/java/io/flutter/plugins/googlesignin/GoogleSignInTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import com.google.android.gms.auth.api.signin.GoogleSignInClient;
import com.google.android.gms.auth.api.signin.GoogleSignInOptions;
import com.google.android.gms.common.api.ApiException;
import com.google.android.gms.common.api.CommonStatusCodes;
import com.google.android.gms.common.api.Scope;
import com.google.android.gms.common.api.Status;
import com.google.android.gms.tasks.Task;
Expand Down Expand Up @@ -214,13 +215,13 @@ public void signInSilentlyThatImmediatelyCompletesWithoutResultFinishesWithError
MethodCall methodCall = buildInitMethodCall(clientId, null);
initAndAssertServerClientId(methodCall, clientId);

ApiException exception = new ApiException(new Status(CommonStatusCodes.SIGN_IN_REQUIRED, "Error text"));
ApiException exception =
new ApiException(new Status(CommonStatusCodes.SIGN_IN_REQUIRED, "Error text"));
when(mockClient.silentSignIn()).thenReturn(mockSignInTask);
when(mockSignInTask.isComplete()).thenReturn(true);
when(mockSignInTask.getResult(ApiException.class)).thenThrow(exception);

MethodCall methodCall = new MethodCall("signInSilently", null);
plugin.onMethodCall(methodCall, result);
plugin.onMethodCall(new MethodCall("signInSilently", null), result);
verify(result).error("sign_in_required", "Error text", null);
}

Expand Down