[google_sign_in] PR 3/4 Migrate ViewProvider and GID SDK wrappers from Objective-C to Swift by victogomez-cs · Pull Request #12657 · flutter/packages

victogomez-cs · 2026-08-27T17:24:25Z

Migrates ViewProvider and the GID SDK wrappers from Objective-C to Swift. The plugin class from PR 2/4 now talks to Swift protocols instead of FSIViewProvider / FSIGIDSignIn.

The Swift GID API takes a non-optional presenter. Obj-C nonnull was not enforced at runtime, so a nil registrar view (headless / deallocated engine) was a silent no-op. Force-unwrapping that in Swift would crash. This PR completes with an NSError instead, mapped to a Flutter error like other unexpected failures.

Adds unit tests for the missing-presenter path (signIn / addScopes on iOS and macOS).

Bumps google_sign_in_ios to 6.3.4.

PR 3/4 of the Obj-C → Swift migration. Depends on PR 2/4 (plugin class). Continues flutter/flutter#119103

Pre-Review Checklist

If you need help, consider asking for advice on the #hackers-new channel on Discord.

Note: The Flutter team is currently trialing the use of Gemini Code Assist for GitHub. Comments from the gemini-code-assist bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed.

Regular contributors who have demonstrated familiarity with the repository guidelines only need to comment if the PR is not auto-exempted by repo tooling. ↩ ↩²

gemini-code-assist

Code Review

This pull request migrates the ViewProvider and GID SDK wrappers from Objective-C to Swift within the iOS Google Sign-In plugin. It removes the legacy Objective-C files and introduces equivalent Swift protocols, wrappers, and view providers, while updating the plugin implementation and tests accordingly. The review feedback recommends avoiding force-unwrapping of non-optional properties (such as user, accessToken, and refreshToken) in the wrapper classes by implementing non-failable initializers for GIDGoogleUserWrapper and GIDTokenWrapper.

gemini-code-assist · 2026-08-27T17:25:57Z

+  var user: GIDGoogleUserProtocol {
+    return GIDGoogleUserWrapper(user: result.user)!
+  }


Since result.user is a non-optional GIDGoogleUser, we can avoid force-unwrapping here by providing a non-failable initializer in GIDGoogleUserWrapper.

Suggested change

var user: GIDGoogleUserProtocol {

return GIDGoogleUserWrapper(user: result.user)!

}

var user: GIDGoogleUserProtocol {

return GIDGoogleUserWrapper(user: result.user)

}

References

Swift safety guidelines discourage the use of force-unwrapping (!) because it bypasses the compiler's type safety checks and can lead to runtime crashes. ^(link)

Good catch, fixed. That unwrap was only needed because GIDGoogleUserWrapper had a failable init. Added a non-failable init(user:) for the non-optional SDK value and dropped the !

gemini-code-assist · 2026-08-27T17:25:57Z

+  init?(user: GIDGoogleUser?) {
+    guard let user else { return nil }
+    self.user = user
+  }


Provide a non-failable initializer for non-optional GIDGoogleUser instances, and make the failable initializer a convenience initializer. This allows wrapping non-optional users without force-unwrapping.

Suggested change

init?(user: GIDGoogleUser?) {

guard let user else { return nil }

self.user = user

}

init(user: GIDGoogleUser) {

self.user = user

}

convenience init?(user: GIDGoogleUser?) {

guard let user else { return nil }

self.init(user: user)

}

References

Swift safety guidelines discourage the use of force-unwrapping (!) because it bypasses the compiler's type safety checks and can lead to runtime crashes. ^(link)

Done. init(user: GIDGoogleUser) is the designated initializer, and convenience init?(user: GIDGoogleUser?) remains for the optional completion-handler values

gemini-code-assist · 2026-08-27T17:25:57Z

+  var accessToken: GIDTokenProtocol {
+    return GIDTokenWrapper(token: user.accessToken)!
+  }
+
+  var refreshToken: GIDTokenProtocol {
+    return GIDTokenWrapper(token: user.refreshToken)!
+  }


Since user.accessToken and user.refreshToken are non-optional, we can avoid force-unwrapping them by using a non-failable initializer in GIDTokenWrapper.

Suggested change

var accessToken: GIDTokenProtocol {

return GIDTokenWrapper(token: user.accessToken)!

}

var refreshToken: GIDTokenProtocol {

return GIDTokenWrapper(token: user.refreshToken)!

}

var accessToken: GIDTokenProtocol {

return GIDTokenWrapper(token: user.accessToken)

}

var refreshToken: GIDTokenProtocol {

return GIDTokenWrapper(token: user.refreshToken)

}

References

Swift safety guidelines discourage the use of force-unwrapping (!) because it bypasses the compiler's type safety checks and can lead to runtime crashes. ^(link)

Agreed and fixed. accessToken and refreshToken are non-optional on GIDGoogleUser, so they now use the non-failable GIDTokenWrapper initializer. idToken is still optional, so that call site keeps the failable init

gemini-code-assist · 2026-08-27T17:25:57Z

+  init?(token: GIDToken?) {
+    guard let token else { return nil }
+    self.token = token
+  }


Provide a non-failable initializer for non-optional GIDToken instances, and make the failable initializer a convenience initializer. This allows wrapping non-optional tokens without force-unwrapping.

Suggested change

init?(token: GIDToken?) {

guard let token else { return nil }

self.token = token

}

init(token: GIDToken) {

self.token = token

}

convenience init?(token: GIDToken?) {

guard let token else { return nil }

self.init(token: token)

}

References

Swift safety guidelines discourage the use of force-unwrapping (!) because it bypasses the compiler's type safety checks and can lead to runtime crashes. ^(link)

Done, same pattern as the user wrapper: non-failable init(token:) plus convenience init?(token:) for optional tokens

hellohuanlin · 2026-09-02T03:25:46Z

+        code: 0,
+        userInfo: [
+          NSLocalizedDescriptionKey: "No host view available to present Google Sign-In."
+        ]))


optional: this indentation pyramid is a bit too much. can you manually clean it up a bit?

Done! Pulled the NSError into missingPresenterError so requirePresenter is just the nil check and completion

hellohuanlin · 2026-09-02T03:26:31Z

+  }
+
+  func signOut() {
+    signIn.signOut()


the signIn ivar name is odd here.

Agreed. signIn.signOut() / signIn.signIn(...) was confusing next to the protocol methods. Renamed the stored GIDSignIn to gidSignIn

hellohuanlin · 2026-09-02T17:45:10Z

+    NSLocalizedDescriptionKey: "No host view available to present Google Sign-In."
+  ])
+
+private func requirePresenter<Presenter>(


this func is confusing. I would just inline it.

Inlined it. The generic helper was hiding a simple nil check; signIn/addScopes now guard the presenter and complete with missingPresenterError directly

vashworth · 2026-09-03T22:04:42Z

From triage: Please rebase off main so that tests will pass

…bjective-C to Swift.

…ignInWrapper. Introduces a new `requirePresenter` function to handle cases where the presenter is nil, preventing crashes and returning appropriate errors. Adds unit tests to verify behavior when signing in without a presenter, ensuring robust error reporting for the Google Sign-In process.

…values.

…riable name and improve error handling. Renames the `signIn` variable to `gidSignIn` for clarity and consistency. Introduces a private `missingPresenterError` to streamline error handling in the `requirePresenter` function, enhancing code readability and maintainability.

Removes the `requirePresenter` function and directly checks for the presence of the presenter in the `signIn` methods. This change enhances code clarity and maintains consistent error handling for missing presenters, ensuring robust error reporting during the Google Sign-In process.

flutter-dashboard Bot added the CICD Run CI/CD label Aug 27, 2026

github-actions Bot added p: google_sign_in platform-ios platform-macos labels Aug 27, 2026

victogomez-cs added the triage-ios Should be looked at in iOS triage label Aug 27, 2026

gemini-code-assist Bot reviewed Aug 27, 2026

View reviewed changes

victogomez-cs force-pushed the pr2/google-sign-in-ios-swift-plugin branch from f4ccb35 to 34f5240 Compare August 27, 2026 17:37

victogomez-cs force-pushed the pr3/google-sign-in-ios-view-provider branch from 661e862 to 0e55e56 Compare August 27, 2026 17:37

LouiseHsu requested a review from hellohuanlin August 27, 2026 21:58

victogomez-cs force-pushed the pr2/google-sign-in-ios-swift-plugin branch from 34f5240 to 9dce861 Compare August 28, 2026 17:22

victogomez-cs force-pushed the pr3/google-sign-in-ios-view-provider branch from b2aa6db to f89ebdd Compare August 28, 2026 17:22

hellohuanlin approved these changes Sep 2, 2026

View reviewed changes

hellohuanlin reviewed Sep 2, 2026

View reviewed changes

hellohuanlin approved these changes Sep 2, 2026

View reviewed changes

victogomez-cs force-pushed the pr2/google-sign-in-ios-swift-plugin branch from 9dce861 to 93fbe9d Compare September 2, 2026 18:43

victogomez-cs force-pushed the pr3/google-sign-in-ios-view-provider branch from 48c44fb to 3832e69 Compare September 2, 2026 18:43

victogomez-cs force-pushed the pr2/google-sign-in-ios-swift-plugin branch from 93fbe9d to 392df80 Compare September 2, 2026 21:11

victogomez-cs force-pushed the pr3/google-sign-in-ios-view-provider branch 3 times, most recently from bc6b4a3 to 878c0f9 Compare September 3, 2026 18:53

victogomez-cs mentioned this pull request Sep 3, 2026

[google_sign_in] PR 4/4 Convert the Pigeon host API from Objective-C to Swift #12658

Open

11 tasks

victogomez-cs added 5 commits September 4, 2026 09:53

[google_sign_in_ios] Migrate ViewProvider and GID SDK wrappers from O…

375a2db

…bjective-C to Swift.

[google_sign_in_ios] Avoid force-unwrapping non-optional GID wrapper …

f5bc298

…values.

victogomez-cs force-pushed the pr3/google-sign-in-ios-view-provider branch from 878c0f9 to bf080a0 Compare September 4, 2026 15:54

Uh oh!

Conversation

victogomez-cs commented Aug 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pre-Review Checklist

Footnotes

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

gemini-code-assist Bot Aug 27, 2026

Choose a reason for hiding this comment

Uh oh!

victogomez-cs Aug 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot Aug 27, 2026

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot Aug 27, 2026

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot Aug 27, 2026

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

vashworth commented Sep 3, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

victogomez-cs commented Aug 27, 2026 •

edited

Loading

victogomez-cs Aug 27, 2026 •

edited

Loading