Skip to content

Add updateDeviceToken API and refresh flow for device tokens - #564

Merged
swolfand merged 3 commits into
mainfrom
add-clerk-android-reinitialization
Mar 11, 2026
Merged

Add updateDeviceToken API and refresh flow for device tokens#564
swolfand merged 3 commits into
mainfrom
add-clerk-android-reinitialization

Conversation

@swolfand

@swolfandswolfand commented Mar 11, 2026

Copy link
Copy Markdown
Collaborator

Summary

  • expose Clerk.updateDeviceToken as the supported way to write a new device token and reload client/environment state without reinitializing
  • add forced refresh plumbing in ConfigurationManager plus request-scoped client-id skipping so the refreshed client fetch does not reuse stale headers
  • cover the new flow and middleware behavior with focused SDK and interceptor tests

Testing

  • Not run (not requested)

Summary by CodeRabbit

  • New Features
    • New device-token update API that persists a token and triggers client/environment refresh.
    • New API option to fetch client data while skipping the default client-id header.
  • Behavior Changes
    • Requests can now include an internal flag to omit the client-id header.
  • Tests
    • Added unit and integration tests for token update, middleware, and helpers (including test phone generator).

Add a public Clerk.updateDeviceToken API that persists a new device token and forces a client/environment refresh after initialization.
The refresh path now supports manual token-sync reloads without changing reinitialize semantics, and the client fetch can omit the stale in-memory client id header on a per-request basis to avoid mismatched anonymous client state.
Also add regression tests for the new API and the request-scoped header behavior.
Break the device-token refresh path in ConfigurationManager into smaller validation, fetch, success, and failure helpers.
This keeps the new post-initialization token sync behavior intact while satisfying the repo's Detekt thresholds for method size, complexity, and return count.
@coderabbitai

coderabbitaiBot commented Mar 11, 2026

Copy link
Copy Markdown
Contributor

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 0d383be8-936e-4405-af81-c4d73c6502e0

📥 Commits

Reviewing files that changed from the base of the PR and between 650d55b and ba6c38f.

📒 Files selected for processing (2)
  • source/api/src/test/java/com/clerk/api/integration/AuthIntegrationTests.kt
  • source/api/src/test/java/com/clerk/api/integration/IntegrationTestHelpers.kt

📝 Walkthrough

Walkthrough

Adds device token update support: a public suspend fun updateDeviceToken(deviceToken: String): ClerkResult<Unit, ClerkErrorResponse> on Clerk delegating to a new ConfigurationManager updateDeviceToken that validates, persists the token, and triggers a guarded refresh flow. Introduces mutex‑protected refresh logic, a RefreshMode, and helper routines. Adds ClientApi getSkippingClientId and Client.Companion.getSkippingClientId, updates request middleware to honor an internal skip header, and adds tests for middleware and device token update behavior.

🚥 Pre-merge checks | ✅ 2 | ❌ 1

❌ Failed checks (1 warning)

Check nameStatusExplanationResolution
Docstring Coverage⚠️ WarningDocstring coverage is 16.67% which is insufficient. The required threshold is 80.00%.Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (2 passed)
Check nameStatusExplanation
Title check✅ PassedThe title clearly and concisely summarizes the main changes: adding a new updateDeviceToken API and implementing the refresh flow for device tokens.
Description check✅ PassedThe description provides a clear summary of changes and testing approach, covering the main objectives and explaining the approach taken.

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


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.

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In
`@source/api/src/main/kotlin/com/clerk/api/configuration/ConfigurationManager.kt`:
- Line 486: Replace the force-unwrapping of client.id in handleSuccessfulRefresh
to avoid an NPE: don't use client.id!!—instead read val clientId = client.id ?:
run { ClerkLog.w("Received client with null ID, skipping post-refresh tasks");
return ClerkResult.success(Unit) } (or otherwise handle the null case and
abort/postpone post-refresh tasks) and then use clientId for subsequent
operations.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: e9d034da-49fb-450e-ae80-7617853e0aa4

📥 Commits

Reviewing files that changed from the base of the PR and between 6330ac4 and 650d55b.

📒 Files selected for processing (7)
  • source/api/src/main/kotlin/com/clerk/api/Clerk.kt
  • source/api/src/main/kotlin/com/clerk/api/configuration/ConfigurationManager.kt
  • source/api/src/main/kotlin/com/clerk/api/network/api/ClientApi.kt
  • source/api/src/main/kotlin/com/clerk/api/network/middleware/outgoing/VersioningUserAgentMiddleware.kt
  • source/api/src/main/kotlin/com/clerk/api/network/model/client/Client.kt
  • source/api/src/test/java/com/clerk/api/network/middleware/outgoing/VersioningUserAgentMiddlewareTest.kt
  • source/api/src/test/java/com/clerk/api/sdk/ClerkDeviceTokenUpdateTest.kt

applicationContext = applicationContext,
cloudProjectNumber = options?.deviceAttestationOptions?.cloudProjectNumber,
applicationId = options?.deviceAttestationOptions?.applicationId,
clientId = client.id!!,

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟠 Major

Potential NPE: Force-unwrapping nullable client.id

client.id is declared as String? in the Client data class. While a successful API response typically includes a client ID, force-unwrapping with !! can cause a crash if the server ever returns a null ID.

Proposed fix
- clientId = client.id!!,+ clientId = client.id ?: return,

Or guard earlier in handleSuccessfulRefresh:

val clientId = client.id ?:run {
ClerkLog.w("Received client with null ID, skipping post-refresh tasks")
returnClerkResult.success(Unit)
}
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
clientId = client.id!!,
clientId = client.id?:return,
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In
`@source/api/src/main/kotlin/com/clerk/api/configuration/ConfigurationManager.kt`
at line 486, Replace the force-unwrapping of client.id in
handleSuccessfulRefresh to avoid an NPE: don't use client.id!!—instead read val
clientId = client.id ?: run { ClerkLog.w("Received client with null ID, skipping
post-refresh tasks"); return ClerkResult.success(Unit) } (or otherwise handle
the null case and abort/postpone post-refresh tasks) and then use clientId for
subsequent operations.

@chriscaninchriscanin left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This is working well, and is exactly what was needed!

Generate a fresh fictional Clerk test phone number for each auth integration run.
This avoids CI failures when the shared test instance still has the previous hard-coded phone identifier attached to an account.
@swolfand
swolfand merged commit 809c720 into mainMar 11, 2026
10 checks passed
@swolfand
swolfand deleted the add-clerk-android-reinitialization branch March 11, 2026 22:10
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@swolfand@chriscanin
, '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" + '
Add updateDeviceToken API and refresh flow for device tokens by swolfand · Pull Request #564 · clerk/clerk-android · GitHub
Skip to content

Add updateDeviceToken API and refresh flow for device tokens - #564

Merged
swolfand merged 3 commits into
mainfrom
add-clerk-android-reinitialization
Mar 11, 2026
Merged

Add updateDeviceToken API and refresh flow for device tokens#564
swolfand merged 3 commits into
mainfrom
add-clerk-android-reinitialization

Conversation

@swolfand

@swolfandswolfand commented Mar 11, 2026

Copy link
Copy Markdown
Collaborator

Summary

  • expose Clerk.updateDeviceToken as the supported way to write a new device token and reload client/environment state without reinitializing
  • add forced refresh plumbing in ConfigurationManager plus request-scoped client-id skipping so the refreshed client fetch does not reuse stale headers
  • cover the new flow and middleware behavior with focused SDK and interceptor tests

Testing

  • Not run (not requested)

Summary by CodeRabbit

  • New Features
    • New device-token update API that persists a token and triggers client/environment refresh.
    • New API option to fetch client data while skipping the default client-id header.
  • Behavior Changes
    • Requests can now include an internal flag to omit the client-id header.
  • Tests
    • Added unit and integration tests for token update, middleware, and helpers (including test phone generator).

Add a public Clerk.updateDeviceToken API that persists a new device token and forces a client/environment refresh after initialization.
The refresh path now supports manual token-sync reloads without changing reinitialize semantics, and the client fetch can omit the stale in-memory client id header on a per-request basis to avoid mismatched anonymous client state.
Also add regression tests for the new API and the request-scoped header behavior.
Break the device-token refresh path in ConfigurationManager into smaller validation, fetch, success, and failure helpers.
This keeps the new post-initialization token sync behavior intact while satisfying the repo's Detekt thresholds for method size, complexity, and return count.
@coderabbitai

coderabbitaiBot commented Mar 11, 2026

Copy link
Copy Markdown
Contributor

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 0d383be8-936e-4405-af81-c4d73c6502e0

📥 Commits

Reviewing files that changed from the base of the PR and between 650d55b and ba6c38f.

📒 Files selected for processing (2)
  • source/api/src/test/java/com/clerk/api/integration/AuthIntegrationTests.kt
  • source/api/src/test/java/com/clerk/api/integration/IntegrationTestHelpers.kt

📝 Walkthrough

Walkthrough

Adds device token update support: a public suspend fun updateDeviceToken(deviceToken: String): ClerkResult<Unit, ClerkErrorResponse> on Clerk delegating to a new ConfigurationManager updateDeviceToken that validates, persists the token, and triggers a guarded refresh flow. Introduces mutex‑protected refresh logic, a RefreshMode, and helper routines. Adds ClientApi getSkippingClientId and Client.Companion.getSkippingClientId, updates request middleware to honor an internal skip header, and adds tests for middleware and device token update behavior.

🚥 Pre-merge checks | ✅ 2 | ❌ 1

❌ Failed checks (1 warning)

Check nameStatusExplanationResolution
Docstring Coverage⚠️ WarningDocstring coverage is 16.67% which is insufficient. The required threshold is 80.00%.Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (2 passed)
Check nameStatusExplanation
Title check✅ PassedThe title clearly and concisely summarizes the main changes: adding a new updateDeviceToken API and implementing the refresh flow for device tokens.
Description check✅ PassedThe description provides a clear summary of changes and testing approach, covering the main objectives and explaining the approach taken.

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


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.

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In
`@source/api/src/main/kotlin/com/clerk/api/configuration/ConfigurationManager.kt`:
- Line 486: Replace the force-unwrapping of client.id in handleSuccessfulRefresh
to avoid an NPE: don't use client.id!!—instead read val clientId = client.id ?:
run { ClerkLog.w("Received client with null ID, skipping post-refresh tasks");
return ClerkResult.success(Unit) } (or otherwise handle the null case and
abort/postpone post-refresh tasks) and then use clientId for subsequent
operations.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: e9d034da-49fb-450e-ae80-7617853e0aa4

📥 Commits

Reviewing files that changed from the base of the PR and between 6330ac4 and 650d55b.

📒 Files selected for processing (7)
  • source/api/src/main/kotlin/com/clerk/api/Clerk.kt
  • source/api/src/main/kotlin/com/clerk/api/configuration/ConfigurationManager.kt
  • source/api/src/main/kotlin/com/clerk/api/network/api/ClientApi.kt
  • source/api/src/main/kotlin/com/clerk/api/network/middleware/outgoing/VersioningUserAgentMiddleware.kt
  • source/api/src/main/kotlin/com/clerk/api/network/model/client/Client.kt
  • source/api/src/test/java/com/clerk/api/network/middleware/outgoing/VersioningUserAgentMiddlewareTest.kt
  • source/api/src/test/java/com/clerk/api/sdk/ClerkDeviceTokenUpdateTest.kt

applicationContext = applicationContext,
cloudProjectNumber = options?.deviceAttestationOptions?.cloudProjectNumber,
applicationId = options?.deviceAttestationOptions?.applicationId,
clientId = client.id!!,

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟠 Major

Potential NPE: Force-unwrapping nullable client.id

client.id is declared as String? in the Client data class. While a successful API response typically includes a client ID, force-unwrapping with !! can cause a crash if the server ever returns a null ID.

Proposed fix
- clientId = client.id!!,+ clientId = client.id ?: return,

Or guard earlier in handleSuccessfulRefresh:

val clientId = client.id ?:run {
ClerkLog.w("Received client with null ID, skipping post-refresh tasks")
returnClerkResult.success(Unit)
}
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
clientId = client.id!!,
clientId = client.id?:return,
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In
`@source/api/src/main/kotlin/com/clerk/api/configuration/ConfigurationManager.kt`
at line 486, Replace the force-unwrapping of client.id in
handleSuccessfulRefresh to avoid an NPE: don't use client.id!!—instead read val
clientId = client.id ?: run { ClerkLog.w("Received client with null ID, skipping
post-refresh tasks"); return ClerkResult.success(Unit) } (or otherwise handle
the null case and abort/postpone post-refresh tasks) and then use clientId for
subsequent operations.

@chriscaninchriscanin left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This is working well, and is exactly what was needed!

Generate a fresh fictional Clerk test phone number for each auth integration run.
This avoids CI failures when the shared test instance still has the previous hard-coded phone identifier attached to an account.
@swolfand
swolfand merged commit 809c720 into mainMar 11, 2026
10 checks passed
@swolfand
swolfand deleted the add-clerk-android-reinitialization branch March 11, 2026 22:10
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@swolfand@chriscanin
, '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('^' + ".*" + ' Add updateDeviceToken API and refresh flow for device tokens by swolfand · Pull Request #564 · clerk/clerk-android · GitHub
Skip to content

Add updateDeviceToken API and refresh flow for device tokens - #564

Merged
swolfand merged 3 commits into
mainfrom
add-clerk-android-reinitialization
Mar 11, 2026
Merged

Add updateDeviceToken API and refresh flow for device tokens#564
swolfand merged 3 commits into
mainfrom
add-clerk-android-reinitialization

Conversation

@swolfand

@swolfandswolfand commented Mar 11, 2026

Copy link
Copy Markdown
Collaborator

Summary

  • expose Clerk.updateDeviceToken as the supported way to write a new device token and reload client/environment state without reinitializing
  • add forced refresh plumbing in ConfigurationManager plus request-scoped client-id skipping so the refreshed client fetch does not reuse stale headers
  • cover the new flow and middleware behavior with focused SDK and interceptor tests

Testing

  • Not run (not requested)

Summary by CodeRabbit

  • New Features
    • New device-token update API that persists a token and triggers client/environment refresh.
    • New API option to fetch client data while skipping the default client-id header.
  • Behavior Changes
    • Requests can now include an internal flag to omit the client-id header.
  • Tests
    • Added unit and integration tests for token update, middleware, and helpers (including test phone generator).

Add a public Clerk.updateDeviceToken API that persists a new device token and forces a client/environment refresh after initialization.
The refresh path now supports manual token-sync reloads without changing reinitialize semantics, and the client fetch can omit the stale in-memory client id header on a per-request basis to avoid mismatched anonymous client state.
Also add regression tests for the new API and the request-scoped header behavior.
Break the device-token refresh path in ConfigurationManager into smaller validation, fetch, success, and failure helpers.
This keeps the new post-initialization token sync behavior intact while satisfying the repo's Detekt thresholds for method size, complexity, and return count.
@coderabbitai

coderabbitaiBot commented Mar 11, 2026

Copy link
Copy Markdown
Contributor

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 0d383be8-936e-4405-af81-c4d73c6502e0

📥 Commits

Reviewing files that changed from the base of the PR and between 650d55b and ba6c38f.

📒 Files selected for processing (2)
  • source/api/src/test/java/com/clerk/api/integration/AuthIntegrationTests.kt
  • source/api/src/test/java/com/clerk/api/integration/IntegrationTestHelpers.kt

📝 Walkthrough

Walkthrough

Adds device token update support: a public suspend fun updateDeviceToken(deviceToken: String): ClerkResult<Unit, ClerkErrorResponse> on Clerk delegating to a new ConfigurationManager updateDeviceToken that validates, persists the token, and triggers a guarded refresh flow. Introduces mutex‑protected refresh logic, a RefreshMode, and helper routines. Adds ClientApi getSkippingClientId and Client.Companion.getSkippingClientId, updates request middleware to honor an internal skip header, and adds tests for middleware and device token update behavior.

🚥 Pre-merge checks | ✅ 2 | ❌ 1

❌ Failed checks (1 warning)

Check nameStatusExplanationResolution
Docstring Coverage⚠️ WarningDocstring coverage is 16.67% which is insufficient. The required threshold is 80.00%.Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (2 passed)
Check nameStatusExplanation
Title check✅ PassedThe title clearly and concisely summarizes the main changes: adding a new updateDeviceToken API and implementing the refresh flow for device tokens.
Description check✅ PassedThe description provides a clear summary of changes and testing approach, covering the main objectives and explaining the approach taken.

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


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.

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In
`@source/api/src/main/kotlin/com/clerk/api/configuration/ConfigurationManager.kt`:
- Line 486: Replace the force-unwrapping of client.id in handleSuccessfulRefresh
to avoid an NPE: don't use client.id!!—instead read val clientId = client.id ?:
run { ClerkLog.w("Received client with null ID, skipping post-refresh tasks");
return ClerkResult.success(Unit) } (or otherwise handle the null case and
abort/postpone post-refresh tasks) and then use clientId for subsequent
operations.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: e9d034da-49fb-450e-ae80-7617853e0aa4

📥 Commits

Reviewing files that changed from the base of the PR and between 6330ac4 and 650d55b.

📒 Files selected for processing (7)
  • source/api/src/main/kotlin/com/clerk/api/Clerk.kt
  • source/api/src/main/kotlin/com/clerk/api/configuration/ConfigurationManager.kt
  • source/api/src/main/kotlin/com/clerk/api/network/api/ClientApi.kt
  • source/api/src/main/kotlin/com/clerk/api/network/middleware/outgoing/VersioningUserAgentMiddleware.kt
  • source/api/src/main/kotlin/com/clerk/api/network/model/client/Client.kt
  • source/api/src/test/java/com/clerk/api/network/middleware/outgoing/VersioningUserAgentMiddlewareTest.kt
  • source/api/src/test/java/com/clerk/api/sdk/ClerkDeviceTokenUpdateTest.kt

applicationContext = applicationContext,
cloudProjectNumber = options?.deviceAttestationOptions?.cloudProjectNumber,
applicationId = options?.deviceAttestationOptions?.applicationId,
clientId = client.id!!,

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟠 Major

Potential NPE: Force-unwrapping nullable client.id

client.id is declared as String? in the Client data class. While a successful API response typically includes a client ID, force-unwrapping with !! can cause a crash if the server ever returns a null ID.

Proposed fix
- clientId = client.id!!,+ clientId = client.id ?: return,

Or guard earlier in handleSuccessfulRefresh:

val clientId = client.id ?:run {
ClerkLog.w("Received client with null ID, skipping post-refresh tasks")
returnClerkResult.success(Unit)
}
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
clientId = client.id!!,
clientId = client.id?:return,
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In
`@source/api/src/main/kotlin/com/clerk/api/configuration/ConfigurationManager.kt`
at line 486, Replace the force-unwrapping of client.id in
handleSuccessfulRefresh to avoid an NPE: don't use client.id!!—instead read val
clientId = client.id ?: run { ClerkLog.w("Received client with null ID, skipping
post-refresh tasks"); return ClerkResult.success(Unit) } (or otherwise handle
the null case and abort/postpone post-refresh tasks) and then use clientId for
subsequent operations.

@chriscaninchriscanin left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This is working well, and is exactly what was needed!

Generate a fresh fictional Clerk test phone number for each auth integration run.
This avoids CI failures when the shared test instance still has the previous hard-coded phone identifier attached to an account.
@swolfand
swolfand merged commit 809c720 into mainMar 11, 2026
10 checks passed
@swolfand
swolfand deleted the add-clerk-android-reinitialization branch March 11, 2026 22:10
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@swolfand@chriscanin
, '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('^' + ".*" + ' Add updateDeviceToken API and refresh flow for device tokens by swolfand · Pull Request #564 · clerk/clerk-android · GitHub
Skip to content

Add updateDeviceToken API and refresh flow for device tokens - #564

Merged
swolfand merged 3 commits into
mainfrom
add-clerk-android-reinitialization
Mar 11, 2026
Merged

Add updateDeviceToken API and refresh flow for device tokens#564
swolfand merged 3 commits into
mainfrom
add-clerk-android-reinitialization

Conversation

@swolfand

@swolfandswolfand commented Mar 11, 2026

Copy link
Copy Markdown
Collaborator

Summary

  • expose Clerk.updateDeviceToken as the supported way to write a new device token and reload client/environment state without reinitializing
  • add forced refresh plumbing in ConfigurationManager plus request-scoped client-id skipping so the refreshed client fetch does not reuse stale headers
  • cover the new flow and middleware behavior with focused SDK and interceptor tests

Testing

  • Not run (not requested)

Summary by CodeRabbit

  • New Features
    • New device-token update API that persists a token and triggers client/environment refresh.
    • New API option to fetch client data while skipping the default client-id header.
  • Behavior Changes
    • Requests can now include an internal flag to omit the client-id header.
  • Tests
    • Added unit and integration tests for token update, middleware, and helpers (including test phone generator).

Add a public Clerk.updateDeviceToken API that persists a new device token and forces a client/environment refresh after initialization.
The refresh path now supports manual token-sync reloads without changing reinitialize semantics, and the client fetch can omit the stale in-memory client id header on a per-request basis to avoid mismatched anonymous client state.
Also add regression tests for the new API and the request-scoped header behavior.
Break the device-token refresh path in ConfigurationManager into smaller validation, fetch, success, and failure helpers.
This keeps the new post-initialization token sync behavior intact while satisfying the repo's Detekt thresholds for method size, complexity, and return count.
@coderabbitai

coderabbitaiBot commented Mar 11, 2026

Copy link
Copy Markdown
Contributor

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 0d383be8-936e-4405-af81-c4d73c6502e0

📥 Commits

Reviewing files that changed from the base of the PR and between 650d55b and ba6c38f.

📒 Files selected for processing (2)
  • source/api/src/test/java/com/clerk/api/integration/AuthIntegrationTests.kt
  • source/api/src/test/java/com/clerk/api/integration/IntegrationTestHelpers.kt

📝 Walkthrough

Walkthrough

Adds device token update support: a public suspend fun updateDeviceToken(deviceToken: String): ClerkResult<Unit, ClerkErrorResponse> on Clerk delegating to a new ConfigurationManager updateDeviceToken that validates, persists the token, and triggers a guarded refresh flow. Introduces mutex‑protected refresh logic, a RefreshMode, and helper routines. Adds ClientApi getSkippingClientId and Client.Companion.getSkippingClientId, updates request middleware to honor an internal skip header, and adds tests for middleware and device token update behavior.

🚥 Pre-merge checks | ✅ 2 | ❌ 1

❌ Failed checks (1 warning)

Check nameStatusExplanationResolution
Docstring Coverage⚠️ WarningDocstring coverage is 16.67% which is insufficient. The required threshold is 80.00%.Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (2 passed)
Check nameStatusExplanation
Title check✅ PassedThe title clearly and concisely summarizes the main changes: adding a new updateDeviceToken API and implementing the refresh flow for device tokens.
Description check✅ PassedThe description provides a clear summary of changes and testing approach, covering the main objectives and explaining the approach taken.

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


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.

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In
`@source/api/src/main/kotlin/com/clerk/api/configuration/ConfigurationManager.kt`:
- Line 486: Replace the force-unwrapping of client.id in handleSuccessfulRefresh
to avoid an NPE: don't use client.id!!—instead read val clientId = client.id ?:
run { ClerkLog.w("Received client with null ID, skipping post-refresh tasks");
return ClerkResult.success(Unit) } (or otherwise handle the null case and
abort/postpone post-refresh tasks) and then use clientId for subsequent
operations.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: e9d034da-49fb-450e-ae80-7617853e0aa4

📥 Commits

Reviewing files that changed from the base of the PR and between 6330ac4 and 650d55b.

📒 Files selected for processing (7)
  • source/api/src/main/kotlin/com/clerk/api/Clerk.kt
  • source/api/src/main/kotlin/com/clerk/api/configuration/ConfigurationManager.kt
  • source/api/src/main/kotlin/com/clerk/api/network/api/ClientApi.kt
  • source/api/src/main/kotlin/com/clerk/api/network/middleware/outgoing/VersioningUserAgentMiddleware.kt
  • source/api/src/main/kotlin/com/clerk/api/network/model/client/Client.kt
  • source/api/src/test/java/com/clerk/api/network/middleware/outgoing/VersioningUserAgentMiddlewareTest.kt
  • source/api/src/test/java/com/clerk/api/sdk/ClerkDeviceTokenUpdateTest.kt

applicationContext = applicationContext,
cloudProjectNumber = options?.deviceAttestationOptions?.cloudProjectNumber,
applicationId = options?.deviceAttestationOptions?.applicationId,
clientId = client.id!!,

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟠 Major

Potential NPE: Force-unwrapping nullable client.id

client.id is declared as String? in the Client data class. While a successful API response typically includes a client ID, force-unwrapping with !! can cause a crash if the server ever returns a null ID.

Proposed fix
- clientId = client.id!!,+ clientId = client.id ?: return,

Or guard earlier in handleSuccessfulRefresh:

val clientId = client.id ?:run {
ClerkLog.w("Received client with null ID, skipping post-refresh tasks")
returnClerkResult.success(Unit)
}
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
clientId = client.id!!,
clientId = client.id?:return,
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In
`@source/api/src/main/kotlin/com/clerk/api/configuration/ConfigurationManager.kt`
at line 486, Replace the force-unwrapping of client.id in
handleSuccessfulRefresh to avoid an NPE: don't use client.id!!—instead read val
clientId = client.id ?: run { ClerkLog.w("Received client with null ID, skipping
post-refresh tasks"); return ClerkResult.success(Unit) } (or otherwise handle
the null case and abort/postpone post-refresh tasks) and then use clientId for
subsequent operations.

@chriscaninchriscanin left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This is working well, and is exactly what was needed!

Generate a fresh fictional Clerk test phone number for each auth integration run.
This avoids CI failures when the shared test instance still has the previous hard-coded phone identifier attached to an account.
@swolfand
swolfand merged commit 809c720 into mainMar 11, 2026
10 checks passed
@swolfand
swolfand deleted the add-clerk-android-reinitialization branch March 11, 2026 22:10
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@swolfand@chriscanin
, '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" + ' Add updateDeviceToken API and refresh flow for device tokens by swolfand · Pull Request #564 · clerk/clerk-android · GitHub
Skip to content

Add updateDeviceToken API and refresh flow for device tokens - #564

Merged
swolfand merged 3 commits into
mainfrom
add-clerk-android-reinitialization
Mar 11, 2026
Merged

Add updateDeviceToken API and refresh flow for device tokens#564
swolfand merged 3 commits into
mainfrom
add-clerk-android-reinitialization

Conversation

@swolfand

@swolfandswolfand commented Mar 11, 2026

Copy link
Copy Markdown
Collaborator

Summary

  • expose Clerk.updateDeviceToken as the supported way to write a new device token and reload client/environment state without reinitializing
  • add forced refresh plumbing in ConfigurationManager plus request-scoped client-id skipping so the refreshed client fetch does not reuse stale headers
  • cover the new flow and middleware behavior with focused SDK and interceptor tests

Testing

  • Not run (not requested)

Summary by CodeRabbit

  • New Features
    • New device-token update API that persists a token and triggers client/environment refresh.
    • New API option to fetch client data while skipping the default client-id header.
  • Behavior Changes
    • Requests can now include an internal flag to omit the client-id header.
  • Tests
    • Added unit and integration tests for token update, middleware, and helpers (including test phone generator).

Add a public Clerk.updateDeviceToken API that persists a new device token and forces a client/environment refresh after initialization.
The refresh path now supports manual token-sync reloads without changing reinitialize semantics, and the client fetch can omit the stale in-memory client id header on a per-request basis to avoid mismatched anonymous client state.
Also add regression tests for the new API and the request-scoped header behavior.
Break the device-token refresh path in ConfigurationManager into smaller validation, fetch, success, and failure helpers.
This keeps the new post-initialization token sync behavior intact while satisfying the repo's Detekt thresholds for method size, complexity, and return count.
@coderabbitai

coderabbitaiBot commented Mar 11, 2026

Copy link
Copy Markdown
Contributor

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 0d383be8-936e-4405-af81-c4d73c6502e0

📥 Commits

Reviewing files that changed from the base of the PR and between 650d55b and ba6c38f.

📒 Files selected for processing (2)
  • source/api/src/test/java/com/clerk/api/integration/AuthIntegrationTests.kt
  • source/api/src/test/java/com/clerk/api/integration/IntegrationTestHelpers.kt

📝 Walkthrough

Walkthrough

Adds device token update support: a public suspend fun updateDeviceToken(deviceToken: String): ClerkResult<Unit, ClerkErrorResponse> on Clerk delegating to a new ConfigurationManager updateDeviceToken that validates, persists the token, and triggers a guarded refresh flow. Introduces mutex‑protected refresh logic, a RefreshMode, and helper routines. Adds ClientApi getSkippingClientId and Client.Companion.getSkippingClientId, updates request middleware to honor an internal skip header, and adds tests for middleware and device token update behavior.

🚥 Pre-merge checks | ✅ 2 | ❌ 1

❌ Failed checks (1 warning)

Check nameStatusExplanationResolution
Docstring Coverage⚠️ WarningDocstring coverage is 16.67% which is insufficient. The required threshold is 80.00%.Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (2 passed)
Check nameStatusExplanation
Title check✅ PassedThe title clearly and concisely summarizes the main changes: adding a new updateDeviceToken API and implementing the refresh flow for device tokens.
Description check✅ PassedThe description provides a clear summary of changes and testing approach, covering the main objectives and explaining the approach taken.

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


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.

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In
`@source/api/src/main/kotlin/com/clerk/api/configuration/ConfigurationManager.kt`:
- Line 486: Replace the force-unwrapping of client.id in handleSuccessfulRefresh
to avoid an NPE: don't use client.id!!—instead read val clientId = client.id ?:
run { ClerkLog.w("Received client with null ID, skipping post-refresh tasks");
return ClerkResult.success(Unit) } (or otherwise handle the null case and
abort/postpone post-refresh tasks) and then use clientId for subsequent
operations.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: e9d034da-49fb-450e-ae80-7617853e0aa4

📥 Commits

Reviewing files that changed from the base of the PR and between 6330ac4 and 650d55b.

📒 Files selected for processing (7)
  • source/api/src/main/kotlin/com/clerk/api/Clerk.kt
  • source/api/src/main/kotlin/com/clerk/api/configuration/ConfigurationManager.kt
  • source/api/src/main/kotlin/com/clerk/api/network/api/ClientApi.kt
  • source/api/src/main/kotlin/com/clerk/api/network/middleware/outgoing/VersioningUserAgentMiddleware.kt
  • source/api/src/main/kotlin/com/clerk/api/network/model/client/Client.kt
  • source/api/src/test/java/com/clerk/api/network/middleware/outgoing/VersioningUserAgentMiddlewareTest.kt
  • source/api/src/test/java/com/clerk/api/sdk/ClerkDeviceTokenUpdateTest.kt

applicationContext = applicationContext,
cloudProjectNumber = options?.deviceAttestationOptions?.cloudProjectNumber,
applicationId = options?.deviceAttestationOptions?.applicationId,
clientId = client.id!!,

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟠 Major

Potential NPE: Force-unwrapping nullable client.id

client.id is declared as String? in the Client data class. While a successful API response typically includes a client ID, force-unwrapping with !! can cause a crash if the server ever returns a null ID.

Proposed fix
- clientId = client.id!!,+ clientId = client.id ?: return,

Or guard earlier in handleSuccessfulRefresh:

val clientId = client.id ?:run {
ClerkLog.w("Received client with null ID, skipping post-refresh tasks")
returnClerkResult.success(Unit)
}
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
clientId = client.id!!,
clientId = client.id?:return,
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In
`@source/api/src/main/kotlin/com/clerk/api/configuration/ConfigurationManager.kt`
at line 486, Replace the force-unwrapping of client.id in
handleSuccessfulRefresh to avoid an NPE: don't use client.id!!—instead read val
clientId = client.id ?: run { ClerkLog.w("Received client with null ID, skipping
post-refresh tasks"); return ClerkResult.success(Unit) } (or otherwise handle
the null case and abort/postpone post-refresh tasks) and then use clientId for
subsequent operations.

@chriscaninchriscanin left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This is working well, and is exactly what was needed!

Generate a fresh fictional Clerk test phone number for each auth integration run.
This avoids CI failures when the shared test instance still has the previous hard-coded phone identifier attached to an account.
@swolfand
swolfand merged commit 809c720 into mainMar 11, 2026
10 checks passed
@swolfand
swolfand deleted the add-clerk-android-reinitialization branch March 11, 2026 22:10
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@swolfand@chriscanin
, '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('^' + ".*" + ' Add updateDeviceToken API and refresh flow for device tokens by swolfand · Pull Request #564 · clerk/clerk-android · GitHub
Skip to content

Add updateDeviceToken API and refresh flow for device tokens - #564

Merged
swolfand merged 3 commits into
mainfrom
add-clerk-android-reinitialization
Mar 11, 2026
Merged

Add updateDeviceToken API and refresh flow for device tokens#564
swolfand merged 3 commits into
mainfrom
add-clerk-android-reinitialization

Conversation

@swolfand

@swolfandswolfand commented Mar 11, 2026

Copy link
Copy Markdown
Collaborator

Summary

  • expose Clerk.updateDeviceToken as the supported way to write a new device token and reload client/environment state without reinitializing
  • add forced refresh plumbing in ConfigurationManager plus request-scoped client-id skipping so the refreshed client fetch does not reuse stale headers
  • cover the new flow and middleware behavior with focused SDK and interceptor tests

Testing

  • Not run (not requested)

Summary by CodeRabbit

  • New Features
    • New device-token update API that persists a token and triggers client/environment refresh.
    • New API option to fetch client data while skipping the default client-id header.
  • Behavior Changes
    • Requests can now include an internal flag to omit the client-id header.
  • Tests
    • Added unit and integration tests for token update, middleware, and helpers (including test phone generator).

Add a public Clerk.updateDeviceToken API that persists a new device token and forces a client/environment refresh after initialization.
The refresh path now supports manual token-sync reloads without changing reinitialize semantics, and the client fetch can omit the stale in-memory client id header on a per-request basis to avoid mismatched anonymous client state.
Also add regression tests for the new API and the request-scoped header behavior.
Break the device-token refresh path in ConfigurationManager into smaller validation, fetch, success, and failure helpers.
This keeps the new post-initialization token sync behavior intact while satisfying the repo's Detekt thresholds for method size, complexity, and return count.
@coderabbitai

coderabbitaiBot commented Mar 11, 2026

Copy link
Copy Markdown
Contributor

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 0d383be8-936e-4405-af81-c4d73c6502e0

📥 Commits

Reviewing files that changed from the base of the PR and between 650d55b and ba6c38f.

📒 Files selected for processing (2)
  • source/api/src/test/java/com/clerk/api/integration/AuthIntegrationTests.kt
  • source/api/src/test/java/com/clerk/api/integration/IntegrationTestHelpers.kt

📝 Walkthrough

Walkthrough

Adds device token update support: a public suspend fun updateDeviceToken(deviceToken: String): ClerkResult<Unit, ClerkErrorResponse> on Clerk delegating to a new ConfigurationManager updateDeviceToken that validates, persists the token, and triggers a guarded refresh flow. Introduces mutex‑protected refresh logic, a RefreshMode, and helper routines. Adds ClientApi getSkippingClientId and Client.Companion.getSkippingClientId, updates request middleware to honor an internal skip header, and adds tests for middleware and device token update behavior.

🚥 Pre-merge checks | ✅ 2 | ❌ 1

❌ Failed checks (1 warning)

Check nameStatusExplanationResolution
Docstring Coverage⚠️ WarningDocstring coverage is 16.67% which is insufficient. The required threshold is 80.00%.Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (2 passed)
Check nameStatusExplanation
Title check✅ PassedThe title clearly and concisely summarizes the main changes: adding a new updateDeviceToken API and implementing the refresh flow for device tokens.
Description check✅ PassedThe description provides a clear summary of changes and testing approach, covering the main objectives and explaining the approach taken.

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


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.

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In
`@source/api/src/main/kotlin/com/clerk/api/configuration/ConfigurationManager.kt`:
- Line 486: Replace the force-unwrapping of client.id in handleSuccessfulRefresh
to avoid an NPE: don't use client.id!!—instead read val clientId = client.id ?:
run { ClerkLog.w("Received client with null ID, skipping post-refresh tasks");
return ClerkResult.success(Unit) } (or otherwise handle the null case and
abort/postpone post-refresh tasks) and then use clientId for subsequent
operations.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: e9d034da-49fb-450e-ae80-7617853e0aa4

📥 Commits

Reviewing files that changed from the base of the PR and between 6330ac4 and 650d55b.

📒 Files selected for processing (7)
  • source/api/src/main/kotlin/com/clerk/api/Clerk.kt
  • source/api/src/main/kotlin/com/clerk/api/configuration/ConfigurationManager.kt
  • source/api/src/main/kotlin/com/clerk/api/network/api/ClientApi.kt
  • source/api/src/main/kotlin/com/clerk/api/network/middleware/outgoing/VersioningUserAgentMiddleware.kt
  • source/api/src/main/kotlin/com/clerk/api/network/model/client/Client.kt
  • source/api/src/test/java/com/clerk/api/network/middleware/outgoing/VersioningUserAgentMiddlewareTest.kt
  • source/api/src/test/java/com/clerk/api/sdk/ClerkDeviceTokenUpdateTest.kt

applicationContext = applicationContext,
cloudProjectNumber = options?.deviceAttestationOptions?.cloudProjectNumber,
applicationId = options?.deviceAttestationOptions?.applicationId,
clientId = client.id!!,

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟠 Major

Potential NPE: Force-unwrapping nullable client.id

client.id is declared as String? in the Client data class. While a successful API response typically includes a client ID, force-unwrapping with !! can cause a crash if the server ever returns a null ID.

Proposed fix
- clientId = client.id!!,+ clientId = client.id ?: return,

Or guard earlier in handleSuccessfulRefresh:

val clientId = client.id ?:run {
ClerkLog.w("Received client with null ID, skipping post-refresh tasks")
returnClerkResult.success(Unit)
}
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
clientId = client.id!!,
clientId = client.id?:return,
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In
`@source/api/src/main/kotlin/com/clerk/api/configuration/ConfigurationManager.kt`
at line 486, Replace the force-unwrapping of client.id in
handleSuccessfulRefresh to avoid an NPE: don't use client.id!!—instead read val
clientId = client.id ?: run { ClerkLog.w("Received client with null ID, skipping
post-refresh tasks"); return ClerkResult.success(Unit) } (or otherwise handle
the null case and abort/postpone post-refresh tasks) and then use clientId for
subsequent operations.

@chriscaninchriscanin left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This is working well, and is exactly what was needed!

Generate a fresh fictional Clerk test phone number for each auth integration run.
This avoids CI failures when the shared test instance still has the previous hard-coded phone identifier attached to an account.
@swolfand
swolfand merged commit 809c720 into mainMar 11, 2026
10 checks passed
@swolfand
swolfand deleted the add-clerk-android-reinitialization branch March 11, 2026 22:10
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@swolfand@chriscanin
, '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('^' + ".*" + ' Add updateDeviceToken API and refresh flow for device tokens by swolfand · Pull Request #564 · clerk/clerk-android · GitHub
Skip to content

Add updateDeviceToken API and refresh flow for device tokens - #564

Merged
swolfand merged 3 commits into
mainfrom
add-clerk-android-reinitialization
Mar 11, 2026
Merged

Add updateDeviceToken API and refresh flow for device tokens#564
swolfand merged 3 commits into
mainfrom
add-clerk-android-reinitialization

Conversation

@swolfand

@swolfandswolfand commented Mar 11, 2026

Copy link
Copy Markdown
Collaborator

Summary

  • expose Clerk.updateDeviceToken as the supported way to write a new device token and reload client/environment state without reinitializing
  • add forced refresh plumbing in ConfigurationManager plus request-scoped client-id skipping so the refreshed client fetch does not reuse stale headers
  • cover the new flow and middleware behavior with focused SDK and interceptor tests

Testing

  • Not run (not requested)

Summary by CodeRabbit

  • New Features
    • New device-token update API that persists a token and triggers client/environment refresh.
    • New API option to fetch client data while skipping the default client-id header.
  • Behavior Changes
    • Requests can now include an internal flag to omit the client-id header.
  • Tests
    • Added unit and integration tests for token update, middleware, and helpers (including test phone generator).

Add a public Clerk.updateDeviceToken API that persists a new device token and forces a client/environment refresh after initialization.
The refresh path now supports manual token-sync reloads without changing reinitialize semantics, and the client fetch can omit the stale in-memory client id header on a per-request basis to avoid mismatched anonymous client state.
Also add regression tests for the new API and the request-scoped header behavior.
Break the device-token refresh path in ConfigurationManager into smaller validation, fetch, success, and failure helpers.
This keeps the new post-initialization token sync behavior intact while satisfying the repo's Detekt thresholds for method size, complexity, and return count.
@coderabbitai

coderabbitaiBot commented Mar 11, 2026

Copy link
Copy Markdown
Contributor

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 0d383be8-936e-4405-af81-c4d73c6502e0

📥 Commits

Reviewing files that changed from the base of the PR and between 650d55b and ba6c38f.

📒 Files selected for processing (2)
  • source/api/src/test/java/com/clerk/api/integration/AuthIntegrationTests.kt
  • source/api/src/test/java/com/clerk/api/integration/IntegrationTestHelpers.kt

📝 Walkthrough

Walkthrough

Adds device token update support: a public suspend fun updateDeviceToken(deviceToken: String): ClerkResult<Unit, ClerkErrorResponse> on Clerk delegating to a new ConfigurationManager updateDeviceToken that validates, persists the token, and triggers a guarded refresh flow. Introduces mutex‑protected refresh logic, a RefreshMode, and helper routines. Adds ClientApi getSkippingClientId and Client.Companion.getSkippingClientId, updates request middleware to honor an internal skip header, and adds tests for middleware and device token update behavior.

🚥 Pre-merge checks | ✅ 2 | ❌ 1

❌ Failed checks (1 warning)

Check nameStatusExplanationResolution
Docstring Coverage⚠️ WarningDocstring coverage is 16.67% which is insufficient. The required threshold is 80.00%.Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (2 passed)
Check nameStatusExplanation
Title check✅ PassedThe title clearly and concisely summarizes the main changes: adding a new updateDeviceToken API and implementing the refresh flow for device tokens.
Description check✅ PassedThe description provides a clear summary of changes and testing approach, covering the main objectives and explaining the approach taken.

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


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.

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In
`@source/api/src/main/kotlin/com/clerk/api/configuration/ConfigurationManager.kt`:
- Line 486: Replace the force-unwrapping of client.id in handleSuccessfulRefresh
to avoid an NPE: don't use client.id!!—instead read val clientId = client.id ?:
run { ClerkLog.w("Received client with null ID, skipping post-refresh tasks");
return ClerkResult.success(Unit) } (or otherwise handle the null case and
abort/postpone post-refresh tasks) and then use clientId for subsequent
operations.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: e9d034da-49fb-450e-ae80-7617853e0aa4

📥 Commits

Reviewing files that changed from the base of the PR and between 6330ac4 and 650d55b.

📒 Files selected for processing (7)
  • source/api/src/main/kotlin/com/clerk/api/Clerk.kt
  • source/api/src/main/kotlin/com/clerk/api/configuration/ConfigurationManager.kt
  • source/api/src/main/kotlin/com/clerk/api/network/api/ClientApi.kt
  • source/api/src/main/kotlin/com/clerk/api/network/middleware/outgoing/VersioningUserAgentMiddleware.kt
  • source/api/src/main/kotlin/com/clerk/api/network/model/client/Client.kt
  • source/api/src/test/java/com/clerk/api/network/middleware/outgoing/VersioningUserAgentMiddlewareTest.kt
  • source/api/src/test/java/com/clerk/api/sdk/ClerkDeviceTokenUpdateTest.kt

applicationContext = applicationContext,
cloudProjectNumber = options?.deviceAttestationOptions?.cloudProjectNumber,
applicationId = options?.deviceAttestationOptions?.applicationId,
clientId = client.id!!,

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟠 Major

Potential NPE: Force-unwrapping nullable client.id

client.id is declared as String? in the Client data class. While a successful API response typically includes a client ID, force-unwrapping with !! can cause a crash if the server ever returns a null ID.

Proposed fix
- clientId = client.id!!,+ clientId = client.id ?: return,

Or guard earlier in handleSuccessfulRefresh:

val clientId = client.id ?:run {
ClerkLog.w("Received client with null ID, skipping post-refresh tasks")
returnClerkResult.success(Unit)
}
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
clientId = client.id!!,
clientId = client.id?:return,
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In
`@source/api/src/main/kotlin/com/clerk/api/configuration/ConfigurationManager.kt`
at line 486, Replace the force-unwrapping of client.id in
handleSuccessfulRefresh to avoid an NPE: don't use client.id!!—instead read val
clientId = client.id ?: run { ClerkLog.w("Received client with null ID, skipping
post-refresh tasks"); return ClerkResult.success(Unit) } (or otherwise handle
the null case and abort/postpone post-refresh tasks) and then use clientId for
subsequent operations.

@chriscaninchriscanin left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This is working well, and is exactly what was needed!

Generate a fresh fictional Clerk test phone number for each auth integration run.
This avoids CI failures when the shared test instance still has the previous hard-coded phone identifier attached to an account.
@swolfand
swolfand merged commit 809c720 into mainMar 11, 2026
10 checks passed
@swolfand
swolfand deleted the add-clerk-android-reinitialization branch March 11, 2026 22:10
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@swolfand@chriscanin
, '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); } })(); })(); Add updateDeviceToken API and refresh flow for device tokens by swolfand · Pull Request #564 · clerk/clerk-android · GitHub
Skip to content

Add updateDeviceToken API and refresh flow for device tokens - #564

Merged
swolfand merged 3 commits into
mainfrom
add-clerk-android-reinitialization
Mar 11, 2026
Merged

Add updateDeviceToken API and refresh flow for device tokens#564
swolfand merged 3 commits into
mainfrom
add-clerk-android-reinitialization

Conversation

@swolfand

@swolfandswolfand commented Mar 11, 2026

Copy link
Copy Markdown
Collaborator

Summary

  • expose Clerk.updateDeviceToken as the supported way to write a new device token and reload client/environment state without reinitializing
  • add forced refresh plumbing in ConfigurationManager plus request-scoped client-id skipping so the refreshed client fetch does not reuse stale headers
  • cover the new flow and middleware behavior with focused SDK and interceptor tests

Testing

  • Not run (not requested)

Summary by CodeRabbit

  • New Features
    • New device-token update API that persists a token and triggers client/environment refresh.
    • New API option to fetch client data while skipping the default client-id header.
  • Behavior Changes
    • Requests can now include an internal flag to omit the client-id header.
  • Tests
    • Added unit and integration tests for token update, middleware, and helpers (including test phone generator).

Add a public Clerk.updateDeviceToken API that persists a new device token and forces a client/environment refresh after initialization.
The refresh path now supports manual token-sync reloads without changing reinitialize semantics, and the client fetch can omit the stale in-memory client id header on a per-request basis to avoid mismatched anonymous client state.
Also add regression tests for the new API and the request-scoped header behavior.
Break the device-token refresh path in ConfigurationManager into smaller validation, fetch, success, and failure helpers.
This keeps the new post-initialization token sync behavior intact while satisfying the repo's Detekt thresholds for method size, complexity, and return count.
@coderabbitai

coderabbitaiBot commented Mar 11, 2026

Copy link
Copy Markdown
Contributor

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 0d383be8-936e-4405-af81-c4d73c6502e0

📥 Commits

Reviewing files that changed from the base of the PR and between 650d55b and ba6c38f.

📒 Files selected for processing (2)
  • source/api/src/test/java/com/clerk/api/integration/AuthIntegrationTests.kt
  • source/api/src/test/java/com/clerk/api/integration/IntegrationTestHelpers.kt

📝 Walkthrough

Walkthrough

Adds device token update support: a public suspend fun updateDeviceToken(deviceToken: String): ClerkResult<Unit, ClerkErrorResponse> on Clerk delegating to a new ConfigurationManager updateDeviceToken that validates, persists the token, and triggers a guarded refresh flow. Introduces mutex‑protected refresh logic, a RefreshMode, and helper routines. Adds ClientApi getSkippingClientId and Client.Companion.getSkippingClientId, updates request middleware to honor an internal skip header, and adds tests for middleware and device token update behavior.

🚥 Pre-merge checks | ✅ 2 | ❌ 1

❌ Failed checks (1 warning)

Check nameStatusExplanationResolution
Docstring Coverage⚠️ WarningDocstring coverage is 16.67% which is insufficient. The required threshold is 80.00%.Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (2 passed)
Check nameStatusExplanation
Title check✅ PassedThe title clearly and concisely summarizes the main changes: adding a new updateDeviceToken API and implementing the refresh flow for device tokens.
Description check✅ PassedThe description provides a clear summary of changes and testing approach, covering the main objectives and explaining the approach taken.

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


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.

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In
`@source/api/src/main/kotlin/com/clerk/api/configuration/ConfigurationManager.kt`:
- Line 486: Replace the force-unwrapping of client.id in handleSuccessfulRefresh
to avoid an NPE: don't use client.id!!—instead read val clientId = client.id ?:
run { ClerkLog.w("Received client with null ID, skipping post-refresh tasks");
return ClerkResult.success(Unit) } (or otherwise handle the null case and
abort/postpone post-refresh tasks) and then use clientId for subsequent
operations.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: e9d034da-49fb-450e-ae80-7617853e0aa4

📥 Commits

Reviewing files that changed from the base of the PR and between 6330ac4 and 650d55b.

📒 Files selected for processing (7)
  • source/api/src/main/kotlin/com/clerk/api/Clerk.kt
  • source/api/src/main/kotlin/com/clerk/api/configuration/ConfigurationManager.kt
  • source/api/src/main/kotlin/com/clerk/api/network/api/ClientApi.kt
  • source/api/src/main/kotlin/com/clerk/api/network/middleware/outgoing/VersioningUserAgentMiddleware.kt
  • source/api/src/main/kotlin/com/clerk/api/network/model/client/Client.kt
  • source/api/src/test/java/com/clerk/api/network/middleware/outgoing/VersioningUserAgentMiddlewareTest.kt
  • source/api/src/test/java/com/clerk/api/sdk/ClerkDeviceTokenUpdateTest.kt

applicationContext = applicationContext,
cloudProjectNumber = options?.deviceAttestationOptions?.cloudProjectNumber,
applicationId = options?.deviceAttestationOptions?.applicationId,
clientId = client.id!!,

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟠 Major

Potential NPE: Force-unwrapping nullable client.id

client.id is declared as String? in the Client data class. While a successful API response typically includes a client ID, force-unwrapping with !! can cause a crash if the server ever returns a null ID.

Proposed fix
- clientId = client.id!!,+ clientId = client.id ?: return,

Or guard earlier in handleSuccessfulRefresh:

val clientId = client.id ?:run {
ClerkLog.w("Received client with null ID, skipping post-refresh tasks")
returnClerkResult.success(Unit)
}
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
clientId = client.id!!,
clientId = client.id?:return,
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In
`@source/api/src/main/kotlin/com/clerk/api/configuration/ConfigurationManager.kt`
at line 486, Replace the force-unwrapping of client.id in
handleSuccessfulRefresh to avoid an NPE: don't use client.id!!—instead read val
clientId = client.id ?: run { ClerkLog.w("Received client with null ID, skipping
post-refresh tasks"); return ClerkResult.success(Unit) } (or otherwise handle
the null case and abort/postpone post-refresh tasks) and then use clientId for
subsequent operations.

@chriscaninchriscanin left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This is working well, and is exactly what was needed!

Generate a fresh fictional Clerk test phone number for each auth integration run.
This avoids CI failures when the shared test instance still has the previous hard-coded phone identifier attached to an account.
@swolfand
swolfand merged commit 809c720 into mainMar 11, 2026
10 checks passed
@swolfand
swolfand deleted the add-clerk-android-reinitialization branch March 11, 2026 22:10
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@swolfand@chriscanin