Skip to content

Commit 0f9794c

Browse files
committed
Bump to version v1.0.10 (matrix-rust-sdk/main 3f272a7)
1 parent 4f46a00 commit 0f9794c

File tree

2 files changed

+91
-30
lines changed

2 files changed

+91
-30
lines changed

Package.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// swift-tools-version:5.9
22
// The swift-tools-version declares the minimum version of Swift required to build this package.
33
import PackageDescription
4-
let checksum = "ef93018ec17875b287e2efbe71de16ac09b27264479afbb9b24ea88ea17c2a58"
5-
let version = "v1.0.9"
4+
let checksum = "dfc3acd0d39e724c4c1c3f9fe9af4007b7cccf0fd9d6b727f032b5d7bf664197"
5+
let version = "v1.0.10"
66
let url = "https://github.com/element-hq/matrix-rust-components-swift/releases/download/\(version)/MatrixSDKFFI.xcframework.zip"
77
let package = Package(
88
name: "MatrixRustSDK",

Sources/MatrixRustSDK/matrix_sdk_ffi.swift

Lines changed: 89 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -766,12 +766,41 @@ open class AuthenticationService:
766766
}
767767
/**
768768
* Creates a new service to authenticate a user with.
769+
*
770+
* # Arguments
771+
*
772+
* * `session_path` - A path to the directory where the session data will
773+
* be stored. A new directory **must** be given for each subsequent
774+
* session as the database isn't designed to be shared.
775+
*
776+
* * `passphrase` - An optional passphrase to use to encrypt the session
777+
* data.
778+
*
779+
* * `user_agent` - An optional user agent to use when making requests.
780+
*
781+
* * `additional_root_certificates` - Additional root certificates to trust
782+
* when making requests when built with rustls.
783+
*
784+
* * `proxy` - An optional HTTP(S) proxy URL to use when making requests.
785+
*
786+
* * `oidc_configuration` - Configuration data about the app to use during
787+
* OIDC authentication. This is required if OIDC authentication is to be
788+
* used.
789+
*
790+
* * `custom_sliding_sync_proxy` - An optional sliding sync proxy URL that
791+
* will override the proxy discovered from the homeserver's well-known.
792+
*
793+
* * `session_delegate` - A delegate that will handle token refresh etc.
794+
* when the cross-process lock is configured.
795+
*
796+
* * `cross_process_refresh_lock_id` - A process ID to use for
797+
* cross-process token refresh locks.
769798
*/
770-
public convenience init(basePath: String, passphrase: String?, userAgent: String?, additionalRootCertificates: [Data], proxy: String?, oidcConfiguration: OidcConfiguration?, customSlidingSyncProxy: String?, sessionDelegate: ClientSessionDelegate?, crossProcessRefreshLockId: String?) {
799+
public convenience init(sessionPath: String, passphrase: String?, userAgent: String?, additionalRootCertificates: [Data], proxy: String?, oidcConfiguration: OidcConfiguration?, customSlidingSyncProxy: String?, sessionDelegate: ClientSessionDelegate?, crossProcessRefreshLockId: String?) {
771800
let pointer =
772801
try! rustCall() {
773802
uniffi_matrix_sdk_ffi_fn_constructor_authenticationservice_new(
774-
FfiConverterString.lower(basePath),
803+
FfiConverterString.lower(sessionPath),
775804
FfiConverterOptionString.lower(passphrase),
776805
FfiConverterOptionString.lower(userAgent),
777806
FfiConverterSequenceData.lower(additionalRootCertificates),
@@ -1957,8 +1986,6 @@ public protocol ClientBuilderProtocol : AnyObject {
19571986
*/
19581987
func backupDownloadStrategy(backupDownloadStrategy: BackupDownloadStrategy) -> ClientBuilder
19591988

1960-
func basePath(path: String) -> ClientBuilder
1961-
19621989
func build() async throws -> Client
19631990

19641991
/**
@@ -1995,6 +2022,15 @@ public protocol ClientBuilderProtocol : AnyObject {
19952022

19962023
func serverVersions(versions: [String]) -> ClientBuilder
19972024

2025+
/**
2026+
* Sets the path that the client will use to store its data once logged in.
2027+
* This path **must** be unique per session as the data stores aren't
2028+
* capable of handling multiple users.
2029+
*
2030+
* Leaving this unset tells the client to use an in-memory data store.
2031+
*/
2032+
func sessionPath(path: String) -> ClientBuilder
2033+
19982034
func setSessionDelegate(sessionDelegate: ClientSessionDelegate) -> ClientBuilder
19992035

20002036
func slidingSyncProxy(slidingSyncProxy: String?) -> ClientBuilder
@@ -2094,14 +2130,6 @@ open func backupDownloadStrategy(backupDownloadStrategy: BackupDownloadStrategy)
20942130
})
20952131
}
20962132

2097-
open func basePath(path: String) -> ClientBuilder {
2098-
return try! FfiConverterTypeClientBuilder.lift(try! rustCall() {
2099-
uniffi_matrix_sdk_ffi_fn_method_clientbuilder_base_path(self.uniffiClonePointer(),
2100-
FfiConverterString.lower(path),$0
2101-
)
2102-
})
2103-
}
2104-
21052133
open func build()async throws -> Client {
21062134
return
21072135
try await uniffiRustCallAsync(
@@ -2219,6 +2247,21 @@ open func serverVersions(versions: [String]) -> ClientBuilder {
22192247
FfiConverterSequenceString.lower(versions),$0
22202248
)
22212249
})
2250+
}
2251+
2252+
/**
2253+
* Sets the path that the client will use to store its data once logged in.
2254+
* This path **must** be unique per session as the data stores aren't
2255+
* capable of handling multiple users.
2256+
*
2257+
* Leaving this unset tells the client to use an in-memory data store.
2258+
*/
2259+
open func sessionPath(path: String) -> ClientBuilder {
2260+
return try! FfiConverterTypeClientBuilder.lift(try! rustCall() {
2261+
uniffi_matrix_sdk_ffi_fn_method_clientbuilder_session_path(self.uniffiClonePointer(),
2262+
FfiConverterString.lower(path),$0
2263+
)
2264+
})
22222265
}
22232266

22242267
open func setSessionDelegate(sessionDelegate: ClientSessionDelegate) -> ClientBuilder {
@@ -11202,6 +11245,12 @@ public struct OidcConfiguration {
1120211245
* dynamic client registration.
1120311246
*/
1120411247
public var staticRegistrations: [String: String]
11248+
/**
11249+
* A file path where any dynamic registrations should be stored.
11250+
*
11251+
* Suggested value: `{base_path}/oidc/registrations.json`
11252+
*/
11253+
public var dynamicRegistrationsFile: String
1120511254

1120611255
// Default memberwise initializers are never public by default, so we
1120711256
// declare one manually.
@@ -11231,7 +11280,12 @@ public struct OidcConfiguration {
1123111280
/**
1123211281
* Pre-configured registrations for use with issuers that don't support
1123311282
* dynamic client registration.
11234-
*/staticRegistrations: [String: String]) {
11283+
*/staticRegistrations: [String: String],
11284+
/**
11285+
* A file path where any dynamic registrations should be stored.
11286+
*
11287+
* Suggested value: `{base_path}/oidc/registrations.json`
11288+
*/dynamicRegistrationsFile: String) {
1123511289
self.clientName = clientName
1123611290
self.redirectUri = redirectUri
1123711291
self.clientUri = clientUri
@@ -11240,6 +11294,7 @@ public struct OidcConfiguration {
1124011294
self.policyUri = policyUri
1124111295
self.contacts = contacts
1124211296
self.staticRegistrations = staticRegistrations
11297+
self.dynamicRegistrationsFile = dynamicRegistrationsFile
1124311298
}
1124411299
}
1124511300

@@ -11271,6 +11326,9 @@ extension OidcConfiguration: Equatable, Hashable {
1127111326
if lhs.staticRegistrations != rhs.staticRegistrations {
1127211327
return false
1127311328
}
11329+
if lhs.dynamicRegistrationsFile != rhs.dynamicRegistrationsFile {
11330+
return false
11331+
}
1127411332
return true
1127511333
}
1127611334

@@ -11283,6 +11341,7 @@ extension OidcConfiguration: Equatable, Hashable {
1128311341
hasher.combine(policyUri)
1128411342
hasher.combine(contacts)
1128511343
hasher.combine(staticRegistrations)
11344+
hasher.combine(dynamicRegistrationsFile)
1128611345
}
1128711346
}
1128811347

@@ -11298,7 +11357,8 @@ public struct FfiConverterTypeOidcConfiguration: FfiConverterRustBuffer {
1129811357
tosUri: FfiConverterOptionString.read(from: &buf),
1129911358
policyUri: FfiConverterOptionString.read(from: &buf),
1130011359
contacts: FfiConverterOptionSequenceString.read(from: &buf),
11301-
staticRegistrations: FfiConverterDictionaryStringString.read(from: &buf)
11360+
staticRegistrations: FfiConverterDictionaryStringString.read(from: &buf),
11361+
dynamicRegistrationsFile: FfiConverterString.read(from: &buf)
1130211362
)
1130311363
}
1130411364

@@ -11311,6 +11371,7 @@ public struct FfiConverterTypeOidcConfiguration: FfiConverterRustBuffer {
1131111371
FfiConverterOptionString.write(value.policyUri, into: &buf)
1131211372
FfiConverterOptionSequenceString.write(value.contacts, into: &buf)
1131311373
FfiConverterDictionaryStringString.write(value.staticRegistrations, into: &buf)
11374+
FfiConverterString.write(value.dynamicRegistrationsFile, into: &buf)
1131411375
}
1131511376
}
1131611377

@@ -14746,14 +14807,14 @@ public enum AuthenticationError {
1474614807

1474714808
case SessionMissing(message: String)
1474814809

14749-
case InvalidBasePath(message: String)
14750-
1475114810
case OidcNotSupported(message: String)
1475214811

1475314812
case OidcMetadataMissing(message: String)
1475414813

1475514814
case OidcMetadataInvalid(message: String)
1475614815

14816+
case OidcRegistrationsPathInvalid(message: String)
14817+
1475714818
case OidcCallbackUrlInvalid(message: String)
1475814819

1475914820
case OidcCancelled(message: String)
@@ -14803,19 +14864,19 @@ public struct FfiConverterTypeAuthenticationError: FfiConverterRustBuffer {
1480314864
message: try FfiConverterString.read(from: &buf)
1480414865
)
1480514866

14806-
case 8: return .InvalidBasePath(
14867+
case 8: return .OidcNotSupported(
1480714868
message: try FfiConverterString.read(from: &buf)
1480814869
)
1480914870

14810-
case 9: return .OidcNotSupported(
14871+
case 9: return .OidcMetadataMissing(
1481114872
message: try FfiConverterString.read(from: &buf)
1481214873
)
1481314874

14814-
case 10: return .OidcMetadataMissing(
14875+
case 10: return .OidcMetadataInvalid(
1481514876
message: try FfiConverterString.read(from: &buf)
1481614877
)
1481714878

14818-
case 11: return .OidcMetadataInvalid(
14879+
case 11: return .OidcRegistrationsPathInvalid(
1481914880
message: try FfiConverterString.read(from: &buf)
1482014881
)
1482114882

@@ -14860,13 +14921,13 @@ public struct FfiConverterTypeAuthenticationError: FfiConverterRustBuffer {
1486014921
writeInt(&buf, Int32(6))
1486114922
case .SessionMissing(_ /* message is ignored*/):
1486214923
writeInt(&buf, Int32(7))
14863-
case .InvalidBasePath(_ /* message is ignored*/):
14864-
writeInt(&buf, Int32(8))
1486514924
case .OidcNotSupported(_ /* message is ignored*/):
14866-
writeInt(&buf, Int32(9))
14925+
writeInt(&buf, Int32(8))
1486714926
case .OidcMetadataMissing(_ /* message is ignored*/):
14868-
writeInt(&buf, Int32(10))
14927+
writeInt(&buf, Int32(9))
1486914928
case .OidcMetadataInvalid(_ /* message is ignored*/):
14929+
writeInt(&buf, Int32(10))
14930+
case .OidcRegistrationsPathInvalid(_ /* message is ignored*/):
1487014931
writeInt(&buf, Int32(11))
1487114932
case .OidcCallbackUrlInvalid(_ /* message is ignored*/):
1487214933
writeInt(&buf, Int32(12))
@@ -25057,9 +25118,6 @@ private var initializationResult: InitializationResult {
2505725118
if (uniffi_matrix_sdk_ffi_checksum_method_clientbuilder_backup_download_strategy() != 11959) {
2505825119
return InitializationResult.apiChecksumMismatch
2505925120
}
25060-
if (uniffi_matrix_sdk_ffi_checksum_method_clientbuilder_base_path() != 5092) {
25061-
return InitializationResult.apiChecksumMismatch
25062-
}
2506325121
if (uniffi_matrix_sdk_ffi_checksum_method_clientbuilder_build() != 56018) {
2506425122
return InitializationResult.apiChecksumMismatch
2506525123
}
@@ -25093,6 +25151,9 @@ private var initializationResult: InitializationResult {
2509325151
if (uniffi_matrix_sdk_ffi_checksum_method_clientbuilder_server_versions() != 15644) {
2509425152
return InitializationResult.apiChecksumMismatch
2509525153
}
25154+
if (uniffi_matrix_sdk_ffi_checksum_method_clientbuilder_session_path() != 49266) {
25155+
return InitializationResult.apiChecksumMismatch
25156+
}
2509625157
if (uniffi_matrix_sdk_ffi_checksum_method_clientbuilder_set_session_delegate() != 8576) {
2509725158
return InitializationResult.apiChecksumMismatch
2509825159
}
@@ -25825,7 +25886,7 @@ private var initializationResult: InitializationResult {
2582525886
if (uniffi_matrix_sdk_ffi_checksum_constructor_mediasource_from_json() != 29216) {
2582625887
return InitializationResult.apiChecksumMismatch
2582725888
}
25828-
if (uniffi_matrix_sdk_ffi_checksum_constructor_authenticationservice_new() != 54979) {
25889+
if (uniffi_matrix_sdk_ffi_checksum_constructor_authenticationservice_new() != 23411) {
2582925890
return InitializationResult.apiChecksumMismatch
2583025891
}
2583125892
if (uniffi_matrix_sdk_ffi_checksum_constructor_clientbuilder_new() != 27991) {

0 commit comments

Comments
 (0)