add qr code auth

Author: raluaces

Django Files/API/DFAPI.swift

@@ -36,6 +36,7 @@ struct DFAPI {
         case file = "file/"
         case raw = "raw/"
         case albums = "album/"
+        case auth_application = "auth/application/"
     }
 
     let url: URL
@@ -386,8 +387,34 @@ struct DFAPI {
         }
     }
 
+    struct DFApplicationAuthRequest: Codable {
+        let signature: String
+    }
 
-    
+    private struct DFApplicationAuthResponse: Codable {
+        let token: String
+    }
+
+    public func applicationAuth(signature: String) 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
+        } catch {
+            print("Application auth request failed \(error)")
+            return nil
+        }
+    }
 }
 
 class DjangoFilesUploadDelegate: NSObject, StreamDelegate, URLSessionDelegate, URLSessionDataDelegate, URLSessionTaskDelegate, URLSessionStreamDelegate{
@@ -704,15 +731,15 @@ class DjangoFilesUploadDelegate: NSObject, StreamDelegate, URLSessionDelegate, U
     }
 }
 
-struct DFAuthMethod: Codable {
-    let name: String
-    let url: String
-}
+    struct DFAuthMethod: Codable {
+        let name: String
+        let url: String
+    }
 
-struct DFAuthMethodsResponse: Codable {
-    let authMethods: [DFAuthMethod]
-    let siteName: String
-}
+    struct DFAuthMethodsResponse: Codable {
+        let authMethods: [DFAuthMethod]
+        let siteName: String
+    }
 
 class RedirectDelegate: NSObject, URLSessionTaskDelegate {
     func urlSession(

Django Files/Django_FilesApp.swift

@@ -18,6 +18,31 @@ class SessionManager: ObservableObject {
         }
     }
 
+    func createAndAuthenticateSession(url: URL, signature: String, context: ModelContext) async -> DjangoFilesSession? {
+        // Create the base URL for the server
+        let serverURL = "\(url.scheme ?? "https")://\(url.host ?? "")"
+        
+        // Create a new session
+        let newSession = DjangoFilesSession(url: serverURL)
+        
+        // Create API instance
+        let api = DFAPI(url: URL(string: serverURL)!, token: "")
+        
+        // Get token using the signature
+        if let token = await api.applicationAuth(signature: signature) {
+            newSession.token = token
+            newSession.auth = true
+            
+            // Save the session
+            context.insert(newSession)
+            try? context.save()
+            
+            return newSession
+        }
+        
+        return nil
+    }
+    
     func loadLastSelectedSession(from sessions: [DjangoFilesSession]) {
         // Return if we already have a session loaded
         if selectedSession != nil { return }
@@ -78,6 +103,9 @@ struct Django_FilesApp: App {
                     })
                 }
             }
+            .onOpenURL { url in
+                handleDeepLink(url)
+            }
         }
         .modelContainer(sharedModelContainer)
 #if os(macOS)
@@ -87,6 +115,48 @@ struct Django_FilesApp: App {
 #endif
     }
 
+    private func handleDeepLink(_ url: 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
+        }
+        // eventually we need a case to handle multiple deep link types
+//        guard let root_path = components.host else {
+//            print("Invalid deep link URL: missing root path")
+//            return
+//        }
+    
+//        print("Deep link components: \(components)")
+//        print("Deep link path: \(components.path)")
+//        print("Deep link host: \(components.host)")
+//        print("Deep link query items: \(components.queryItems)")
+        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 {
+            print("Unable to parse auth deep link.")
+            return
+        }
+        let finalSignature = signature.replacingOccurrences(of: "+", with: "%20")
+
+        // Create and authenticate the session
+        Task {
+            if let newSession = await sessionManager.createAndAuthenticateSession(
+                url: serverURL,
+                signature: signature,
+                context: sharedModelContainer.mainContext
+            ) {
+                // Update the UI on the main thread
+                await MainActor.run {
+                    sessionManager.selectedSession = newSession
+                    hasExistingSessions = true
+                }
+            }
+        }
+    }
+    
     private func checkForExistingSessions() {
         let context = sharedModelContainer.mainContext
         let descriptor = FetchDescriptor<DjangoFilesSession>()

Django Files/Views/TabView.swift

@@ -29,34 +29,34 @@ struct TabViewWindow: View {
 
     var body: some View {
         TabView(selection: $selectedTab) {
-            NavigationStack(path: $filesNavigationPath) {
-                if let server = sessionManager.selectedSession {
-                    FileListView(server: .constant(server), albumID: nil, navigationPath: $filesNavigationPath, albumName: nil)
+            if let server = sessionManager.selectedSession {
+                if server.auth {
+                    NavigationStack(path: $filesNavigationPath) {
+                        FileListView(server: .constant(server), albumID: nil, navigationPath: $filesNavigationPath, albumName: nil)
+                            .id(serverChangeRefreshTrigger)
+                    }
+                    .tabItem {
+                        Label("Files", systemImage: "document.fill")
+                    }
+                    .tag(Tab.files)
+
+                    NavigationStack(path: $albumsNavigationPath) {
+                    AlbumListView(navigationPath: $albumsNavigationPath, server: $sessionManager.selectedSession)
+                        .id(serverChangeRefreshTrigger)
+                    }
+                    .tabItem {
+                        Label("Albums", systemImage: "square.stack")
+                    }
+                    .tag(Tab.albums)
+                    
+                    ShortListView(server: $sessionManager.selectedSession)
                         .id(serverChangeRefreshTrigger)
-                } else {
-                    Label("No server selected.", systemImage: "exclamationmark.triangle")
+                        .tabItem {
+                            Label("Shorts", systemImage: "link")
+                        }
+                        .tag(Tab.shorts)
                 }
             }
-            .tabItem {
-                Label("Files", systemImage: "document.fill")
-            }
-            .tag(Tab.files)
-            
-            NavigationStack(path: $albumsNavigationPath) {
-                AlbumListView(navigationPath: $albumsNavigationPath, server: $sessionManager.selectedSession)
-                    .id(serverChangeRefreshTrigger)
-            }
-            .tabItem {
-                Label("Albums", systemImage: "square.stack")
-            }
-            .tag(Tab.albums)
-            
-            ShortListView(server: $sessionManager.selectedSession)
-                .id(serverChangeRefreshTrigger)
-                .tabItem {
-                    Label("Shorts", systemImage: "link")
-                }
-                .tag(Tab.shorts)
 
             ServerSelector(selectedSession: $sessionManager.selectedSession)
                 .tabItem {