Skip to content

feat: sync Nextcloud capabilities: public link expire_date default_days #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
claucambra merged 1 commit into from
Sep 15, 2026
Merged

feat: sync Nextcloud capabilities: public link expire_date default_days #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Automation/capability-sync-state.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"schemaVersion": 1,
"upstreams": {
"nextcloud/server": {
"revision": "e99db582af5fa540e09947512fc75eaed811745a"
"revision": "fd847a4894db652a15b3312701aca3bcc8f453e7"
}
}
}
4 changes: 4 additions & 0 deletions Sources/NextcloudCapabilitiesKit/Shares/Share Type/PublicLink.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ public struct PublicLink: Equatable, Sendable {
public let expireDateEnabled: Bool
public let expireDateEnforced: Bool
public let expireDateDays: Int
public let expireDateDefaultDays: Int
public let internalExpireDateEnabled: Bool
public let internalExpireDateEnforced: Bool
public let internalExpireDateDays: Int
Expand Down Expand Up @@ -50,10 +51,13 @@ public struct PublicLink: Equatable, Sendable {
if let expireDateCapabilities = publicLinkCaps["expire_date"] as? [String: Any] {
expireDateEnabled = expireDateCapabilities["enabled"] as? Bool ?? false
expireDateDays = expireDateCapabilities["days"] as? Int ?? 1
// Servers without this field default the suggested expiry to the max allowed days.
expireDateDefaultDays = expireDateCapabilities["default_days"] as? Int ?? expireDateDays
expireDateEnforced = expireDateCapabilities["enforced"] as? Bool ?? false
} else {
expireDateEnabled = false
expireDateDays = 1
expireDateDefaultDays = 1
expireDateEnforced = false
}

Expand Down
27 changes: 27 additions & 0 deletions Tests/NextcloudCapabilitiesKitTests/Shares/Share Type/PublicLinkTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ final class PublicLinkTests: XCTestCase {
"expire_date": [
"enabled": true,
"days": 10,
"default_days": 7,
"enforced": true
],
"expire_date_internal": [
Expand Down Expand Up @@ -49,6 +50,7 @@ final class PublicLinkTests: XCTestCase {
XCTAssertEqual(publicLink?.expireDateEnforced, true, "ExpireDateEnforced should be true")
XCTAssertEqual(publicLink?.expireDateEnabled, true, "ExpireDateEnabled should be true")
XCTAssertEqual(publicLink?.expireDateDays, 10, "ExpireDateDays should be 10")
XCTAssertEqual(publicLink?.expireDateDefaultDays, 7, "ExpireDateDefaultDays should be 7")
XCTAssertEqual(publicLink?.internalExpireDateEnforced, true, "InternalExpireDateEnforced should be true")
XCTAssertEqual(publicLink?.internalExpireDateEnabled, true, "InternalExpireDateEnabled should be true")
XCTAssertEqual(publicLink?.internalExpireDateDays, 5, "InternalExpireDateDays should be 5")
Expand All @@ -58,6 +60,30 @@ final class PublicLinkTests: XCTestCase {
XCTAssertEqual(publicLink?.multipleAllowed, false, "MultipleAllowed should be false")
}

func testPublicLinkInitializationWithoutDefaultDays() {
// Older servers do not send `default_days`; it should fall back to `days`.
let filesSharingCapabilities: [String: Any] = [
"public": [
"enabled": true,
"expire_date": [
"enabled": true,
"days": 10,
"enforced": true
]
]
]

let publicLink = PublicLink(filesSharingCapabilities: filesSharingCapabilities)

XCTAssertNotNil(publicLink, "PublicLink instance should not be nil")
XCTAssertEqual(publicLink?.expireDateDays, 10, "ExpireDateDays should be 10")
XCTAssertEqual(
publicLink?.expireDateDefaultDays,
10,
"ExpireDateDefaultDays should default to ExpireDateDays when absent"
)
}

func testInvalidPublicLinkInitialization() {
let invalidFilesSharingCapabilities: [String: Any] = [
"invalid_key": [
Expand Down Expand Up @@ -87,6 +113,7 @@ final class PublicLinkTests: XCTestCase {
XCTAssertEqual(publicLink?.passwordEnforced, false, "PasswordEnforced should default to false")
XCTAssertEqual(publicLink?.expireDateEnforced, false, "ExpireDateEnforced should default to false")
XCTAssertEqual(publicLink?.expireDateDays, 1, "ExpireDateDays should default to 1")
XCTAssertEqual(publicLink?.expireDateDefaultDays, 1, "ExpireDateDefaultDays should default to expireDateDays (1)")
XCTAssertEqual(publicLink?.internalExpireDateEnforced, false, "InternalExpireDateEnforced should default to false")
XCTAssertEqual(publicLink?.internalExpireDateDays, 1, "InternalExpireDateDays should default to 1")
XCTAssertEqual(publicLink?.remoteExpireDateEnforced, false, "RemoteExpireDateEnforced should default to false")
Expand Down
Loading