mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-24 14:05:58 +03:00
Code Issues Projects Releases Packages Wiki Activity

Handle userId correctly in File Provider Extension client interface

Browse source 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
This commit is contained in:
Claudio Cambra 2024-09-30 16:05:30 +08:00
parent 6f1322fe47
commit 4d7b3eeacb
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension+ClientInterface.swift
View file

@ -104,12 +104,14 @@ extension FileProviderExtension: NSFileProviderServicing, ChangeNotificationInte
} }
} }
@objc func setupDomainAccount(user: String, serverUrl: String, password: String) { @objc func setupDomainAccount(
user: String, userId: String, serverUrl: String, password: String
) {
let semaphore = DispatchSemaphore(value: 0) let semaphore = DispatchSemaphore(value: 0)
var authAttemptState = AuthenticationAttemptResultState.connectionError // default var authAttemptState = AuthenticationAttemptResultState.connectionError // default
Task { Task {
let authTestNcKit = NextcloudKit() let authTestNcKit = NextcloudKit()
authTestNcKit.setup(user: user, userId: user, password: password, urlBase: serverUrl) authTestNcKit.setup(user: user, userId: userId, password: password, urlBase: serverUrl)
// Retry a few times if we have a connection issue // Retry a few times if we have a connection issue
for authTimeout in AuthenticationTimeouts { for authTimeout in AuthenticationTimeouts {
@ -146,13 +148,13 @@ extension FileProviderExtension: NSFileProviderServicing, ChangeNotificationInte
) )
} }
let newNcAccount = Account(user: user, serverUrl: serverUrl, password: password) let newNcAccount = Account(user: user, id: userId, serverUrl: serverUrl, password: password)
guard newNcAccount != ncAccount else { return } guard newNcAccount != ncAccount else { return }
ncAccount = newNcAccount ncAccount = newNcAccount
ncKit.setup( ncKit.setup(
account: newNcAccount.ncKitAccount, account: newNcAccount.ncKitAccount,
user: newNcAccount.username, user: newNcAccount.username,
userId: newNcAccount.username, userId: newNcAccount.id,
password: newNcAccount.password, password: newNcAccount.password,
urlBase: newNcAccount.serverUrl, urlBase: newNcAccount.serverUrl,
userAgent: "Nextcloud-macOS/FileProviderExt", userAgent: "Nextcloud-macOS/FileProviderExt",

2
shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderSocketLineProcessor.swift
View file

@ -53,7 +53,7 @@ class FileProviderSocketLineProcessor: NSObject, LineProcessor {
let serverUrl = String(splitAccountDetails[2]) let serverUrl = String(splitAccountDetails[2])
let password = String(splitAccountDetails[3]) let password = String(splitAccountDetails[3])
delegate.setupDomainAccount(user: user, serverUrl: serverUrl, password: password) delegate.setupDomainAccount(user: user, userId: userId, serverUrl: serverUrl, password: password)
} }
} }
} }