Repository navigation
feat(account): TablePro accounts replace license keys on macOS (M16) - #4045
Merged
Merged
Conversation
… gating (M16.1-M16.4) No /v2 transport ships yet (swift-openapi-urlsession 1.4.0 is under two weeks old) and no production entitlement key is embedded, so release builds fail /v2 calls like an offline Mac.
… reaches a gate (M16.2)
…y only for its own session (M16.4)
…er sign-in errors (M16.3)
…vice limit and revoke (M16.1-M16.4)
… and Use License Key (M16.5-M16.7)
…holder in place (M16.6, M16.7)
…ever equals the old one (M16.4)
…d key unexchanged (M16.7)
…when the app becomes active (M16.7)
…lling link (M16.6)
…ls' identifiers (M16.6, M16.7)
…ay's date (M16.7)
…roblem (M16) From tablepro-cloud f80b1bad. A device_limit_reached answer reads Problem.devices, which is optional now.
…hes and a conflict sheet (M16.8) The first sync takes the /v1 cache over item by item. The /v1 client and its license key path are gone.
…nd a conflict on the local stack (M16.8)
…ted on the team (M16.8)
… hides the rest of the cache (M16.8)
…d offers Resolve Conflicts (M16.8)
…der leaves it theirs (M16.8)
…'s to remove (M16.8)
…n after the backoff (M16.8)
…t in the message (M16.8)
…m changes (M16.8)
…cludes team_library (M16.8)
…-* and updated_by_name (M16.1) Copied from tablepro-cloud 2be77792.
… and the conflict sheet (M16.8)
…flict and the owner's pull (M16.8)
… next pull or push (M16.8)
…ver asked for it (M16.2)
…r an opt-out (M16.9)
…re the next sync (M16.8)
…count sync at once (M16.8)
…d for writer or folder (M16.8)
…uted as SQL Server (M16.9)
… every other service (M16.9)
…services.telemetry (M16.9)
…ed; a refused cursor makes the sync pull a snapshot (M16.8) The document is copied from tablepro-cloud 97ab5728.
…0-day rule (M16.3)
# Conflicts: # apple/TablePro/AppDelegate.swift # apple/TablePro/Core/Services/Licensing/SupportLinks.swift # apple/TablePro/Resources/Localizable.xcstrings # apple/TablePro/Views/Main/Extensions/MainContentCoordinator+History.swift # apple/TableProTests/Core/Services/SupportLinksTests.swift
Brings main's 46 commits, among them the license ask (#3922), the first-query mark (#3886) and the trademark policy (#3887). - AppDelegate: the ask starts after the Team Library sync; main's periodic license validation stays out, since accounts replace it. - MainContentCoordinator+History: Telemetry.queryExecuted() stays; the heartbeat marker #3886 restored is gone with MacAnalyticsProvider. - SupportLinks: the referrer moved to Core/Services on this branch; the ask's case (app-ask) joins it there. - SupportAskCoordinator.shared reads FeatureAccess for the license. - FirstQueryAnalyticsTests checks Telemetry's first-query mark. - Localizable.xcstrings: merged key by key; no key changed on both sides.
The ask's stop rule (monetization roadmap, R1) compares purchases from it with how often it was shown, and nothing counted the second half. - support_ask_shown when the sheet opens, with no properties: the count of days used stays on the Mac, as the Licensing page says. - support_ask_answered with answer (buy, personal, not_now). - Buy also sends upgrade_clicked with app-ask, like every other upgrade link.
… out is kept aside, not deleted (M16.2)
Brings main's 43 commits, among them the Pro plan name (#3989), column masking (#3978) and the SSH host name hardening (GHSA-94m6-qx4g-cpwg). - LicenseTier, LicensePresentationTests, LicenseTierTests: stay deleted, since accounts replace license keys; the next commit renames the plan in AccountCodes instead. - ProFeature: keeps paidPlanRequirement; main changed only a comment on requiredTier, which this branch dropped. - TeamLibraryModels and its tests: stay deleted with /v1. The refused SSH host check main added to sanitized() now guards TeamLibraryChange.connection, and its test moves to TeamLibrarySyncTests. - MainEditorContentView: the Query Insights refresh main added reads FeatureAccess, not LicenseManager. - project.yml: the app links main's TableProInfluxDBCore and TableProQdrantCore; TableProAnalytics stays out. - Localizable.xcstrings: merged key by key; no key changed on both sides.
…16.6) AccountCodes names the starter code Pro, the name main gave the plan in #3989; entitlements still carry the code starter. The catalog's Pro key, which main already translates for every language, covers it, and the Starter key left with the merge.
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.
# Conflicts: # apple/TablePro/Resources/Localizable.xcstrings # apple/TablePro/Views/Main/Extensions/MainContentCoordinator+Rewind.swift # apple/project.yml
…eAccess and telemetry, as M16 has it
# Conflicts: # apple/project.yml
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.
/v2/v1heartbeat, in-app feedback and the old licensing code are removedScreenshots