Skip to content

fix(settings): preserve Apple additional client IDs state#341

Merged
JEETDESAI25 merged 2 commits into
supabase:mainfrom
pjpjq:fix/apple-additional-client-ids-drift
Jul 9, 2026
Merged

fix(settings): preserve Apple additional client IDs state#341
JEETDESAI25 merged 2 commits into
supabase:mainfrom
pjpjq:fix/apple-additional-client-ids-drift

Conversation

@pjpjq

@pjpjq pjpjq commented Jul 7, 2026

Copy link
Copy Markdown
Contributor

Replaces #340, which was closed when the fork branch was renamed from codex/... to fix/....

Summary

  • preserve Apple auth client ID fields when external_apple_additional_client_ids is configured
  • avoid API read/write responses that fold additional Apple IDs into external_apple_client_id from changing Terraform state after apply
  • add a regression test for the merged API response shape

Fixes #336

Tests

  • go test ./internal/provider -run 'TestAccSettingsResource_AppleAdditionalClientIds|TestParseConfigNullablePreservesUserValue' -count=1
  • go test ./...
  • test -z "$(gofmt -l internal/provider/settings_resource.go internal/provider/settings_resource_test.go)"
  • git diff --check

@JEETDESAI25 JEETDESAI25 self-requested a review July 8, 2026 10:19

@JEETDESAI25 JEETDESAI25 left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Hey @pjpjq, thanks for the fix and regression test.

This looks good to me. The helper matches the existing preserved-from-state pattern, and the test covers the lossy API response from issue #336 where additional Apple IDs are folded into external_apple_client_id.

No blockers from me @savme

@JEETDESAI25 JEETDESAI25 merged commit ca5f698 into supabase:main Jul 9, 2026
5 checks passed
Sign up for free to 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.

.auth inconsistent values error when using external_apple_additional_client_ids

2 participants