Merge branch 'release/1.9.0'

cryptomator · Dec 31, 2023 · 63fd1cf · 63fd1cf
2 parents 1fe06a8 + a211588
commit 63fd1cf
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 18 deletions.
diff --git a/CryptomatorCloudAccess.xcodeproj/project.pbxproj b/CryptomatorCloudAccess.xcodeproj/project.pbxproj
@@ -1760,7 +1760,7 @@
 			repositoryURL = "https://github.com/tobihagemann/JOSESwift.git";
 			requirement = {
 				kind = exactVersion;
-				version = "2.4.0-cryptomator";
+				version = "2.4.1-cryptomator";
 			};
 		};
 		746BE0A926579D4A00FB674E /* XCRemoteSwiftPackageReference "microsoft-authentication-library-for-objc" */ = {

diff --git a/CryptomatorCloudAccess.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/CryptomatorCloudAccess.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -95,8 +95,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/tobihagemann/JOSESwift.git",
       "state" : {
-        "revision" : "11442e7f1f803ef42281909c68f386b38afc5096",
-        "version" : "2.4.0-cryptomator"
+        "revision" : "3544f8117908ef12ea13b1c0927e0e3c0d30ee01",
+        "version" : "2.4.1-cryptomator"
       }
     },
     {

diff --git a/Package.resolved b/Package.resolved
@@ -95,8 +95,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/tobihagemann/JOSESwift.git",
       "state" : {
-        "revision" : "11442e7f1f803ef42281909c68f386b38afc5096",
-        "version" : "2.4.0-cryptomator"
+        "revision" : "3544f8117908ef12ea13b1c0927e0e3c0d30ee01",
+        "version" : "2.4.1-cryptomator"
       }
     },
     {

diff --git a/Package.swift b/Package.swift
@@ -27,7 +27,7 @@ let package = Package(
 		.library(name: "CryptomatorCloudAccessCore", targets: ["CryptomatorCloudAccessCore"])
 	],
 	dependencies: [
-		.package(url: "https://github.com/tobihagemann/JOSESwift.git", exact: "2.4.0-cryptomator"),
+		.package(url: "https://github.com/tobihagemann/JOSESwift.git", exact: "2.4.1-cryptomator"),
 		.package(url: "https://github.com/AzureAD/microsoft-authentication-library-for-objc.git", .upToNextMinor(from: "1.2.0")),
 		.package(url: "https://github.com/aws-amplify/aws-sdk-ios-spm.git", .upToNextMinor(from: "2.33.0")),
 		.package(url: "https://github.com/cryptomator/cryptolib-swift.git", .upToNextMinor(from: "1.1.0")),

diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ The API is implemented once for each cloud. It also forms the foundation for dec
 You can use [Swift Package Manager](https://swift.org/package-manager/ "Swift Package Manager").
 
 ```swift
-.package(url: "https://github.com/cryptomator/cloud-access-swift.git", .upToNextMinor(from: "1.8.0"))
+.package(url: "https://github.com/cryptomator/cloud-access-swift.git", .upToNextMinor(from: "1.9.0"))
 ```
 
 ## Usage

diff --git a/Sources/CryptomatorCloudAccess/Crypto/VaultConfig.swift b/Sources/CryptomatorCloudAccess/Crypto/VaultConfig.swift
@@ -34,21 +34,23 @@ struct VaultConfigPayload: Equatable, Codable {
 }
 
 public struct HubConfig: Equatable, Codable {
-	public init(clientId: String, authEndpoint: String, tokenEndpoint: String, devicesResourceUrl: String, authSuccessUrl: String, authErrorUrl: String) {
+	public let clientId: String
+	public let authEndpoint: String
+	public let tokenEndpoint: String
+	public let authSuccessUrl: String
+	public let authErrorUrl: String
+	public let apiBaseUrl: String?
+	public let devicesResourceUrl: String
+
+	public init(clientId: String, authEndpoint: String, tokenEndpoint: String, authSuccessUrl: String, authErrorUrl: String, apiBaseUrl: String?, devicesResourceUrl: String) {
 		self.clientId = clientId
 		self.authEndpoint = authEndpoint
 		self.tokenEndpoint = tokenEndpoint
-		self.devicesResourceUrl = devicesResourceUrl
 		self.authSuccessUrl = authSuccessUrl
 		self.authErrorUrl = authErrorUrl
+		self.apiBaseUrl = apiBaseUrl
+		self.devicesResourceUrl = devicesResourceUrl
 	}
-
-	public let clientId: String
-	public let authEndpoint: String
-	public let tokenEndpoint: String
-	public let devicesResourceUrl: String
-	public let authSuccessUrl: String
-	public let authErrorUrl: String
 }
 
 public class UnverifiedVaultConfig {

diff --git a/Tests/CryptomatorCloudAccessIntegrationTests/CryptoDecorator/DecoratorFactory.swift b/Tests/CryptomatorCloudAccessIntegrationTests/CryptoDecorator/DecoratorFactory.swift
@@ -15,7 +15,7 @@ import Promises
 #endif
 @testable import CryptomatorCryptoLib
 
-class DecoratorFactory {
+enum DecoratorFactory {
 	// MARK: - Vault Format 7
 
 	static func createNewVaultFormat7(delegate: CloudProvider, vaultPath: CloudPath, password: String) -> Promise<VaultFormat7ProviderDecorator> {

diff --git a/Tests/CryptomatorCloudAccessIntegrationTests/Google Drive/GoogleDriveAuthenticatorMock.swift b/Tests/CryptomatorCloudAccessIntegrationTests/Google Drive/GoogleDriveAuthenticatorMock.swift
@@ -16,7 +16,7 @@ import CryptomatorCloudAccessCore
 import CryptomatorCloudAccess
 #endif
 
-class GoogleDriveAuthenticatorMock {
+enum GoogleDriveAuthenticatorMock {
 	static func generateAuthorizedCredential(withRefreshToken refreshToken: String, tokenUID: String) -> GoogleDriveCredential {
 		let authorizationEndpoint = URL(string: "https://accounts.google.com/o/oauth2/v2/auth")!
 		let tokenEndPoint = URL(string: "https://oauth2.googleapis.com/token")!