Skip to content

fix(expo): align iOS Google sign-in defaults - #8903

Merged
wobsoriano merged 1 commit into
mainfrom
mike/expo-google-sign-in-ios-parity
Jun 17, 2026
Merged

fix(expo): align iOS Google sign-in defaults#8903
wobsoriano merged 1 commit into
mainfrom
mike/expo-google-sign-in-ios-parity

Conversation

@mikepitre

@mikepitremikepitre commented Jun 17, 2026

Copy link
Copy Markdown
Contributor

Summary

Follow-up to #8901 for the two CodeRabbit comments we deferred there.

  • Treat blank or whitespace-only iOS Google client IDs as unconfigured so sign-in preserves the existing NOT_CONFIGURED path.
  • Default iOS Google One Tap signIn to filter by previously authorized accounts, matching Android and the documented default.

Testing

  • pnpm --filter @clerk/expo format:check
  • pnpm --filter @clerk/expo test

Summary by CodeRabbit

  • Bug Fixes
    • iOS Google One Tap sign-in now properly validates and rejects blank Google client IDs.
    • Account filtering for iOS Google One Tap now defaults to enabled, prioritizing previously authorized accounts.

@changeset-bot

changeset-botBot commented Jun 17, 2026

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: de4c6b3

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
NameType
@clerk/expoPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercelBot commented Jun 17, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentJun 17, 2026 8:17pm
swingsetReadyReadyPreview, CommentJun 17, 2026 8:17pm

Request Review

@coderabbitai

coderabbitaiBot commented Jun 17, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Repository UI (inherited)

Review profile: CHILL

Plan: Pro

Run ID: 845c891c-8128-46d0-b190-004d2ae8e535

📥 Commits

Reviewing files that changed from the base of the PR and between d4bccbe and de4c6b3.

📒 Files selected for processing (2)
  • .changeset/bright-lamps-sign.md
  • packages/expo/ios/ClerkGoogleSignInModule.swift

📝 Walkthrough

Walkthrough

ClerkGoogleSignInModule.swift adds a nonEmptyClientId helper that trims whitespace and converts empty strings to nil, applies it to webClientId and iosClientId in configure, and changes the filterByAuthorizedAccounts default from false to true in signIn. A changeset records a patch release for @clerk/expo.

Changes

iOS Google Sign-In fixes

Layer / File(s)Summary
Client ID normalization and filter default
packages/expo/ios/ClerkGoogleSignInModule.swift, .changeset/bright-lamps-sign.md
Adds nonEmptyClientId(_:) private helper that trims whitespace and returns nil for empty strings; applies it to webClientId and iosClientId in configure; changes filterByAuthorizedAccounts default to true in signIn; changeset records the patch release.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~5 minutes

Possibly related PRs

  • clerk/javascript#8901: Establishes the Expo Modules-based configure/signIn implementation in ClerkGoogleSignInModule.swift that this PR directly modifies to fix client ID handling and filter defaults.

Poem

🐇 A blank ID? No, no, that won't do!
I'll trim it to nil before passing it through.
Authorized accounts? Default to true!
The hop-along sign-in is fresh and brand new.
With a twitch of my nose, the patch lands just right,
One Tap on iOS shines clean and bright! ✨

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check nameStatusExplanationResolution
Docstring Coverage⚠️ WarningDocstring coverage is 75.00% which is insufficient. The required threshold is 80.00%.Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (4 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title accurately summarizes the main change: aligning iOS Google sign-in defaults by normalizing blank client IDs and fixing the filterByAuthorizedAccounts default behavior.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@pkg-pr-new

pkg-pr-newBot commented Jun 17, 2026

Copy link
Copy Markdown

Open in StackBlitz

@clerk/astro

npm i https://pkg.pr.new/@clerk/astro@8903

@clerk/backend

npm i https://pkg.pr.new/@clerk/backend@8903

@clerk/chrome-extension

npm i https://pkg.pr.new/@clerk/chrome-extension@8903

@clerk/clerk-js

npm i https://pkg.pr.new/@clerk/clerk-js@8903

@clerk/expo

npm i https://pkg.pr.new/@clerk/expo@8903

@clerk/expo-passkeys

npm i https://pkg.pr.new/@clerk/expo-passkeys@8903

@clerk/express

npm i https://pkg.pr.new/@clerk/express@8903

@clerk/fastify

npm i https://pkg.pr.new/@clerk/fastify@8903

@clerk/hono

npm i https://pkg.pr.new/@clerk/hono@8903

@clerk/localizations

npm i https://pkg.pr.new/@clerk/localizations@8903

@clerk/nextjs

npm i https://pkg.pr.new/@clerk/nextjs@8903

@clerk/nuxt

npm i https://pkg.pr.new/@clerk/nuxt@8903

@clerk/react

npm i https://pkg.pr.new/@clerk/react@8903

@clerk/react-router

npm i https://pkg.pr.new/@clerk/react-router@8903

@clerk/shared

npm i https://pkg.pr.new/@clerk/shared@8903

@clerk/tanstack-react-start

npm i https://pkg.pr.new/@clerk/tanstack-react-start@8903

@clerk/testing

npm i https://pkg.pr.new/@clerk/testing@8903

@clerk/ui

npm i https://pkg.pr.new/@clerk/ui@8903

@clerk/upgrade

npm i https://pkg.pr.new/@clerk/upgrade@8903

@clerk/vue

npm i https://pkg.pr.new/@clerk/vue@8903

commit: de4c6b3

@wobsorianowobsoriano left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks 👍🏼

@github-actions

Copy link
Copy Markdown
Contributor

API Changes Report

Generated by Break Check on 2026-06-17T20:21:19.109Z

Summary

MetricCount
Packages analyzed19
Packages with changes0
🔴 Breaking changes0
🟡 Non-breaking changes0
🟢 Additions0

No API Changes Detected

All packages have stable APIs with no detected changes.


Report generated by Break Check

Last ran on de4c6b3.

@chatgpt-codex-connectorchatgpt-codex-connectorBot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit:de4c6b380c

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

let iosClientId = params["iosClientId"] as? String
let webClientId = self.nonEmptyClientId(params["webClientId"] as? String)
let iosClientId = self.nonEmptyClientId(params["iosClientId"] as? String)
self.clientId = iosClientId ?? webClientId

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Reject blank web client IDs before falling back

When webClientId is whitespace but iosClientId is set, nonEmptyClientId turns the web ID into nil, but this fallback still marks the module configured from the iOS ID and then passes nil as serverClientID to GIDConfiguration. The shared hook can pass this case because it only checks !webClientId before sending the returned ID token to Clerk as google_one_tap (packages/expo/src/hooks/useSignInWithGoogle.shared.ts:79 and :144-146), while ConfigureParams.webClientId is required and documented as the iOS serverClientID/token audience (packages/expo/src/google-one-tap/types.ts:6-10), so the flow proceeds with the wrong token audience instead of preserving the intended NOT_CONFIGURED path.

Useful? React with 👍 / 👎.

}

let filterByAuthorized = params?["filterByAuthorizedAccounts"] as? Bool ?? false
let filterByAuthorized = params?["filterByAuthorizedAccounts"] as? Bool ?? true

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Implement authorized-account filtering for the new default

With this default flipped to true, an iOS caller that omits filterByAuthorizedAccounts now expects the saved-credentials path described by ClerkGoogleOneTapSignIn.signIn, but the native code only converts that flag into an optional hint from GIDSignIn.sharedInstance.currentUser. On a cold launch or fresh install where no current user has been restored, the hint is nil and signIn(withPresenting:) opens the full interactive Google picker instead of returning the NO_SAVED_CREDENTIAL_FOUND/noSavedCredentialFound path that Android and the JS wrapper expose for this default.

Useful? React with 👍 / 👎.

@wobsoriano
wobsoriano merged commit 0bf306f into mainJun 17, 2026
52 of 59 checks passed
@wobsoriano
wobsoriano deleted the mike/expo-google-sign-in-ios-parity branch June 17, 2026 20:22
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@mikepitre@wobsoriano
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix(expo): align iOS Google sign-in defaults by mikepitre · Pull Request #8903 · clerk/javascript · GitHub
Skip to content

fix(expo): align iOS Google sign-in defaults - #8903

Merged
wobsoriano merged 1 commit into
mainfrom
mike/expo-google-sign-in-ios-parity
Jun 17, 2026
Merged

fix(expo): align iOS Google sign-in defaults#8903
wobsoriano merged 1 commit into
mainfrom
mike/expo-google-sign-in-ios-parity

Conversation

@mikepitre

@mikepitremikepitre commented Jun 17, 2026

Copy link
Copy Markdown
Contributor

Summary

Follow-up to #8901 for the two CodeRabbit comments we deferred there.

  • Treat blank or whitespace-only iOS Google client IDs as unconfigured so sign-in preserves the existing NOT_CONFIGURED path.
  • Default iOS Google One Tap signIn to filter by previously authorized accounts, matching Android and the documented default.

Testing

  • pnpm --filter @clerk/expo format:check
  • pnpm --filter @clerk/expo test

Summary by CodeRabbit

  • Bug Fixes
    • iOS Google One Tap sign-in now properly validates and rejects blank Google client IDs.
    • Account filtering for iOS Google One Tap now defaults to enabled, prioritizing previously authorized accounts.

@changeset-bot

changeset-botBot commented Jun 17, 2026

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: de4c6b3

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
NameType
@clerk/expoPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercelBot commented Jun 17, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentJun 17, 2026 8:17pm
swingsetReadyReadyPreview, CommentJun 17, 2026 8:17pm

Request Review

@coderabbitai

coderabbitaiBot commented Jun 17, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Repository UI (inherited)

Review profile: CHILL

Plan: Pro

Run ID: 845c891c-8128-46d0-b190-004d2ae8e535

📥 Commits

Reviewing files that changed from the base of the PR and between d4bccbe and de4c6b3.

📒 Files selected for processing (2)
  • .changeset/bright-lamps-sign.md
  • packages/expo/ios/ClerkGoogleSignInModule.swift

📝 Walkthrough

Walkthrough

ClerkGoogleSignInModule.swift adds a nonEmptyClientId helper that trims whitespace and converts empty strings to nil, applies it to webClientId and iosClientId in configure, and changes the filterByAuthorizedAccounts default from false to true in signIn. A changeset records a patch release for @clerk/expo.

Changes

iOS Google Sign-In fixes

Layer / File(s)Summary
Client ID normalization and filter default
packages/expo/ios/ClerkGoogleSignInModule.swift, .changeset/bright-lamps-sign.md
Adds nonEmptyClientId(_:) private helper that trims whitespace and returns nil for empty strings; applies it to webClientId and iosClientId in configure; changes filterByAuthorizedAccounts default to true in signIn; changeset records the patch release.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~5 minutes

Possibly related PRs

  • clerk/javascript#8901: Establishes the Expo Modules-based configure/signIn implementation in ClerkGoogleSignInModule.swift that this PR directly modifies to fix client ID handling and filter defaults.

Poem

🐇 A blank ID? No, no, that won't do!
I'll trim it to nil before passing it through.
Authorized accounts? Default to true!
The hop-along sign-in is fresh and brand new.
With a twitch of my nose, the patch lands just right,
One Tap on iOS shines clean and bright! ✨

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check nameStatusExplanationResolution
Docstring Coverage⚠️ WarningDocstring coverage is 75.00% which is insufficient. The required threshold is 80.00%.Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (4 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title accurately summarizes the main change: aligning iOS Google sign-in defaults by normalizing blank client IDs and fixing the filterByAuthorizedAccounts default behavior.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@pkg-pr-new

pkg-pr-newBot commented Jun 17, 2026

Copy link
Copy Markdown

Open in StackBlitz

@clerk/astro

npm i https://pkg.pr.new/@clerk/astro@8903

@clerk/backend

npm i https://pkg.pr.new/@clerk/backend@8903

@clerk/chrome-extension

npm i https://pkg.pr.new/@clerk/chrome-extension@8903

@clerk/clerk-js

npm i https://pkg.pr.new/@clerk/clerk-js@8903

@clerk/expo

npm i https://pkg.pr.new/@clerk/expo@8903

@clerk/expo-passkeys

npm i https://pkg.pr.new/@clerk/expo-passkeys@8903

@clerk/express

npm i https://pkg.pr.new/@clerk/express@8903

@clerk/fastify

npm i https://pkg.pr.new/@clerk/fastify@8903

@clerk/hono

npm i https://pkg.pr.new/@clerk/hono@8903

@clerk/localizations

npm i https://pkg.pr.new/@clerk/localizations@8903

@clerk/nextjs

npm i https://pkg.pr.new/@clerk/nextjs@8903

@clerk/nuxt

npm i https://pkg.pr.new/@clerk/nuxt@8903

@clerk/react

npm i https://pkg.pr.new/@clerk/react@8903

@clerk/react-router

npm i https://pkg.pr.new/@clerk/react-router@8903

@clerk/shared

npm i https://pkg.pr.new/@clerk/shared@8903

@clerk/tanstack-react-start

npm i https://pkg.pr.new/@clerk/tanstack-react-start@8903

@clerk/testing

npm i https://pkg.pr.new/@clerk/testing@8903

@clerk/ui

npm i https://pkg.pr.new/@clerk/ui@8903

@clerk/upgrade

npm i https://pkg.pr.new/@clerk/upgrade@8903

@clerk/vue

npm i https://pkg.pr.new/@clerk/vue@8903

commit: de4c6b3

@wobsorianowobsoriano left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks 👍🏼

@github-actions

Copy link
Copy Markdown
Contributor

API Changes Report

Generated by Break Check on 2026-06-17T20:21:19.109Z

Summary

MetricCount
Packages analyzed19
Packages with changes0
🔴 Breaking changes0
🟡 Non-breaking changes0
🟢 Additions0

No API Changes Detected

All packages have stable APIs with no detected changes.


Report generated by Break Check

Last ran on de4c6b3.

@chatgpt-codex-connectorchatgpt-codex-connectorBot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit:de4c6b380c

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

let iosClientId = params["iosClientId"] as? String
let webClientId = self.nonEmptyClientId(params["webClientId"] as? String)
let iosClientId = self.nonEmptyClientId(params["iosClientId"] as? String)
self.clientId = iosClientId ?? webClientId

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Reject blank web client IDs before falling back

When webClientId is whitespace but iosClientId is set, nonEmptyClientId turns the web ID into nil, but this fallback still marks the module configured from the iOS ID and then passes nil as serverClientID to GIDConfiguration. The shared hook can pass this case because it only checks !webClientId before sending the returned ID token to Clerk as google_one_tap (packages/expo/src/hooks/useSignInWithGoogle.shared.ts:79 and :144-146), while ConfigureParams.webClientId is required and documented as the iOS serverClientID/token audience (packages/expo/src/google-one-tap/types.ts:6-10), so the flow proceeds with the wrong token audience instead of preserving the intended NOT_CONFIGURED path.

Useful? React with 👍 / 👎.

}

let filterByAuthorized = params?["filterByAuthorizedAccounts"] as? Bool ?? false
let filterByAuthorized = params?["filterByAuthorizedAccounts"] as? Bool ?? true

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Implement authorized-account filtering for the new default

With this default flipped to true, an iOS caller that omits filterByAuthorizedAccounts now expects the saved-credentials path described by ClerkGoogleOneTapSignIn.signIn, but the native code only converts that flag into an optional hint from GIDSignIn.sharedInstance.currentUser. On a cold launch or fresh install where no current user has been restored, the hint is nil and signIn(withPresenting:) opens the full interactive Google picker instead of returning the NO_SAVED_CREDENTIAL_FOUND/noSavedCredentialFound path that Android and the JS wrapper expose for this default.

Useful? React with 👍 / 👎.

@wobsoriano
wobsoriano merged commit 0bf306f into mainJun 17, 2026
52 of 59 checks passed
@wobsoriano
wobsoriano deleted the mike/expo-google-sign-in-ios-parity branch June 17, 2026 20:22
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@mikepitre@wobsoriano
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(expo): align iOS Google sign-in defaults by mikepitre · Pull Request #8903 · clerk/javascript · GitHub
Skip to content

fix(expo): align iOS Google sign-in defaults - #8903

Merged
wobsoriano merged 1 commit into
mainfrom
mike/expo-google-sign-in-ios-parity
Jun 17, 2026
Merged

fix(expo): align iOS Google sign-in defaults#8903
wobsoriano merged 1 commit into
mainfrom
mike/expo-google-sign-in-ios-parity

Conversation

@mikepitre

@mikepitremikepitre commented Jun 17, 2026

Copy link
Copy Markdown
Contributor

Summary

Follow-up to #8901 for the two CodeRabbit comments we deferred there.

  • Treat blank or whitespace-only iOS Google client IDs as unconfigured so sign-in preserves the existing NOT_CONFIGURED path.
  • Default iOS Google One Tap signIn to filter by previously authorized accounts, matching Android and the documented default.

Testing

  • pnpm --filter @clerk/expo format:check
  • pnpm --filter @clerk/expo test

Summary by CodeRabbit

  • Bug Fixes
    • iOS Google One Tap sign-in now properly validates and rejects blank Google client IDs.
    • Account filtering for iOS Google One Tap now defaults to enabled, prioritizing previously authorized accounts.

@changeset-bot

changeset-botBot commented Jun 17, 2026

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: de4c6b3

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
NameType
@clerk/expoPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercelBot commented Jun 17, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentJun 17, 2026 8:17pm
swingsetReadyReadyPreview, CommentJun 17, 2026 8:17pm

Request Review

@coderabbitai

coderabbitaiBot commented Jun 17, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Repository UI (inherited)

Review profile: CHILL

Plan: Pro

Run ID: 845c891c-8128-46d0-b190-004d2ae8e535

📥 Commits

Reviewing files that changed from the base of the PR and between d4bccbe and de4c6b3.

📒 Files selected for processing (2)
  • .changeset/bright-lamps-sign.md
  • packages/expo/ios/ClerkGoogleSignInModule.swift

📝 Walkthrough

Walkthrough

ClerkGoogleSignInModule.swift adds a nonEmptyClientId helper that trims whitespace and converts empty strings to nil, applies it to webClientId and iosClientId in configure, and changes the filterByAuthorizedAccounts default from false to true in signIn. A changeset records a patch release for @clerk/expo.

Changes

iOS Google Sign-In fixes

Layer / File(s)Summary
Client ID normalization and filter default
packages/expo/ios/ClerkGoogleSignInModule.swift, .changeset/bright-lamps-sign.md
Adds nonEmptyClientId(_:) private helper that trims whitespace and returns nil for empty strings; applies it to webClientId and iosClientId in configure; changes filterByAuthorizedAccounts default to true in signIn; changeset records the patch release.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~5 minutes

Possibly related PRs

  • clerk/javascript#8901: Establishes the Expo Modules-based configure/signIn implementation in ClerkGoogleSignInModule.swift that this PR directly modifies to fix client ID handling and filter defaults.

Poem

🐇 A blank ID? No, no, that won't do!
I'll trim it to nil before passing it through.
Authorized accounts? Default to true!
The hop-along sign-in is fresh and brand new.
With a twitch of my nose, the patch lands just right,
One Tap on iOS shines clean and bright! ✨

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check nameStatusExplanationResolution
Docstring Coverage⚠️ WarningDocstring coverage is 75.00% which is insufficient. The required threshold is 80.00%.Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (4 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title accurately summarizes the main change: aligning iOS Google sign-in defaults by normalizing blank client IDs and fixing the filterByAuthorizedAccounts default behavior.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@pkg-pr-new

pkg-pr-newBot commented Jun 17, 2026

Copy link
Copy Markdown

Open in StackBlitz

@clerk/astro

npm i https://pkg.pr.new/@clerk/astro@8903

@clerk/backend

npm i https://pkg.pr.new/@clerk/backend@8903

@clerk/chrome-extension

npm i https://pkg.pr.new/@clerk/chrome-extension@8903

@clerk/clerk-js

npm i https://pkg.pr.new/@clerk/clerk-js@8903

@clerk/expo

npm i https://pkg.pr.new/@clerk/expo@8903

@clerk/expo-passkeys

npm i https://pkg.pr.new/@clerk/expo-passkeys@8903

@clerk/express

npm i https://pkg.pr.new/@clerk/express@8903

@clerk/fastify

npm i https://pkg.pr.new/@clerk/fastify@8903

@clerk/hono

npm i https://pkg.pr.new/@clerk/hono@8903

@clerk/localizations

npm i https://pkg.pr.new/@clerk/localizations@8903

@clerk/nextjs

npm i https://pkg.pr.new/@clerk/nextjs@8903

@clerk/nuxt

npm i https://pkg.pr.new/@clerk/nuxt@8903

@clerk/react

npm i https://pkg.pr.new/@clerk/react@8903

@clerk/react-router

npm i https://pkg.pr.new/@clerk/react-router@8903

@clerk/shared

npm i https://pkg.pr.new/@clerk/shared@8903

@clerk/tanstack-react-start

npm i https://pkg.pr.new/@clerk/tanstack-react-start@8903

@clerk/testing

npm i https://pkg.pr.new/@clerk/testing@8903

@clerk/ui

npm i https://pkg.pr.new/@clerk/ui@8903

@clerk/upgrade

npm i https://pkg.pr.new/@clerk/upgrade@8903

@clerk/vue

npm i https://pkg.pr.new/@clerk/vue@8903

commit: de4c6b3

@wobsorianowobsoriano left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks 👍🏼

@github-actions

Copy link
Copy Markdown
Contributor

API Changes Report

Generated by Break Check on 2026-06-17T20:21:19.109Z

Summary

MetricCount
Packages analyzed19
Packages with changes0
🔴 Breaking changes0
🟡 Non-breaking changes0
🟢 Additions0

No API Changes Detected

All packages have stable APIs with no detected changes.


Report generated by Break Check

Last ran on de4c6b3.

@chatgpt-codex-connectorchatgpt-codex-connectorBot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit:de4c6b380c

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

let iosClientId = params["iosClientId"] as? String
let webClientId = self.nonEmptyClientId(params["webClientId"] as? String)
let iosClientId = self.nonEmptyClientId(params["iosClientId"] as? String)
self.clientId = iosClientId ?? webClientId

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Reject blank web client IDs before falling back

When webClientId is whitespace but iosClientId is set, nonEmptyClientId turns the web ID into nil, but this fallback still marks the module configured from the iOS ID and then passes nil as serverClientID to GIDConfiguration. The shared hook can pass this case because it only checks !webClientId before sending the returned ID token to Clerk as google_one_tap (packages/expo/src/hooks/useSignInWithGoogle.shared.ts:79 and :144-146), while ConfigureParams.webClientId is required and documented as the iOS serverClientID/token audience (packages/expo/src/google-one-tap/types.ts:6-10), so the flow proceeds with the wrong token audience instead of preserving the intended NOT_CONFIGURED path.

Useful? React with 👍 / 👎.

}

let filterByAuthorized = params?["filterByAuthorizedAccounts"] as? Bool ?? false
let filterByAuthorized = params?["filterByAuthorizedAccounts"] as? Bool ?? true

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Implement authorized-account filtering for the new default

With this default flipped to true, an iOS caller that omits filterByAuthorizedAccounts now expects the saved-credentials path described by ClerkGoogleOneTapSignIn.signIn, but the native code only converts that flag into an optional hint from GIDSignIn.sharedInstance.currentUser. On a cold launch or fresh install where no current user has been restored, the hint is nil and signIn(withPresenting:) opens the full interactive Google picker instead of returning the NO_SAVED_CREDENTIAL_FOUND/noSavedCredentialFound path that Android and the JS wrapper expose for this default.

Useful? React with 👍 / 👎.

@wobsoriano
wobsoriano merged commit 0bf306f into mainJun 17, 2026
52 of 59 checks passed
@wobsoriano
wobsoriano deleted the mike/expo-google-sign-in-ios-parity branch June 17, 2026 20:22
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@mikepitre@wobsoriano
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(expo): align iOS Google sign-in defaults by mikepitre · Pull Request #8903 · clerk/javascript · GitHub
Skip to content

fix(expo): align iOS Google sign-in defaults - #8903

Merged
wobsoriano merged 1 commit into
mainfrom
mike/expo-google-sign-in-ios-parity
Jun 17, 2026
Merged

fix(expo): align iOS Google sign-in defaults#8903
wobsoriano merged 1 commit into
mainfrom
mike/expo-google-sign-in-ios-parity

Conversation

@mikepitre

@mikepitremikepitre commented Jun 17, 2026

Copy link
Copy Markdown
Contributor

Summary

Follow-up to #8901 for the two CodeRabbit comments we deferred there.

  • Treat blank or whitespace-only iOS Google client IDs as unconfigured so sign-in preserves the existing NOT_CONFIGURED path.
  • Default iOS Google One Tap signIn to filter by previously authorized accounts, matching Android and the documented default.

Testing

  • pnpm --filter @clerk/expo format:check
  • pnpm --filter @clerk/expo test

Summary by CodeRabbit

  • Bug Fixes
    • iOS Google One Tap sign-in now properly validates and rejects blank Google client IDs.
    • Account filtering for iOS Google One Tap now defaults to enabled, prioritizing previously authorized accounts.

@changeset-bot

changeset-botBot commented Jun 17, 2026

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: de4c6b3

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
NameType
@clerk/expoPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercelBot commented Jun 17, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentJun 17, 2026 8:17pm
swingsetReadyReadyPreview, CommentJun 17, 2026 8:17pm

Request Review

@coderabbitai

coderabbitaiBot commented Jun 17, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Repository UI (inherited)

Review profile: CHILL

Plan: Pro

Run ID: 845c891c-8128-46d0-b190-004d2ae8e535

📥 Commits

Reviewing files that changed from the base of the PR and between d4bccbe and de4c6b3.

📒 Files selected for processing (2)
  • .changeset/bright-lamps-sign.md
  • packages/expo/ios/ClerkGoogleSignInModule.swift

📝 Walkthrough

Walkthrough

ClerkGoogleSignInModule.swift adds a nonEmptyClientId helper that trims whitespace and converts empty strings to nil, applies it to webClientId and iosClientId in configure, and changes the filterByAuthorizedAccounts default from false to true in signIn. A changeset records a patch release for @clerk/expo.

Changes

iOS Google Sign-In fixes

Layer / File(s)Summary
Client ID normalization and filter default
packages/expo/ios/ClerkGoogleSignInModule.swift, .changeset/bright-lamps-sign.md
Adds nonEmptyClientId(_:) private helper that trims whitespace and returns nil for empty strings; applies it to webClientId and iosClientId in configure; changes filterByAuthorizedAccounts default to true in signIn; changeset records the patch release.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~5 minutes

Possibly related PRs

  • clerk/javascript#8901: Establishes the Expo Modules-based configure/signIn implementation in ClerkGoogleSignInModule.swift that this PR directly modifies to fix client ID handling and filter defaults.

Poem

🐇 A blank ID? No, no, that won't do!
I'll trim it to nil before passing it through.
Authorized accounts? Default to true!
The hop-along sign-in is fresh and brand new.
With a twitch of my nose, the patch lands just right,
One Tap on iOS shines clean and bright! ✨

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check nameStatusExplanationResolution
Docstring Coverage⚠️ WarningDocstring coverage is 75.00% which is insufficient. The required threshold is 80.00%.Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (4 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title accurately summarizes the main change: aligning iOS Google sign-in defaults by normalizing blank client IDs and fixing the filterByAuthorizedAccounts default behavior.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@pkg-pr-new

pkg-pr-newBot commented Jun 17, 2026

Copy link
Copy Markdown

Open in StackBlitz

@clerk/astro

npm i https://pkg.pr.new/@clerk/astro@8903

@clerk/backend

npm i https://pkg.pr.new/@clerk/backend@8903

@clerk/chrome-extension

npm i https://pkg.pr.new/@clerk/chrome-extension@8903

@clerk/clerk-js

npm i https://pkg.pr.new/@clerk/clerk-js@8903

@clerk/expo

npm i https://pkg.pr.new/@clerk/expo@8903

@clerk/expo-passkeys

npm i https://pkg.pr.new/@clerk/expo-passkeys@8903

@clerk/express

npm i https://pkg.pr.new/@clerk/express@8903

@clerk/fastify

npm i https://pkg.pr.new/@clerk/fastify@8903

@clerk/hono

npm i https://pkg.pr.new/@clerk/hono@8903

@clerk/localizations

npm i https://pkg.pr.new/@clerk/localizations@8903

@clerk/nextjs

npm i https://pkg.pr.new/@clerk/nextjs@8903

@clerk/nuxt

npm i https://pkg.pr.new/@clerk/nuxt@8903

@clerk/react

npm i https://pkg.pr.new/@clerk/react@8903

@clerk/react-router

npm i https://pkg.pr.new/@clerk/react-router@8903

@clerk/shared

npm i https://pkg.pr.new/@clerk/shared@8903

@clerk/tanstack-react-start

npm i https://pkg.pr.new/@clerk/tanstack-react-start@8903

@clerk/testing

npm i https://pkg.pr.new/@clerk/testing@8903

@clerk/ui

npm i https://pkg.pr.new/@clerk/ui@8903

@clerk/upgrade

npm i https://pkg.pr.new/@clerk/upgrade@8903

@clerk/vue

npm i https://pkg.pr.new/@clerk/vue@8903

commit: de4c6b3

@wobsorianowobsoriano left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks 👍🏼

@github-actions

Copy link
Copy Markdown
Contributor

API Changes Report

Generated by Break Check on 2026-06-17T20:21:19.109Z

Summary

MetricCount
Packages analyzed19
Packages with changes0
🔴 Breaking changes0
🟡 Non-breaking changes0
🟢 Additions0

No API Changes Detected

All packages have stable APIs with no detected changes.


Report generated by Break Check

Last ran on de4c6b3.

@chatgpt-codex-connectorchatgpt-codex-connectorBot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit:de4c6b380c

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

let iosClientId = params["iosClientId"] as? String
let webClientId = self.nonEmptyClientId(params["webClientId"] as? String)
let iosClientId = self.nonEmptyClientId(params["iosClientId"] as? String)
self.clientId = iosClientId ?? webClientId

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Reject blank web client IDs before falling back

When webClientId is whitespace but iosClientId is set, nonEmptyClientId turns the web ID into nil, but this fallback still marks the module configured from the iOS ID and then passes nil as serverClientID to GIDConfiguration. The shared hook can pass this case because it only checks !webClientId before sending the returned ID token to Clerk as google_one_tap (packages/expo/src/hooks/useSignInWithGoogle.shared.ts:79 and :144-146), while ConfigureParams.webClientId is required and documented as the iOS serverClientID/token audience (packages/expo/src/google-one-tap/types.ts:6-10), so the flow proceeds with the wrong token audience instead of preserving the intended NOT_CONFIGURED path.

Useful? React with 👍 / 👎.

}

let filterByAuthorized = params?["filterByAuthorizedAccounts"] as? Bool ?? false
let filterByAuthorized = params?["filterByAuthorizedAccounts"] as? Bool ?? true

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Implement authorized-account filtering for the new default

With this default flipped to true, an iOS caller that omits filterByAuthorizedAccounts now expects the saved-credentials path described by ClerkGoogleOneTapSignIn.signIn, but the native code only converts that flag into an optional hint from GIDSignIn.sharedInstance.currentUser. On a cold launch or fresh install where no current user has been restored, the hint is nil and signIn(withPresenting:) opens the full interactive Google picker instead of returning the NO_SAVED_CREDENTIAL_FOUND/noSavedCredentialFound path that Android and the JS wrapper expose for this default.

Useful? React with 👍 / 👎.

@wobsoriano
wobsoriano merged commit 0bf306f into mainJun 17, 2026
52 of 59 checks passed
@wobsoriano
wobsoriano deleted the mike/expo-google-sign-in-ios-parity branch June 17, 2026 20:22
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@mikepitre@wobsoriano
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' fix(expo): align iOS Google sign-in defaults by mikepitre · Pull Request #8903 · clerk/javascript · GitHub
Skip to content

fix(expo): align iOS Google sign-in defaults - #8903

Merged
wobsoriano merged 1 commit into
mainfrom
mike/expo-google-sign-in-ios-parity
Jun 17, 2026
Merged

fix(expo): align iOS Google sign-in defaults#8903
wobsoriano merged 1 commit into
mainfrom
mike/expo-google-sign-in-ios-parity

Conversation

@mikepitre

@mikepitremikepitre commented Jun 17, 2026

Copy link
Copy Markdown
Contributor

Summary

Follow-up to #8901 for the two CodeRabbit comments we deferred there.

  • Treat blank or whitespace-only iOS Google client IDs as unconfigured so sign-in preserves the existing NOT_CONFIGURED path.
  • Default iOS Google One Tap signIn to filter by previously authorized accounts, matching Android and the documented default.

Testing

  • pnpm --filter @clerk/expo format:check
  • pnpm --filter @clerk/expo test

Summary by CodeRabbit

  • Bug Fixes
    • iOS Google One Tap sign-in now properly validates and rejects blank Google client IDs.
    • Account filtering for iOS Google One Tap now defaults to enabled, prioritizing previously authorized accounts.

@changeset-bot

changeset-botBot commented Jun 17, 2026

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: de4c6b3

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
NameType
@clerk/expoPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercelBot commented Jun 17, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentJun 17, 2026 8:17pm
swingsetReadyReadyPreview, CommentJun 17, 2026 8:17pm

Request Review

@coderabbitai

coderabbitaiBot commented Jun 17, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Repository UI (inherited)

Review profile: CHILL

Plan: Pro

Run ID: 845c891c-8128-46d0-b190-004d2ae8e535

📥 Commits

Reviewing files that changed from the base of the PR and between d4bccbe and de4c6b3.

📒 Files selected for processing (2)
  • .changeset/bright-lamps-sign.md
  • packages/expo/ios/ClerkGoogleSignInModule.swift

📝 Walkthrough

Walkthrough

ClerkGoogleSignInModule.swift adds a nonEmptyClientId helper that trims whitespace and converts empty strings to nil, applies it to webClientId and iosClientId in configure, and changes the filterByAuthorizedAccounts default from false to true in signIn. A changeset records a patch release for @clerk/expo.

Changes

iOS Google Sign-In fixes

Layer / File(s)Summary
Client ID normalization and filter default
packages/expo/ios/ClerkGoogleSignInModule.swift, .changeset/bright-lamps-sign.md
Adds nonEmptyClientId(_:) private helper that trims whitespace and returns nil for empty strings; applies it to webClientId and iosClientId in configure; changes filterByAuthorizedAccounts default to true in signIn; changeset records the patch release.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~5 minutes

Possibly related PRs

  • clerk/javascript#8901: Establishes the Expo Modules-based configure/signIn implementation in ClerkGoogleSignInModule.swift that this PR directly modifies to fix client ID handling and filter defaults.

Poem

🐇 A blank ID? No, no, that won't do!
I'll trim it to nil before passing it through.
Authorized accounts? Default to true!
The hop-along sign-in is fresh and brand new.
With a twitch of my nose, the patch lands just right,
One Tap on iOS shines clean and bright! ✨

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check nameStatusExplanationResolution
Docstring Coverage⚠️ WarningDocstring coverage is 75.00% which is insufficient. The required threshold is 80.00%.Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (4 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title accurately summarizes the main change: aligning iOS Google sign-in defaults by normalizing blank client IDs and fixing the filterByAuthorizedAccounts default behavior.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@pkg-pr-new

pkg-pr-newBot commented Jun 17, 2026

Copy link
Copy Markdown

Open in StackBlitz

@clerk/astro

npm i https://pkg.pr.new/@clerk/astro@8903

@clerk/backend

npm i https://pkg.pr.new/@clerk/backend@8903

@clerk/chrome-extension

npm i https://pkg.pr.new/@clerk/chrome-extension@8903

@clerk/clerk-js

npm i https://pkg.pr.new/@clerk/clerk-js@8903

@clerk/expo

npm i https://pkg.pr.new/@clerk/expo@8903

@clerk/expo-passkeys

npm i https://pkg.pr.new/@clerk/expo-passkeys@8903

@clerk/express

npm i https://pkg.pr.new/@clerk/express@8903

@clerk/fastify

npm i https://pkg.pr.new/@clerk/fastify@8903

@clerk/hono

npm i https://pkg.pr.new/@clerk/hono@8903

@clerk/localizations

npm i https://pkg.pr.new/@clerk/localizations@8903

@clerk/nextjs

npm i https://pkg.pr.new/@clerk/nextjs@8903

@clerk/nuxt

npm i https://pkg.pr.new/@clerk/nuxt@8903

@clerk/react

npm i https://pkg.pr.new/@clerk/react@8903

@clerk/react-router

npm i https://pkg.pr.new/@clerk/react-router@8903

@clerk/shared

npm i https://pkg.pr.new/@clerk/shared@8903

@clerk/tanstack-react-start

npm i https://pkg.pr.new/@clerk/tanstack-react-start@8903

@clerk/testing

npm i https://pkg.pr.new/@clerk/testing@8903

@clerk/ui

npm i https://pkg.pr.new/@clerk/ui@8903

@clerk/upgrade

npm i https://pkg.pr.new/@clerk/upgrade@8903

@clerk/vue

npm i https://pkg.pr.new/@clerk/vue@8903

commit: de4c6b3

@wobsorianowobsoriano left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks 👍🏼

@github-actions

Copy link
Copy Markdown
Contributor

API Changes Report

Generated by Break Check on 2026-06-17T20:21:19.109Z

Summary

MetricCount
Packages analyzed19
Packages with changes0
🔴 Breaking changes0
🟡 Non-breaking changes0
🟢 Additions0

No API Changes Detected

All packages have stable APIs with no detected changes.


Report generated by Break Check

Last ran on de4c6b3.

@chatgpt-codex-connectorchatgpt-codex-connectorBot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit:de4c6b380c

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

let iosClientId = params["iosClientId"] as? String
let webClientId = self.nonEmptyClientId(params["webClientId"] as? String)
let iosClientId = self.nonEmptyClientId(params["iosClientId"] as? String)
self.clientId = iosClientId ?? webClientId

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Reject blank web client IDs before falling back

When webClientId is whitespace but iosClientId is set, nonEmptyClientId turns the web ID into nil, but this fallback still marks the module configured from the iOS ID and then passes nil as serverClientID to GIDConfiguration. The shared hook can pass this case because it only checks !webClientId before sending the returned ID token to Clerk as google_one_tap (packages/expo/src/hooks/useSignInWithGoogle.shared.ts:79 and :144-146), while ConfigureParams.webClientId is required and documented as the iOS serverClientID/token audience (packages/expo/src/google-one-tap/types.ts:6-10), so the flow proceeds with the wrong token audience instead of preserving the intended NOT_CONFIGURED path.

Useful? React with 👍 / 👎.

}

let filterByAuthorized = params?["filterByAuthorizedAccounts"] as? Bool ?? false
let filterByAuthorized = params?["filterByAuthorizedAccounts"] as? Bool ?? true

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Implement authorized-account filtering for the new default

With this default flipped to true, an iOS caller that omits filterByAuthorizedAccounts now expects the saved-credentials path described by ClerkGoogleOneTapSignIn.signIn, but the native code only converts that flag into an optional hint from GIDSignIn.sharedInstance.currentUser. On a cold launch or fresh install where no current user has been restored, the hint is nil and signIn(withPresenting:) opens the full interactive Google picker instead of returning the NO_SAVED_CREDENTIAL_FOUND/noSavedCredentialFound path that Android and the JS wrapper expose for this default.

Useful? React with 👍 / 👎.

@wobsoriano
wobsoriano merged commit 0bf306f into mainJun 17, 2026
52 of 59 checks passed
@wobsoriano
wobsoriano deleted the mike/expo-google-sign-in-ios-parity branch June 17, 2026 20:22
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@mikepitre@wobsoriano
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(expo): align iOS Google sign-in defaults by mikepitre · Pull Request #8903 · clerk/javascript · GitHub
Skip to content

fix(expo): align iOS Google sign-in defaults - #8903

Merged
wobsoriano merged 1 commit into
mainfrom
mike/expo-google-sign-in-ios-parity
Jun 17, 2026
Merged

fix(expo): align iOS Google sign-in defaults#8903
wobsoriano merged 1 commit into
mainfrom
mike/expo-google-sign-in-ios-parity

Conversation

@mikepitre

@mikepitremikepitre commented Jun 17, 2026

Copy link
Copy Markdown
Contributor

Summary

Follow-up to #8901 for the two CodeRabbit comments we deferred there.

  • Treat blank or whitespace-only iOS Google client IDs as unconfigured so sign-in preserves the existing NOT_CONFIGURED path.
  • Default iOS Google One Tap signIn to filter by previously authorized accounts, matching Android and the documented default.

Testing

  • pnpm --filter @clerk/expo format:check
  • pnpm --filter @clerk/expo test

Summary by CodeRabbit

  • Bug Fixes
    • iOS Google One Tap sign-in now properly validates and rejects blank Google client IDs.
    • Account filtering for iOS Google One Tap now defaults to enabled, prioritizing previously authorized accounts.

@changeset-bot

changeset-botBot commented Jun 17, 2026

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: de4c6b3

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
NameType
@clerk/expoPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercelBot commented Jun 17, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentJun 17, 2026 8:17pm
swingsetReadyReadyPreview, CommentJun 17, 2026 8:17pm

Request Review

@coderabbitai

coderabbitaiBot commented Jun 17, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Repository UI (inherited)

Review profile: CHILL

Plan: Pro

Run ID: 845c891c-8128-46d0-b190-004d2ae8e535

📥 Commits

Reviewing files that changed from the base of the PR and between d4bccbe and de4c6b3.

📒 Files selected for processing (2)
  • .changeset/bright-lamps-sign.md
  • packages/expo/ios/ClerkGoogleSignInModule.swift

📝 Walkthrough

Walkthrough

ClerkGoogleSignInModule.swift adds a nonEmptyClientId helper that trims whitespace and converts empty strings to nil, applies it to webClientId and iosClientId in configure, and changes the filterByAuthorizedAccounts default from false to true in signIn. A changeset records a patch release for @clerk/expo.

Changes

iOS Google Sign-In fixes

Layer / File(s)Summary
Client ID normalization and filter default
packages/expo/ios/ClerkGoogleSignInModule.swift, .changeset/bright-lamps-sign.md
Adds nonEmptyClientId(_:) private helper that trims whitespace and returns nil for empty strings; applies it to webClientId and iosClientId in configure; changes filterByAuthorizedAccounts default to true in signIn; changeset records the patch release.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~5 minutes

Possibly related PRs

  • clerk/javascript#8901: Establishes the Expo Modules-based configure/signIn implementation in ClerkGoogleSignInModule.swift that this PR directly modifies to fix client ID handling and filter defaults.

Poem

🐇 A blank ID? No, no, that won't do!
I'll trim it to nil before passing it through.
Authorized accounts? Default to true!
The hop-along sign-in is fresh and brand new.
With a twitch of my nose, the patch lands just right,
One Tap on iOS shines clean and bright! ✨

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check nameStatusExplanationResolution
Docstring Coverage⚠️ WarningDocstring coverage is 75.00% which is insufficient. The required threshold is 80.00%.Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (4 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title accurately summarizes the main change: aligning iOS Google sign-in defaults by normalizing blank client IDs and fixing the filterByAuthorizedAccounts default behavior.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@pkg-pr-new

pkg-pr-newBot commented Jun 17, 2026

Copy link
Copy Markdown

Open in StackBlitz

@clerk/astro

npm i https://pkg.pr.new/@clerk/astro@8903

@clerk/backend

npm i https://pkg.pr.new/@clerk/backend@8903

@clerk/chrome-extension

npm i https://pkg.pr.new/@clerk/chrome-extension@8903

@clerk/clerk-js

npm i https://pkg.pr.new/@clerk/clerk-js@8903

@clerk/expo

npm i https://pkg.pr.new/@clerk/expo@8903

@clerk/expo-passkeys

npm i https://pkg.pr.new/@clerk/expo-passkeys@8903

@clerk/express

npm i https://pkg.pr.new/@clerk/express@8903

@clerk/fastify

npm i https://pkg.pr.new/@clerk/fastify@8903

@clerk/hono

npm i https://pkg.pr.new/@clerk/hono@8903

@clerk/localizations

npm i https://pkg.pr.new/@clerk/localizations@8903

@clerk/nextjs

npm i https://pkg.pr.new/@clerk/nextjs@8903

@clerk/nuxt

npm i https://pkg.pr.new/@clerk/nuxt@8903

@clerk/react

npm i https://pkg.pr.new/@clerk/react@8903

@clerk/react-router

npm i https://pkg.pr.new/@clerk/react-router@8903

@clerk/shared

npm i https://pkg.pr.new/@clerk/shared@8903

@clerk/tanstack-react-start

npm i https://pkg.pr.new/@clerk/tanstack-react-start@8903

@clerk/testing

npm i https://pkg.pr.new/@clerk/testing@8903

@clerk/ui

npm i https://pkg.pr.new/@clerk/ui@8903

@clerk/upgrade

npm i https://pkg.pr.new/@clerk/upgrade@8903

@clerk/vue

npm i https://pkg.pr.new/@clerk/vue@8903

commit: de4c6b3

@wobsorianowobsoriano left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks 👍🏼

@github-actions

Copy link
Copy Markdown
Contributor

API Changes Report

Generated by Break Check on 2026-06-17T20:21:19.109Z

Summary

MetricCount
Packages analyzed19
Packages with changes0
🔴 Breaking changes0
🟡 Non-breaking changes0
🟢 Additions0

No API Changes Detected

All packages have stable APIs with no detected changes.


Report generated by Break Check

Last ran on de4c6b3.

@chatgpt-codex-connectorchatgpt-codex-connectorBot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit:de4c6b380c

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

let iosClientId = params["iosClientId"] as? String
let webClientId = self.nonEmptyClientId(params["webClientId"] as? String)
let iosClientId = self.nonEmptyClientId(params["iosClientId"] as? String)
self.clientId = iosClientId ?? webClientId

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Reject blank web client IDs before falling back

When webClientId is whitespace but iosClientId is set, nonEmptyClientId turns the web ID into nil, but this fallback still marks the module configured from the iOS ID and then passes nil as serverClientID to GIDConfiguration. The shared hook can pass this case because it only checks !webClientId before sending the returned ID token to Clerk as google_one_tap (packages/expo/src/hooks/useSignInWithGoogle.shared.ts:79 and :144-146), while ConfigureParams.webClientId is required and documented as the iOS serverClientID/token audience (packages/expo/src/google-one-tap/types.ts:6-10), so the flow proceeds with the wrong token audience instead of preserving the intended NOT_CONFIGURED path.

Useful? React with 👍 / 👎.

}

let filterByAuthorized = params?["filterByAuthorizedAccounts"] as? Bool ?? false
let filterByAuthorized = params?["filterByAuthorizedAccounts"] as? Bool ?? true

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Implement authorized-account filtering for the new default

With this default flipped to true, an iOS caller that omits filterByAuthorizedAccounts now expects the saved-credentials path described by ClerkGoogleOneTapSignIn.signIn, but the native code only converts that flag into an optional hint from GIDSignIn.sharedInstance.currentUser. On a cold launch or fresh install where no current user has been restored, the hint is nil and signIn(withPresenting:) opens the full interactive Google picker instead of returning the NO_SAVED_CREDENTIAL_FOUND/noSavedCredentialFound path that Android and the JS wrapper expose for this default.

Useful? React with 👍 / 👎.

@wobsoriano
wobsoriano merged commit 0bf306f into mainJun 17, 2026
52 of 59 checks passed
@wobsoriano
wobsoriano deleted the mike/expo-google-sign-in-ios-parity branch June 17, 2026 20:22
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@mikepitre@wobsoriano
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(expo): align iOS Google sign-in defaults by mikepitre · Pull Request #8903 · clerk/javascript · GitHub
Skip to content

fix(expo): align iOS Google sign-in defaults - #8903

Merged
wobsoriano merged 1 commit into
mainfrom
mike/expo-google-sign-in-ios-parity
Jun 17, 2026
Merged

fix(expo): align iOS Google sign-in defaults#8903
wobsoriano merged 1 commit into
mainfrom
mike/expo-google-sign-in-ios-parity

Conversation

@mikepitre

@mikepitremikepitre commented Jun 17, 2026

Copy link
Copy Markdown
Contributor

Summary

Follow-up to #8901 for the two CodeRabbit comments we deferred there.

  • Treat blank or whitespace-only iOS Google client IDs as unconfigured so sign-in preserves the existing NOT_CONFIGURED path.
  • Default iOS Google One Tap signIn to filter by previously authorized accounts, matching Android and the documented default.

Testing

  • pnpm --filter @clerk/expo format:check
  • pnpm --filter @clerk/expo test

Summary by CodeRabbit

  • Bug Fixes
    • iOS Google One Tap sign-in now properly validates and rejects blank Google client IDs.
    • Account filtering for iOS Google One Tap now defaults to enabled, prioritizing previously authorized accounts.

@changeset-bot

changeset-botBot commented Jun 17, 2026

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: de4c6b3

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
NameType
@clerk/expoPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercelBot commented Jun 17, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentJun 17, 2026 8:17pm
swingsetReadyReadyPreview, CommentJun 17, 2026 8:17pm

Request Review

@coderabbitai

coderabbitaiBot commented Jun 17, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Repository UI (inherited)

Review profile: CHILL

Plan: Pro

Run ID: 845c891c-8128-46d0-b190-004d2ae8e535

📥 Commits

Reviewing files that changed from the base of the PR and between d4bccbe and de4c6b3.

📒 Files selected for processing (2)
  • .changeset/bright-lamps-sign.md
  • packages/expo/ios/ClerkGoogleSignInModule.swift

📝 Walkthrough

Walkthrough

ClerkGoogleSignInModule.swift adds a nonEmptyClientId helper that trims whitespace and converts empty strings to nil, applies it to webClientId and iosClientId in configure, and changes the filterByAuthorizedAccounts default from false to true in signIn. A changeset records a patch release for @clerk/expo.

Changes

iOS Google Sign-In fixes

Layer / File(s)Summary
Client ID normalization and filter default
packages/expo/ios/ClerkGoogleSignInModule.swift, .changeset/bright-lamps-sign.md
Adds nonEmptyClientId(_:) private helper that trims whitespace and returns nil for empty strings; applies it to webClientId and iosClientId in configure; changes filterByAuthorizedAccounts default to true in signIn; changeset records the patch release.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~5 minutes

Possibly related PRs

  • clerk/javascript#8901: Establishes the Expo Modules-based configure/signIn implementation in ClerkGoogleSignInModule.swift that this PR directly modifies to fix client ID handling and filter defaults.

Poem

🐇 A blank ID? No, no, that won't do!
I'll trim it to nil before passing it through.
Authorized accounts? Default to true!
The hop-along sign-in is fresh and brand new.
With a twitch of my nose, the patch lands just right,
One Tap on iOS shines clean and bright! ✨

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check nameStatusExplanationResolution
Docstring Coverage⚠️ WarningDocstring coverage is 75.00% which is insufficient. The required threshold is 80.00%.Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (4 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title accurately summarizes the main change: aligning iOS Google sign-in defaults by normalizing blank client IDs and fixing the filterByAuthorizedAccounts default behavior.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@pkg-pr-new

pkg-pr-newBot commented Jun 17, 2026

Copy link
Copy Markdown

Open in StackBlitz

@clerk/astro

npm i https://pkg.pr.new/@clerk/astro@8903

@clerk/backend

npm i https://pkg.pr.new/@clerk/backend@8903

@clerk/chrome-extension

npm i https://pkg.pr.new/@clerk/chrome-extension@8903

@clerk/clerk-js

npm i https://pkg.pr.new/@clerk/clerk-js@8903

@clerk/expo

npm i https://pkg.pr.new/@clerk/expo@8903

@clerk/expo-passkeys

npm i https://pkg.pr.new/@clerk/expo-passkeys@8903

@clerk/express

npm i https://pkg.pr.new/@clerk/express@8903

@clerk/fastify

npm i https://pkg.pr.new/@clerk/fastify@8903

@clerk/hono

npm i https://pkg.pr.new/@clerk/hono@8903

@clerk/localizations

npm i https://pkg.pr.new/@clerk/localizations@8903

@clerk/nextjs

npm i https://pkg.pr.new/@clerk/nextjs@8903

@clerk/nuxt

npm i https://pkg.pr.new/@clerk/nuxt@8903

@clerk/react

npm i https://pkg.pr.new/@clerk/react@8903

@clerk/react-router

npm i https://pkg.pr.new/@clerk/react-router@8903

@clerk/shared

npm i https://pkg.pr.new/@clerk/shared@8903

@clerk/tanstack-react-start

npm i https://pkg.pr.new/@clerk/tanstack-react-start@8903

@clerk/testing

npm i https://pkg.pr.new/@clerk/testing@8903

@clerk/ui

npm i https://pkg.pr.new/@clerk/ui@8903

@clerk/upgrade

npm i https://pkg.pr.new/@clerk/upgrade@8903

@clerk/vue

npm i https://pkg.pr.new/@clerk/vue@8903

commit: de4c6b3

@wobsorianowobsoriano left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks 👍🏼

@github-actions

Copy link
Copy Markdown
Contributor

API Changes Report

Generated by Break Check on 2026-06-17T20:21:19.109Z

Summary

MetricCount
Packages analyzed19
Packages with changes0
🔴 Breaking changes0
🟡 Non-breaking changes0
🟢 Additions0

No API Changes Detected

All packages have stable APIs with no detected changes.


Report generated by Break Check

Last ran on de4c6b3.

@chatgpt-codex-connectorchatgpt-codex-connectorBot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit:de4c6b380c

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

let iosClientId = params["iosClientId"] as? String
let webClientId = self.nonEmptyClientId(params["webClientId"] as? String)
let iosClientId = self.nonEmptyClientId(params["iosClientId"] as? String)
self.clientId = iosClientId ?? webClientId

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Reject blank web client IDs before falling back

When webClientId is whitespace but iosClientId is set, nonEmptyClientId turns the web ID into nil, but this fallback still marks the module configured from the iOS ID and then passes nil as serverClientID to GIDConfiguration. The shared hook can pass this case because it only checks !webClientId before sending the returned ID token to Clerk as google_one_tap (packages/expo/src/hooks/useSignInWithGoogle.shared.ts:79 and :144-146), while ConfigureParams.webClientId is required and documented as the iOS serverClientID/token audience (packages/expo/src/google-one-tap/types.ts:6-10), so the flow proceeds with the wrong token audience instead of preserving the intended NOT_CONFIGURED path.

Useful? React with 👍 / 👎.

}

let filterByAuthorized = params?["filterByAuthorizedAccounts"] as? Bool ?? false
let filterByAuthorized = params?["filterByAuthorizedAccounts"] as? Bool ?? true

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Implement authorized-account filtering for the new default

With this default flipped to true, an iOS caller that omits filterByAuthorizedAccounts now expects the saved-credentials path described by ClerkGoogleOneTapSignIn.signIn, but the native code only converts that flag into an optional hint from GIDSignIn.sharedInstance.currentUser. On a cold launch or fresh install where no current user has been restored, the hint is nil and signIn(withPresenting:) opens the full interactive Google picker instead of returning the NO_SAVED_CREDENTIAL_FOUND/noSavedCredentialFound path that Android and the JS wrapper expose for this default.

Useful? React with 👍 / 👎.

@wobsoriano
wobsoriano merged commit 0bf306f into mainJun 17, 2026
52 of 59 checks passed
@wobsoriano
wobsoriano deleted the mike/expo-google-sign-in-ios-parity branch June 17, 2026 20:22
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@mikepitre@wobsoriano
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); fix(expo): align iOS Google sign-in defaults by mikepitre · Pull Request #8903 · clerk/javascript · GitHub
Skip to content

fix(expo): align iOS Google sign-in defaults - #8903

Merged
wobsoriano merged 1 commit into
mainfrom
mike/expo-google-sign-in-ios-parity
Jun 17, 2026
Merged

fix(expo): align iOS Google sign-in defaults#8903
wobsoriano merged 1 commit into
mainfrom
mike/expo-google-sign-in-ios-parity

Conversation

@mikepitre

@mikepitremikepitre commented Jun 17, 2026

Copy link
Copy Markdown
Contributor

Summary

Follow-up to #8901 for the two CodeRabbit comments we deferred there.

  • Treat blank or whitespace-only iOS Google client IDs as unconfigured so sign-in preserves the existing NOT_CONFIGURED path.
  • Default iOS Google One Tap signIn to filter by previously authorized accounts, matching Android and the documented default.

Testing

  • pnpm --filter @clerk/expo format:check
  • pnpm --filter @clerk/expo test

Summary by CodeRabbit

  • Bug Fixes
    • iOS Google One Tap sign-in now properly validates and rejects blank Google client IDs.
    • Account filtering for iOS Google One Tap now defaults to enabled, prioritizing previously authorized accounts.

@changeset-bot

changeset-botBot commented Jun 17, 2026

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: de4c6b3

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
NameType
@clerk/expoPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercelBot commented Jun 17, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentJun 17, 2026 8:17pm
swingsetReadyReadyPreview, CommentJun 17, 2026 8:17pm

Request Review

@coderabbitai

coderabbitaiBot commented Jun 17, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Repository UI (inherited)

Review profile: CHILL

Plan: Pro

Run ID: 845c891c-8128-46d0-b190-004d2ae8e535

📥 Commits

Reviewing files that changed from the base of the PR and between d4bccbe and de4c6b3.

📒 Files selected for processing (2)
  • .changeset/bright-lamps-sign.md
  • packages/expo/ios/ClerkGoogleSignInModule.swift

📝 Walkthrough

Walkthrough

ClerkGoogleSignInModule.swift adds a nonEmptyClientId helper that trims whitespace and converts empty strings to nil, applies it to webClientId and iosClientId in configure, and changes the filterByAuthorizedAccounts default from false to true in signIn. A changeset records a patch release for @clerk/expo.

Changes

iOS Google Sign-In fixes

Layer / File(s)Summary
Client ID normalization and filter default
packages/expo/ios/ClerkGoogleSignInModule.swift, .changeset/bright-lamps-sign.md
Adds nonEmptyClientId(_:) private helper that trims whitespace and returns nil for empty strings; applies it to webClientId and iosClientId in configure; changes filterByAuthorizedAccounts default to true in signIn; changeset records the patch release.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~5 minutes

Possibly related PRs

  • clerk/javascript#8901: Establishes the Expo Modules-based configure/signIn implementation in ClerkGoogleSignInModule.swift that this PR directly modifies to fix client ID handling and filter defaults.

Poem

🐇 A blank ID? No, no, that won't do!
I'll trim it to nil before passing it through.
Authorized accounts? Default to true!
The hop-along sign-in is fresh and brand new.
With a twitch of my nose, the patch lands just right,
One Tap on iOS shines clean and bright! ✨

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check nameStatusExplanationResolution
Docstring Coverage⚠️ WarningDocstring coverage is 75.00% which is insufficient. The required threshold is 80.00%.Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (4 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title accurately summarizes the main change: aligning iOS Google sign-in defaults by normalizing blank client IDs and fixing the filterByAuthorizedAccounts default behavior.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@pkg-pr-new

pkg-pr-newBot commented Jun 17, 2026

Copy link
Copy Markdown

Open in StackBlitz

@clerk/astro

npm i https://pkg.pr.new/@clerk/astro@8903

@clerk/backend

npm i https://pkg.pr.new/@clerk/backend@8903

@clerk/chrome-extension

npm i https://pkg.pr.new/@clerk/chrome-extension@8903

@clerk/clerk-js

npm i https://pkg.pr.new/@clerk/clerk-js@8903

@clerk/expo

npm i https://pkg.pr.new/@clerk/expo@8903

@clerk/expo-passkeys

npm i https://pkg.pr.new/@clerk/expo-passkeys@8903

@clerk/express

npm i https://pkg.pr.new/@clerk/express@8903

@clerk/fastify

npm i https://pkg.pr.new/@clerk/fastify@8903

@clerk/hono

npm i https://pkg.pr.new/@clerk/hono@8903

@clerk/localizations

npm i https://pkg.pr.new/@clerk/localizations@8903

@clerk/nextjs

npm i https://pkg.pr.new/@clerk/nextjs@8903

@clerk/nuxt

npm i https://pkg.pr.new/@clerk/nuxt@8903

@clerk/react

npm i https://pkg.pr.new/@clerk/react@8903

@clerk/react-router

npm i https://pkg.pr.new/@clerk/react-router@8903

@clerk/shared

npm i https://pkg.pr.new/@clerk/shared@8903

@clerk/tanstack-react-start

npm i https://pkg.pr.new/@clerk/tanstack-react-start@8903

@clerk/testing

npm i https://pkg.pr.new/@clerk/testing@8903

@clerk/ui

npm i https://pkg.pr.new/@clerk/ui@8903

@clerk/upgrade

npm i https://pkg.pr.new/@clerk/upgrade@8903

@clerk/vue

npm i https://pkg.pr.new/@clerk/vue@8903

commit: de4c6b3

@wobsorianowobsoriano left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks 👍🏼

@github-actions

Copy link
Copy Markdown
Contributor

API Changes Report

Generated by Break Check on 2026-06-17T20:21:19.109Z

Summary

MetricCount
Packages analyzed19
Packages with changes0
🔴 Breaking changes0
🟡 Non-breaking changes0
🟢 Additions0

No API Changes Detected

All packages have stable APIs with no detected changes.


Report generated by Break Check

Last ran on de4c6b3.

@chatgpt-codex-connectorchatgpt-codex-connectorBot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit:de4c6b380c

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

let iosClientId = params["iosClientId"] as? String
let webClientId = self.nonEmptyClientId(params["webClientId"] as? String)
let iosClientId = self.nonEmptyClientId(params["iosClientId"] as? String)
self.clientId = iosClientId ?? webClientId

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Reject blank web client IDs before falling back

When webClientId is whitespace but iosClientId is set, nonEmptyClientId turns the web ID into nil, but this fallback still marks the module configured from the iOS ID and then passes nil as serverClientID to GIDConfiguration. The shared hook can pass this case because it only checks !webClientId before sending the returned ID token to Clerk as google_one_tap (packages/expo/src/hooks/useSignInWithGoogle.shared.ts:79 and :144-146), while ConfigureParams.webClientId is required and documented as the iOS serverClientID/token audience (packages/expo/src/google-one-tap/types.ts:6-10), so the flow proceeds with the wrong token audience instead of preserving the intended NOT_CONFIGURED path.

Useful? React with 👍 / 👎.

}

let filterByAuthorized = params?["filterByAuthorizedAccounts"] as? Bool ?? false
let filterByAuthorized = params?["filterByAuthorizedAccounts"] as? Bool ?? true

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Implement authorized-account filtering for the new default

With this default flipped to true, an iOS caller that omits filterByAuthorizedAccounts now expects the saved-credentials path described by ClerkGoogleOneTapSignIn.signIn, but the native code only converts that flag into an optional hint from GIDSignIn.sharedInstance.currentUser. On a cold launch or fresh install where no current user has been restored, the hint is nil and signIn(withPresenting:) opens the full interactive Google picker instead of returning the NO_SAVED_CREDENTIAL_FOUND/noSavedCredentialFound path that Android and the JS wrapper expose for this default.

Useful? React with 👍 / 👎.

@wobsoriano
wobsoriano merged commit 0bf306f into mainJun 17, 2026
52 of 59 checks passed
@wobsoriano
wobsoriano deleted the mike/expo-google-sign-in-ios-parity branch June 17, 2026 20:22
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@mikepitre@wobsoriano