fix deeplink auth cookies, tab selection, old deeplinks

Author: raluaces

Django Files/API/DFAPI.swift

@@ -223,6 +223,22 @@ struct DFAPI {
         selectedServer.token = token
     }
 
+    @MainActor
+    private func handleAuthResponse(response: HTTPURLResponse, url: URL, selectedServer: DjangoFilesSession, token: String) {
+        // Extract cookies from response
+        if let headerFields = response.allHeaderFields as? [String: String] {
+            let cookies = HTTPCookie.cookies(withResponseHeaderFields: headerFields, for: url)
+            // Store cookies in the shared cookie storage
+            cookies.forEach { cookie in
+                HTTPCookieStorage.shared.setCookie(cookie)
+            }
+            selectedServer.cookies = cookies
+        }
+        
+        // Update the token in the server object
+        selectedServer.token = token
+    }
+
     public func localLogin(username: String, password: String, selectedServer: DjangoFilesSession) async -> Bool {
         let request = DFLocalLoginRequest(username: username, password: password)
         do {
@@ -244,20 +260,11 @@ struct DFAPI {
                 throw URLError(.badServerResponse)
             }
 
-            // Extract cookies from response
-            if let headerFields = httpResponse.allHeaderFields as? [String: String] {
-                let cookies = HTTPCookie.cookies(withResponseHeaderFields: headerFields, for: urlRequest.url!)
-                // Store cookies in the shared cookie storage
-                cookies.forEach { cookie in
-                    HTTPCookieStorage.shared.setCookie(cookie)
-                }
-                await updateSessionCookies(selectedServer, cookies)
-            }
+            let userToken = try decoder.decode(UserToken.self, from: data)
 
-            let userToken = try JSONDecoder().decode(UserToken.self, from: data)
+            // Use shared function to handle cookies and token
+            await handleAuthResponse(response: httpResponse, url: urlRequest.url!, selectedServer: selectedServer, token: userToken.token)
 
-            // Update the token in the server object
-            await updateSessionToken(selectedServer, userToken.token)
             return true
         } catch {
             print("Local login request failed \(error)")
@@ -284,7 +291,6 @@ struct DFAPI {
             if let url = urlRequest.url {
                 // Set the cookie directly in the request header
                 urlRequest.setValue("sessionid=\(sessionKey)", forHTTPHeaderField: "Cookie")
-                //print("Using session key cookie: \(sessionKey) on \(url)")
 
                 // Also set it in the cookie storage
                 let cookieProperties: [HTTPCookiePropertyKey: Any] = [
@@ -298,7 +304,6 @@ struct DFAPI {
 
                 if let cookie = HTTPCookie(properties: cookieProperties) {
                     HTTPCookieStorage.shared.setCookie(cookie)
-                    // print("Set cookie: \(cookie)")
                 }
             }
 
@@ -307,48 +312,17 @@ struct DFAPI {
             configuration.httpCookieStorage = .shared
             configuration.httpCookieAcceptPolicy = .always
 
-            // Print all cookies before making the request
-            // print("Cookies before request:")
-//            HTTPCookieStorage.shared.cookies?.forEach { cookie in
-//                print(" - \(cookie.name): \(cookie.value)")
-//            }
-            
             let session = URLSession(configuration: configuration)
             let (_, response) = try await session.data(for: urlRequest)
 
-            // print("response: \(response)")
-            
             guard let httpResponse = response as? HTTPURLResponse,
                   httpResponse.statusCode == 200 else {
                 print("Request failed with status: \((response as? HTTPURLResponse)?.statusCode ?? -1)")
                 throw URLError(.badServerResponse)
             }
 
-            // Print request headers for debugging
-//            print("Request headers:")
-//            urlRequest.allHTTPHeaderFields?.forEach { key, value in
-//                print(" - \(key): \(value)")
-//            }
-            
-            // Print response headers for debugging
-//            print("Response headers:")
-//            (response as? HTTPURLResponse)?.allHeaderFields.forEach { key, value in
-//                print(" - \(key): \(value)")
-//            }
-            
-            // Extract cookies from response
-            if let headerFields = httpResponse.allHeaderFields as? [String: String] {
-                let cookies = HTTPCookie.cookies(withResponseHeaderFields: headerFields, for: urlRequest.url!)
-                // Store cookies in the shared cookie storage
-                cookies.forEach { cookie in
-                    HTTPCookieStorage.shared.setCookie(cookie)
-                    // print("Received cookie from response: \(cookie)")
-                }
-                await updateSessionCookies(selectedServer, cookies)
-            }
-            
-            // Update the token in the server object using the MainActor method
-            await updateSessionToken(selectedServer, token)
+            // Use shared function to handle cookies and token
+            await handleAuthResponse(response: httpResponse, url: urlRequest.url!, selectedServer: selectedServer, token: token)
 
             return true
         } catch {
@@ -396,21 +370,35 @@ struct DFAPI {
         let token: String
     }
 
-    public func applicationAuth(signature: String) async -> String? {
+    public func applicationAuth(signature: String, selectedServer: DjangoFilesSession? = nil) async -> String? {
         let request = DFApplicationAuthRequest(signature: signature)
         do {
             let json = try JSONEncoder().encode(request)
-            print(json)
-            print("JSON Data: \(String(data: json, encoding: .utf8) ?? "invalid json")")
-            let responseBody = try await makeAPIRequest(
-                body: json,
-                path: getAPIPath(.auth_application),
-                parameters: [:],
-                method: .post,
-                headerFields: [.contentType: "application/json"]
-            )
-            let response = try decoder.decode(DFApplicationAuthResponse.self, from: responseBody)
-            return response.token
+            
+            // Create URL request manually to access response headers
+            var urlRequest = URLRequest(url: encodeParametersIntoURL(path: getAPIPath(.auth_application), parameters: [:]))
+            urlRequest.httpMethod = "POST"
+            urlRequest.setValue("application/json", forHTTPHeaderField: "Content-Type")
+            urlRequest.httpBody = json
+            
+            // Use default session configuration which persists cookies
+            let configuration = URLSessionConfiguration.default
+            let session = URLSession(configuration: configuration)
+            let (data, response) = try await session.data(for: urlRequest)
+            
+            guard let httpResponse = response as? HTTPURLResponse,
+                  httpResponse.statusCode == 200 else {
+                throw URLError(.badServerResponse)
+            }
+            
+            let auth_response = try decoder.decode(DFApplicationAuthResponse.self, from: data)
+            
+            // Use shared function to handle cookies and token if server is provided
+            if let selectedServer = selectedServer {
+                await handleAuthResponse(response: httpResponse, url: urlRequest.url!, selectedServer: selectedServer, token: auth_response.token)
+            }
+            
+            return auth_response.token
         } catch {
             print("Application auth request failed \(error)")
             return nil

Django Files/Django_FilesApp.swift

@@ -25,6 +25,7 @@ struct Django_FilesApp: App {
     @StateObject private var sessionManager = SessionManager()
     @State private var hasExistingSessions = false
     @State private var isLoading = true
+    @State private var selectedTab: TabViewWindow.Tab = .files
 
     init() {
         // print("📱 Setting up WebSocketToastObserver")
@@ -40,7 +41,7 @@ struct Django_FilesApp: App {
                             checkForExistingSessions()
                         }
                 } else if hasExistingSessions {
-                    TabViewWindow(sessionManager: sessionManager)
+                    TabViewWindow(sessionManager: sessionManager, selectedTab: $selectedTab)
                 } else {
                     SessionEditor(onBoarding: true, session: nil, onSessionCreated: { newSession in
                         sessionManager.selectedSession = newSession
@@ -61,22 +62,56 @@ struct Django_FilesApp: App {
     }
 
     private func handleDeepLink(_ url: URL) {
-        // print("Deep link received: \(url)")
+        print("Deep link received: \(url)")
         guard url.scheme == "djangofiles" else { return }
 
         // Extract the signature from the URL parameters
         guard let components = URLComponents(url: url, resolvingAgainstBaseURL: true) else {
             print("Invalid deep link URL")
             return
         }
+        print("Deep link host: \(components.host ?? "unknown")")
         switch components.host {
         case "authorize":
             deepLinkAuth(components)
+        case "serverlist":
+            selectedTab = .serverList
+        case "filelist":
+            handleFileListDeepLink(components)
         default:
+            ToastManager.shared.showToast(message: "Unsupported deep link \(url)")
             print("Unsupported deep link type: \(components.host ?? "unknown")")
         }
     }
 
+    private func handleFileListDeepLink(_ components: URLComponents) {
+        guard let urlString = components.queryItems?.first(where: { $0.name == "url" })?.value?.removingPercentEncoding,
+              let serverURL = URL(string: urlString) else {
+            print("Invalid server URL in filelist deep link")
+            return
+        }
+        
+        // Find the session with matching URL and select it
+        let context = sharedModelContainer.mainContext
+        let descriptor = FetchDescriptor<DjangoFilesSession>()
+        
+        Task {
+            do {
+                let existingSessions = try context.fetch(descriptor)
+                if let matchingSession = existingSessions.first(where: { $0.url == serverURL.absoluteString }) {
+                    await MainActor.run {
+                        sessionManager.selectedSession = matchingSession
+                        selectedTab = .files
+                    }
+                } else {
+                    print("No session found for URL: \(serverURL.absoluteString)")
+                }
+            } catch {
+                print("Error fetching sessions: \(error)")
+            }
+        }
+    }
+    
     private func deepLinkAuth(_ components: URLComponents) {
         guard let signature = components.queryItems?.first(where: { $0.name == "signature" })?.value?.removingPercentEncoding,
               let serverURL = URL(string: components.queryItems?.first(where: { $0.name == "url" })?.value?.removingPercentEncoding ?? "") else {

Django Files/Util/SessionManager.swift

@@ -25,7 +25,7 @@ class SessionManager: ObservableObject {
         let api = DFAPI(url: URL(string: serverURL)!, token: "")
 
         // Get token using the signature
-        if let token = await api.applicationAuth(signature: signature) {
+        if let token = await api.applicationAuth(signature: signature, selectedServer: newSession) {
             newSession.token = token
             newSession.auth = true
 

Django Files/Views/Preview.swift

@@ -801,6 +801,7 @@ struct FilePreviewView: View {
                                     .padding(8)
                             }
                             .buttonStyle(.borderless)
+                            .padding(.leading, 1)
                             Spacer()
                         }
                         .background(.ultraThinMaterial)

Django Files/Views/TabView.swift

@@ -11,18 +11,23 @@ import SwiftData
 struct TabViewWindow: View {
     @Environment(\.modelContext) private var modelContext
     @ObservedObject var sessionManager: SessionManager
+    @Binding var selectedTab: Tab
 
     @State private var showingServerSelector = false
     @Query private var sessions: [DjangoFilesSession]
     @State private var needsRefresh = false
     @State private var serverChangeRefreshTrigger = UUID()
     @State private var serverNeedsAuth: DjangoFilesSession?
 
-    @State private var selectedTab: Tab = .files
     @State private var showLoginSheet = false
     @State private var filesNavigationPath = NavigationPath()
     @State private var albumsNavigationPath = NavigationPath()
 
+    init(sessionManager: SessionManager, selectedTab: Binding<Tab>) {
+        self.sessionManager = sessionManager
+        _selectedTab = selectedTab
+    }
+    
     enum Tab {
         case files, albums, shorts, serverList, userSettings, serverSettings, mobileWeb
     }