Repository navigation
refactor(license): one license and sync presentation on every surface - #4005
Merged
Merged
Conversation
datlechin
enabled auto-merge (squash)
November 3, 2026 05:02
datlechin
added a commit
that referenced
this pull request
Nov 3, 2026
Brings main's 27 commits, among them one license and sync presentation (#4005), the Black Friday line (#3995), the update indicator and relaunch (#3993, #3997), running work (#4009), native notices (#4007) and the security merges for GHSA-3x6q-h487-r38w, GHSA-3xf7-86qj-4546, GHSA-6g2g-65r6-v5wh, GHSA-q2hp-vxv3-87fw, GHSA-6p9q-hc7v-cxmx and GHSA-vg8g-h6xp-6px5. - #4005: ported onto FeatureAccess. LicensePresentation.gate reads AccountState: signed out names a paid plan and offers Sign In beside Purchase License, an account without the feature gets Upgrade Plan, the device limit opens Settings > Account, and a lapsed or failed check reads as Settings > Account words it, with Try Again, so a paying customer is never sent to the pricing page. The pane's notice text moved to AccountSettingsContent.Notice so both read it. LicenseGateRow replaces ProBadge in the Sync, Linked Folders, Data Rewind and connection export rows, LicenseGateAlert serves Compare & Sync and Data Rewind, and the overlay renders the same notice. Try Again shows a spinner and the failed check's reason; Refresh in Settings > Account shows the reason too. Welcome shows the pane's first notice as a link (a plan being canceled stays in the pane), else Sign In. Dropped: the .suspended access, since an entitlement carries no suspended state, and LicenseManager's coalesced checks and stale-answer guard, since AccountServices already runs one check at a time and drops a refresh that lands after sign-out. - #3995: the Black Friday line shows when FeatureAccess.supportAudience is .prospect, the notion the day-30 ask reads. - #3989: ported before this merge, in e39c309. - #3993, #3997: merged as main has them; Welcome and the Sync pane keep UpdateCenter. - #4007: a Team Library publish that goes through shows no info alert on Welcome or in Favorites; the section shows the items. The queued and failed messages stay. - #4009: merged outside the Team Library. TeamLibraryStore's write generation, the shared in-flight pull, the refused second publish and the Team Library row in Settings > License are dropped: TeamLibrarySync runs syncs and publishes one at a time, bumps a generation on sign-out, and the Welcome and Favorites headers show the running sync, the last sync and a failure. - 726a167 (security): LicenseAPIClient and LiveTeamLibraryAPIClient follow redirects only on their own origin. Ported by giving the account URLSession SameOriginRedirects as its delegate, which covers token requests, /v2 calls and the team library. The pulled library keeps a connection's sign-in choice for the consent prompt: ported to TeamLibraryChange.connection, and its test moved to TeamLibrarySyncTests. Publishing needs nothing, since portableSettings keeps the choice by default. EnvVarReferenceConsent reads FeatureAccess. - DatabaseManager+Sessions: main's recovery guard and consent path, with Telemetry.connectionAttempted in place of MacAnalyticsProvider. - project.yml: PostHog stays and zstd goes, as main moved Kafka's codecs into TableProCore; the app links main's new products, without TableProAnalytics. - The storage rule, data-sync-storage.md: the paths main listed for the deleted TeamLibraryModels, TeamLibraryStore and MacAnalyticsProvider name TeamLibraryItem, TeamLibraryState and Telemetry, plus Account's stores. - Localizable.xcstrings: merged key by key in this branch's order; no key changed on both sides. 271 keys come from main; the three SSH host keys main removed are gone, as nothing uses them. - Tests deleted with the code this branch deleted: LicenseManagerDecisionTests, LicensePresentationTests and LicenseTierTests under Models, TeamLibraryModelsTests, TeamLibrarySyncCoordinatorTests, and the Macs link case in SupportLinksTests. New: LicensePresentationTests under Views/Settings, the sign-in choice case in TeamLibrarySyncTests and the redirect case in AccountConfigurationTests.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
LicensePresentation, under every license surface. Each state has one title, one message and one action (LicenseNoticeAction: Activate License…, Renew License, Buy a License, Upgrade Plan, Try Again).gate(for:access:): no license names the plan and offers Activate License… (the dialog carries the purchase link); a plan the license lacks offers Upgrade Plan; expired, suspended and unverified reuse the License pane's own notice, so a paying customer is never asked to buy.ProFeatureAccessgains.suspended, which used to fold into.unlicensed.LicenseGateAlert), aLicenseGateRowin Settings (Sync, Linked Folders, Data Rewind) and the connection export sheet, the License pane, and Welcome.ProBadge) is gone.LicenseManager.checkFailureholds a check that reached no verdict (offline, server error); every Try Again shows a spinner while it runs and the reason under it after; Refresh shows it under the plan line. Checks coalesce, and an answer for a license deactivated or replaced during the check is dropped.SyncStatusPresentationinTableProSyncTransport, used by both apps: titles, symbols and actions (SyncStatusAction). Each app keeps only its sentences (this Mac, this device) and handlers; iOS drops the three actions it has no public way to perform.SyncCoordinator.evaluateStatusreads the switch before the license, so sync that was never turned on is off by choice.gate(for:access:),.suspendedaccesswelcomeLinecheckFailure,LicenseCheckFailureLineadoptsValidationoffersSyncNowstatusTitlewere unreachable@ObservedObjectDecisions taken without a design review:
Tests changed on purpose, because they pinned the old shape:
LicenseTierTests.inactiveStatusesReportUnlicensed(suspended moved tosuspendedReportsSuspended);LicensePresentationTests.lapsedLicenseMarksNothing(suspended access);SyncStatusPresentationTests.storageFullAction,removedDataOffersAChoice(Try Again in the notice, Sync Now hidden for blockers);SyncStatusPresentationTests(mobileActions).Test plan
SyncStatusPresentationTests(7);LicensePresentationTests,LicenseManagerDecisionTests(checkFailureIsOnlyANonVerdict,validationAnswersOnlyForTheCheckedLicense),LicenseTierTests.suspendedReportsSuspended,SyncCoordinatorArmingTests.offWithoutALicenseIsOffByChoice,SyncStatusPresentationTests(Sync Now, license states, Welcome);SyncStatusPresentationTests.macOnlyActionsAreDropped.TableProSyncTestssync suites: 17 of 17.lapsedLicenseMarksNothing, updated above; rerun of the license suites after the race fix: 104 of 104.SyncStatusPresentationTests6 of 6,ConnectionListStateTestsandIOSSyncCoordinatorTests69 of 69.verify.sh l10n: pass on both catalogs. The iOS catalog change is inserted in place (66 lines), not a re-sort.origin/mainfound nothing.Screenshots
States other than "no license" are seeded through a temporary patch that is not in this PR: a signed-looking license issued 63 days ago (so it resolves to not checked), a failed check, and a forced storage full status with sync on. Before is
origin/mainat ef25ea7 with the same patch.iOS 26 (iPhone 17 Pro simulator; the real views in a window)
icloud.slashexclamationmark.icloud, as on the Macicloud.slashxmark.icloud, as on the Mac