Fix external access setting persistence #1730
+163
−0
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| // | ||
| // ConnectionStorageExternalAccessTests.swift | ||
| // TableProTests | ||
| // | ||
|
|
||
| import Foundation | ||
| import TableProPluginKit | ||
| @testable import TablePro | ||
| import Testing | ||
|
|
||
| @Suite("ConnectionStorage External Access") | ||
| @MainActor | ||
| struct ConnectionStorageExternalAccessTests { | ||
| private let storage: ConnectionStorage | ||
|
|
||
| init() { | ||
| let unique = UUID().uuidString | ||
| let fileURL = FileManager.default.temporaryDirectory | ||
| .appendingPathComponent("tablepro-tests") | ||
| .appendingPathComponent("connections_\(unique).json") | ||
| try? FileManager.default.createDirectory( | ||
| at: fileURL.deletingLastPathComponent(), | ||
| withIntermediateDirectories: true | ||
| ) | ||
| let defaultsName = "com.TablePro.tests.ConnectionStorage.ExternalAccess.\(unique)" | ||
| let syncName = "com.TablePro.tests.Sync.ExternalAccess.\(unique)" | ||
| guard let defaults = UserDefaults(suiteName: defaultsName), | ||
| let syncDefaults = UserDefaults(suiteName: syncName) else { | ||
| fatalError("UserDefaults suite creation failed in test setup") | ||
| } | ||
| let metadata = SyncMetadataStorage(userDefaults: syncDefaults) | ||
| let tracker = SyncChangeTracker(metadataStorage: metadata) | ||
| self.storage = ConnectionStorage( | ||
| fileURL: fileURL, | ||
| userDefaults: defaults, | ||
| syncTracker: tracker | ||
| ) | ||
| } | ||
|
|
||
| @Test("round-trip preserves external access", arguments: ExternalAccessLevel.allCases) | ||
| func roundTripExternalAccess(_ level: ExternalAccessLevel) { | ||
| let id = UUID() | ||
| let connection = DatabaseConnection( | ||
| id: id, | ||
| name: "Test", | ||
| type: .postgresql, | ||
| externalAccess: level | ||
| ) | ||
|
|
||
| storage.addConnection(connection) | ||
| defer { storage.deleteConnection(connection) } | ||
|
|
||
| let loaded = storage.loadConnections().first { $0.id == id } | ||
| #expect(loaded?.externalAccess == level) | ||
| } | ||
|
|
||
| @Test("external access survives mutate-and-update cycle") | ||
| func updateExternalAccess() { | ||
| let id = UUID() | ||
| let connection = DatabaseConnection( | ||
| id: id, | ||
| name: "Test", | ||
| type: .mysql, | ||
| externalAccess: .readOnly | ||
| ) | ||
|
|
||
| storage.addConnection(connection) | ||
| defer { storage.deleteConnection(connection) } | ||
|
|
||
| var updated = connection | ||
| updated.externalAccess = .readWrite | ||
| storage.updateConnection(updated) | ||
|
|
||
| let loaded = storage.loadConnections().first { $0.id == id } | ||
| #expect(loaded?.externalAccess == .readWrite) | ||
| } | ||
|
|
||
| @Test("legacy records without externalAccess default to readOnly") | ||
| func legacyDecodeDefaultsToReadOnly() throws { | ||
| let stored = try JSONDecoder().decode( | ||
| StoredConnection.self, | ||
| from: Data(Self.legacyJSONWithoutExternalAccess.utf8) | ||
| ) | ||
| #expect(stored.toConnection().externalAccess == .readOnly) | ||
| } | ||
|
|
||
| private static let legacyJSONWithoutExternalAccess = """ | ||
| { | ||
| "id": "11111111-2222-3333-4444-555555555555", | ||
| "name": "Legacy", | ||
| "host": "localhost", | ||
| "port": 3306, | ||
| "database": "test", | ||
| "username": "root", | ||
| "type": "MySQL", | ||
| "sshEnabled": false, | ||
| "sshHost": "", | ||
| "sshUsername": "", | ||
| "sshAuthMethod": "password", | ||
| "sshPrivateKeyPath": "", | ||
| "sshAgentSocketPath": "", | ||
| "sslMode": "disabled", | ||
| "sslCaCertificatePath": "", | ||
| "sslClientCertificatePath": "", | ||
| "sslClientKeyPath": "", | ||
| "color": "None", | ||
| "safeModeLevel": "silent", | ||
| "sortOrder": 0, | ||
| "localOnly": false, | ||
| "isSample": false, | ||
| "isFavorite": false, | ||
| "totpMode": "none", | ||
| "totpAlgorithm": "sha1", | ||
| "totpDigits": 6, | ||
| "totpPeriod": 30 | ||
| } | ||
| """ | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| // | ||
| // AdvancedPaneViewModelTests.swift | ||
| // TableProTests | ||
| // | ||
|
|
||
| import Foundation | ||
| import TableProPluginKit | ||
| @testable import TablePro | ||
| import Testing | ||
|
|
||
| @Suite("Advanced pane external access") | ||
| @MainActor | ||
| struct AdvancedPaneViewModelTests { | ||
| @Test("Loads external access from the connection") | ||
| func loadsExternalAccessFromConnection() { | ||
| let connection = DatabaseConnection(name: "Test", externalAccess: .readWrite) | ||
| let viewModel = AdvancedPaneViewModel() | ||
|
|
||
| viewModel.load(from: connection) | ||
|
|
||
| #expect(viewModel.externalAccess == .readWrite) | ||
| } | ||
|
|
||
| @Test("Does not leak external access into plugin additional fields") | ||
| func doesNotWriteExternalAccessIntoAdditionalFields() { | ||
| let viewModel = AdvancedPaneViewModel() | ||
| viewModel.externalAccess = .readWrite | ||
|
|
||
| var fields: [String: String] = [:] | ||
| viewModel.write(into: &fields) | ||
|
|
||
| #expect(fields["externalAccess"] == nil) | ||
| } | ||
| } |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
With iCloud sync enabled, this only writes the new setting to the local
StoredConnectionJSON.ConnectionStorage.add/updatemarks dirty connections andSyncCoordinator.uploadPendingChangesserializes them throughSyncRecordMapper.toCKRecord, but that mapper still writes fields likesafeModeLeveland never writes or readsexternalAccess, so a connection set to Blocked or Read & Write on one Mac arrives on another as the default Read Only. Please add the field to the CloudKit record mapping alongside this local persistence.Useful? React with 👍 / 👎.