Release/2.4.4

InternxtDesktop/AppDelegate.swift

@@ -296,10 +296,18 @@ class AppDelegate: NSObject, NSApplicationDelegate , PKPushRegistryDelegate {
                 guard let user = self.authManager.user else {
                     throw AuthError.noUserFound
                 }
+
                 try await domainManager.initFileProviderForUser(user:user)
-                
+
 
                 self.logger.info("Login success")
+
+                guard let workspaces = self.authManager.availableWorkspaces else {
+                    return
+                }
+               try await domainManager.initFileProviderForUserWorkspace(user: user, workspaces: workspaces)
+
+                self.logger.info("Workspaces setted correctly")
             } catch {
                 self.logger.error("Failed to start the app: \(error)" )
                 error.reportToSentry()

InternxtDesktop/Services/Auth/AuthManager.swift

@@ -21,12 +21,17 @@ class AuthManager: ObservableObject {
     let logger = Logger(subsystem: "com.internxt", category: "AuthManager")
     @Published public var isLoggedIn = false
     @Published public var user: DriveUser? = nil
+    @Published public var availableWorkspaces: [AvailableWorkspace]? = []
+    @Published public var workspaceCredentials: WorkspaceCredentialsResponse? = nil
+
     public let config = ConfigLoader()
     public let cryptoUtils = CryptoUtils()
     private let REFRESH_TOKEN_DEADLINE = 5
     init() {
         self.isLoggedIn = checkIsLoggedIn()
         self.user = config.getUser()
+        self.availableWorkspaces = config.getWorkspaces()
+        self.workspaceCredentials = config.getWorkspaceCredentials()
     }
 
     public var mnemonic: String? {
@@ -59,10 +64,20 @@ class AuthManager: ObservableObject {
             uuid: refreshUserResponse.user.uuid
         )
         try config.setUser(user: refreshUserResponse.user)
-
+        let workspaces =  try await APIFactory.DriveNew.getAvailableWorkspaces(debug: true)
+        try config.setAvailableWorkspaces(workspaces: workspaces.availableWorkspaces)
+        if !workspaces.availableWorkspaces.isEmpty{
+            let credentials = try await APIFactory.DriveNew.getCredentialsWorkspaces(workspaceId: workspaces.availableWorkspaces[0].workspaceUser.workspaceId, debug: true)
+                try config.setWorkspaceCredentials(credentials: credentials)
+            DispatchQueue.main.async{ self.workspaceCredentials = credentials}
+        }
         DispatchQueue.main.async{
             self.user = refreshUserResponse.user
+            self.availableWorkspaces = workspaces.availableWorkspaces
         }
+
+
+
     }
 
     func refreshTokens() async throws {
@@ -92,6 +107,8 @@ class AuthManager: ObservableObject {
         try config.removeAuthToken()
         try config.removeLegacyAuthToken()
         try config.removeMnemonic()
+        try config.removeWorkspaces()
+        try config.removeWorkspaceCredentials()
         user = nil
         ErrorUtils.clean()
         isLoggedIn = false

InternxtDesktop/Services/FileProviderDomainManager.swift

@@ -59,6 +59,7 @@ class FileProviderDomainManager: ObservableObject {
         }
         self.manager = nil
         self.managerDomain = nil
+        try? await NSFileProviderManager.removeAllDomains()
     }
 
 
@@ -67,4 +68,21 @@ class FileProviderDomainManager: ObservableObject {
             self.domainStatus = newStatus
         }
     }
+
+    public func initFileProviderForUserWorkspace(user: DriveUser, workspaces: [AvailableWorkspace]) async throws {
+        do {
+            if !workspaces.isEmpty{
+                let identifier = NSFileProviderDomainIdentifier(rawValue: workspaces[0].workspaceUser.workspaceId)
+                let domain = NSFileProviderDomain(identifier: identifier, displayName: "Internxt Business")
+
+                try await NSFileProviderManager.add(domain)
+
+                self.logger.info("📦 FileProvider domain workspace is ready with identifier \(identifier.rawValue)")
+            }
+
+            return
+        } catch {
+            throw error
+        }
+    }
 }

Shared/Extensions/Error.swift

@@ -7,12 +7,21 @@
 
 import Foundation
 import Sentry
+import InternxtSwiftCore
 
 extension Error {
     func reportToSentry() {
         sentryLogger.error("\(String(describing: self))")
         SentrySDK.capture(error: self)
     }
+
+    func getErrorDescription() -> String {
+         if let apiClientError = self as? APIClientError {
+             let responseBody = String(decoding: apiClientError.responseBody, as: UTF8.self)
+             return "APIClientError \(apiClientError.statusCode) - \(responseBody)"
+         }
+         return self.localizedDescription
+     }
 }
 
 extension NSAlert {

Shared/Services/ActivityManager.swift

@@ -110,11 +110,13 @@ class ActivityEntry: Object {
     @Persisted var status: ActivityEntryStatus
 
     convenience init(
+        _id: ObjectId? = nil,
         filename: String,
         kind: ActivityEntryOperationKind,
         status: ActivityEntryStatus
     ) {
         self.init()
+        self._id = _id ?? ObjectId.generate()
         self.filename = filename
         self.createdAt = Date()
         self.kind = kind

Shared/Services/ConfigLoader.swift

@@ -36,6 +36,8 @@ enum ConfigLoaderError: Error {
     case CannotRemoveUser
     case CannotSaveOnboardingIsCompleted
     case CannotHideBackupBanner
+    case CannotSaveWorkspaces
+    case CannotSaveWorkspacesCredentials
 }
 
 
@@ -121,6 +123,24 @@ public struct ConfigLoader {
         return userAndPass.data(using: .utf8)?.base64EncodedString()
     }
 
+
+    public func getNetworkAuthWorkspace() -> String? {
+
+        guard let credentials = getWorkspaceCredentials() else {
+            return nil
+        }
+        var hasher = SHA256()
+
+        hasher.update(data: credentials.credentials.networkPass.data(using: .utf8)!)
+
+        let digest = hasher.finalize()
+        var result = [UInt8]()
+        digest.withUnsafeBytes {bytes in
+            result.append(contentsOf: bytes)
+        }
+        let userAndPass = "\(credentials.credentials.networkUser):\(CryptoUtils().bytesToHexString(result))"
+        return userAndPass.data(using: .utf8)?.base64EncodedString()
+    }
     public func getUser() -> DriveUser? {
         let userStr = self.getFromUserDefaults(key: "DriveUser")
         guard let userData = userStr?.data(using: .utf8) else {
@@ -273,6 +293,77 @@ public struct ConfigLoader {
     public func getDeviceName() -> String? {
         return Host.current().localizedName
     }
+
+    public func setAvailableWorkspaces(workspaces: [AvailableWorkspace]) throws -> Void {
+        let jsonData = try JSONEncoder().encode(workspaces)
+        guard let jsonString = String(data: jsonData, encoding: .utf8) else {
+            throw ConfigLoaderError.CannotSaveWorkspaces
+        }
+
+        let saved = self.saveToUserDefaults(key: "AvailableWorkspaces", value: jsonString)
+
+        if saved == false {
+            throw ConfigLoaderError.CannotSaveWorkspaces
+        }
+    }
+
+    public func getWorkspaces() -> [AvailableWorkspace]? {
+        let workspaces = self.getFromUserDefaults(key: "AvailableWorkspaces")
+        guard let workspacesData = workspaces?.data(using: .utf8) else {
+            return nil
+        }
+        do {
+            let jsonData = try JSONDecoder().decode([AvailableWorkspace].self, from: workspacesData)
+            return jsonData
+        } catch {
+            print(error)
+            return nil
+        }
+    }
+
+    public func removeWorkspaces() throws -> Void  {
+        let removed = self.removeFromUserDefaults(key: "AvailableWorkspaces")
+
+        if removed == false {
+            throw ConfigLoaderError.CannotRemoveKey
+        }
+    }
+
+    public func setWorkspaceCredentials(credentials: WorkspaceCredentialsResponse) throws -> Void {
+        let jsonData = try JSONEncoder().encode(credentials)
+        guard let jsonString = String(data: jsonData, encoding: .utf8) else {
+            throw ConfigLoaderError.CannotSaveWorkspacesCredentials
+        }
+
+        let saved = self.saveToUserDefaults(key: "WorkspaceCredentials", value: jsonString)
+
+        if saved == false {
+            throw ConfigLoaderError.CannotSaveWorkspacesCredentials
+        }
+    }
+
+    public func getWorkspaceCredentials() -> WorkspaceCredentialsResponse? {
+        let workspaces = self.getFromUserDefaults(key: "WorkspaceCredentials")
+        guard let workspacesData = workspaces?.data(using: .utf8) else {
+            return nil
+        }
+        do {
+            let jsonData = try JSONDecoder().decode(WorkspaceCredentialsResponse.self, from: workspacesData)
+            return jsonData
+        } catch {
+            print(error)
+            return nil
+        }
+    }
+
+    public func removeWorkspaceCredentials() throws -> Void  {
+        let removed = self.removeFromUserDefaults(key: "WorkspaceCredentials")
+
+        if removed == false {
+            throw ConfigLoaderError.CannotRemoveKey
+        }
+    }
+
 }
 
 

Shared/Services/DriveFileService.swift

@@ -68,19 +68,19 @@ struct DriveFileService {
     public func renameFile(uuid: String, bucketId: String, newName: String) async throws -> DriveFile {
         let fileMeta = try await driveNewAPI.getFileMetaByUuid(uuid: uuid)
 
-        let updated = try await driveAPI.updateFile(
-            fileId: fileMeta.fileId,
+        let updated = try await driveNewAPI.updateFileNew(
+            uuid: fileMeta.uuid,
             bucketId: bucketId,
             newFilename: newName,
-            debug: false
+            debug: true
         )
 
         let createdAt = Time.dateFromISOString(fileMeta.createdAt) ?? Date()
         let updatedAt = Time.dateFromISOString(fileMeta.updatedAt) ?? Date()
 
         return DriveFile(
             uuid: fileMeta.uuid,
-            plainName: updated.plain_name,
+            plainName: updated.plainName,
             name: fileMeta.name,
             type: fileMeta.type,
             size: Int(fileMeta.size) ?? 0,

Shared/Services/LogService.swift

@@ -14,6 +14,7 @@ enum LogSubSystem: String {
     case InternxtDesktop = "com.internxt.InternxtDesktop"
     case XPCBackups = "com.internxt.XPCBackups"
     case Errors = "com.internxt.errors"
+    case SyncExtensionWorkspace = "com.internxt.SyncExtension.Workspace"
 }
 
 struct LogService {
@@ -95,3 +96,4 @@ struct LogService {
 
 let syncExtensionLogger = LogService.shared.createLogger(subsystem: .SyncExtension, category: "SyncExtension")
 let appLogger = LogService.shared.createLogger(subsystem: .InternxtDesktop, category: "InternxtDesktopUIApp")
+let syncExtensionWorkspaceLogger = LogService.shared.createLogger(subsystem: .SyncExtensionWorkspace, category: "SyncExtensionWorkspace")

Shared/Utils/APIFactory.swift

@@ -37,6 +37,14 @@ struct APIFactory {
         return NetworkAPI(baseUrl: config.NETWORK_API_URL, basicAuthToken: networkAuth!, clientName: CLIENT_NAME, clientVersion: getVersion())
     }
 
+    static var NetworkWorkspace: NetworkAPI {
+        let configLoader = ConfigLoader()
+
+        let config = configLoader.get()
+        let networkAuth = configLoader.getNetworkAuthWorkspace()
+        return NetworkAPI(baseUrl: config.NETWORK_API_URL, basicAuthToken: networkAuth!, clientName: CLIENT_NAME, clientVersion: getVersion())
+    }
+
     static var DriveNew: DriveAPI {
         let configLoader = ConfigLoader()
 
@@ -46,6 +54,15 @@ struct APIFactory {
         return DriveAPI(baseUrl: config.DRIVE_NEW_API_URL, authToken: token, clientName: CLIENT_NAME, clientVersion: getVersion())
     }
 
+    static var DriveWorkspace: DriveAPI {
+        let configLoader = ConfigLoader()
+
+        let config = configLoader.get()
+        let token = configLoader.getAuthToken() ?? "MISSING_TOKEN"
+        let workspaceHeader = configLoader.getWorkspaceCredentials()?.tokenHeader
+        return DriveAPI(baseUrl: config.DRIVE_NEW_API_URL, authToken: token, clientName: CLIENT_NAME, clientVersion: getVersion(),workspaceHeader: workspaceHeader)
+    }
+
     static var Drive: DriveAPI {
         let configLoader = ConfigLoader()
 
@@ -72,6 +89,16 @@ struct APIFactory {
 
         return TrashAPI(baseUrl: config.DRIVE_NEW_API_URL, authToken: token, clientName: CLIENT_NAME, clientVersion: getVersion())
     }
+
+    static var TrashWorkspace: TrashAPI {
+        let configLoader = ConfigLoader()
+
+        let config = configLoader.get()
+        let token = configLoader.getAuthToken() ?? "MISSING_TOKEN"
+        let workspaceHeader = configLoader.getWorkspaceCredentials()?.tokenHeader
+
+        return TrashAPI(baseUrl: config.DRIVE_NEW_API_URL, authToken: token, clientName: CLIENT_NAME, clientVersion: getVersion(),workspaceHeader: workspaceHeader)
+    }
 
     static var Backup: BackupAPI {
         let configLoader = ConfigLoader()

SyncExtension/FileProviderEnumerator.swift

@@ -18,9 +18,13 @@ class FileProviderEnumerator: NSObject, NSFileProviderEnumerator {
     private let anchor = NSFileProviderSyncAnchor(initialAnchor.data(using: .utf8)!)
     private let driveAPI =  APIFactory.Drive
     private let user: DriveUser
-    init(user: DriveUser, enumeratedItemIdentifier: NSFileProviderItemIdentifier) {
+    private let domain: NSFileProviderDomain
+    private let workspace: [AvailableWorkspace]
+    init(user: DriveUser, enumeratedItemIdentifier: NSFileProviderItemIdentifier , domain: NSFileProviderDomain, workspace: [AvailableWorkspace]) {
         self.enumeratedItemIdentifier = enumeratedItemIdentifier
         self.user = user
+        self.domain = domain
+        self.workspace = workspace
         super.init()
     }
 
@@ -51,14 +55,20 @@ class FileProviderEnumerator: NSObject, NSFileProviderEnumerator {
 
 
         let suggestedPageSize: Int = observer.suggestedPageSize ?? 50
+        let isPersonalDrive = domain.identifier.rawValue ==  user.uuid
+
+        return isPersonalDrive ? EnumerateFolderItemsUseCase(user:self.user,enumeratedItemIdentifier: self.enumeratedItemIdentifier, for: observer, from: page).run(limit: suggestedPageSize > 50 ? 50 :suggestedPageSize) :
+        EnumerateFolderItemsWorkspaceUseCase(user:self.user,enumeratedItemIdentifier: self.enumeratedItemIdentifier, for: observer, from: page, workspace: workspace).run(limit: suggestedPageSize > 50 ? 50 :suggestedPageSize)
 
-        return EnumerateFolderItemsUseCase(user:self.user,enumeratedItemIdentifier: self.enumeratedItemIdentifier, for: observer, from: page).run(limit: suggestedPageSize > 50 ? 50 :suggestedPageSize)
     }
 
 
     func enumerateChanges(for observer: NSFileProviderChangeObserver, from anchor: NSFileProviderSyncAnchor) {
+        let isPersonalDrive = domain.identifier.rawValue ==  user.uuid
 
-        return GetRemoteChangesUseCase(observer: observer, anchor: anchor,user: user).run()
+        return isPersonalDrive ? GetRemoteChangesUseCase(observer: observer, anchor: anchor,user: user).run() :
+        GetRemoteChangesUseCaseWorkspace(observer: observer, anchor: anchor,workspace: workspace).run()
+
     }
 
     func currentSyncAnchor(completionHandler: @escaping (NSFileProviderSyncAnchor?) -> Void) {