Skip to content

Remove GIDDisconnectCompletion #267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
petea merged 2 commits into from
Dec 7, 2022
Merged

Remove GIDDisconnectCompletion #267

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3e02fd
Remove GIDDisconnectCompletion.
petea Dec 7, 2022
12684e0
Retain GIDDisconnectCompletion in the GIDSignIn private header.
petea Dec 7, 2022
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
2 changes: 1 addition & 1 deletion GoogleSignIn/Sources/GIDSignIn.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ - (void)signOut {
[self removeAllKeychainEntries];
}

- (void)disconnectWithCompletion:(nullable GIDDisconnectCompletion)completion {
- (void)disconnectWithCompletion:(nullable void (^)(NSError *_Nullable error))completion {
OIDAuthState *authState = _currentUser.authState;
if (!authState) {
// Even the user is not signed in right now, we still need to remove any token saved in the
Expand Down
7 changes: 2 additions & 5 deletions GoogleSignIn/Sources/Public/GoogleSignIn/GIDSignIn.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,6 @@ typedef NS_ERROR_ENUM(kGIDSignInErrorDomain, GIDSignInErrorCode) {
kGIDSignInErrorCodeMismatchWithCurrentUser = -9,
};

/// Represents a completion block that takes an error if the operation was unsuccessful.
typedef void (^GIDDisconnectCompletion)(NSError *_Nullable error);

/// This class signs the user in with Google.
///
/// For reference, please see "Google Sign-In for iOS" at
Expand Down Expand Up @@ -102,9 +99,9 @@ typedef void (^GIDDisconnectCompletion)(NSError *_Nullable error);
/// Disconnects the current user from the app and revokes previous authentication. If the operation
/// succeeds, the OAuth 2.0 token is also removed from keychain.
///
/// @param completion The optional `GIDDisconnectCompletion` block that is called on completion.
/// @param completion The optional block that is called on completion.
/// This block will be called asynchronously on the main queue.
- (void)disconnectWithCompletion:(nullable GIDDisconnectCompletion)completion;
- (void)disconnectWithCompletion:(nullable void (^)(NSError *_Nullable error))completion;

#if TARGET_OS_IOS || TARGET_OS_MACCATALYST
/// Starts an interactive sign-in flow on iOS.
Expand Down