better login flow

Author: raluaces

Django Files/Views/SessionEditor.swift

@@ -14,7 +14,7 @@ struct SessionEditor: View {
     @Query private var items: [DjangoFilesSession]
 
     @State private var showLoginSheet: Bool = false
-    @State private var newSession: DjangoFilesSession?
+    @State private var tempSession: DjangoFilesSession?
 
     let session: DjangoFilesSession?
     var onSessionCreated: ((DjangoFilesSession) -> Void)?
@@ -25,32 +25,50 @@ struct SessionEditor: View {
 
     @State private var showDuplicateAlert = false
 
-    private func checkURLAuthAndSave() {
-        if let session {
-            session.url = url?.absoluteString ?? ""
-            session.token = token
-            session.auth = false
-        } else {
-            if items.contains(where: { $0.url == url?.absoluteString }) {
-                showDuplicateAlert = true
-                return
-            }
-            newSession = DjangoFilesSession()
-            newSession!.url = url?.absoluteString ?? ""
-            newSession!.token = token
-            newSession!.auth = false
-            modelContext.insert(newSession!)
-            showLoginSheet = true
-        }
-    }
-    
     @State private var url: URL? = nil
     @State private var token: String = ""
-    @State private var badURL = false
-    @State private var insecureURL = false
+    @State private var badURL: Bool = false
+    @State private var insecureURL: Bool = false
+    @State private var isCheckingServer: Bool = false
+    @State private var serverError: String? = nil
 
     @FocusState private var isURLFieldFocused: Bool
 
+    private func checkURLAuthAndSave() {
+        Task {
+            isCheckingServer = true
+            serverError = nil
+            
+            // Create a temporary DFAPI instance to check auth methods
+            let api = DFAPI(url: url!, token: "")
+            if let authResponse = await api.getAuthMethods() {
+                isCheckingServer = false
+                
+                // Server is valid, proceed with login
+                if let session {
+                    // For editing, update the URL and clear auth
+                    session.url = url?.absoluteString ?? ""
+                    session.token = token
+                    session.auth = false
+                    showLoginSheet = true
+                } else {
+                    if items.contains(where: { $0.url == url?.absoluteString }) {
+                        showDuplicateAlert = true
+                        return
+                    }
+                    // Create temporary session but don't save it yet
+                    tempSession = DjangoFilesSession()
+                    tempSession!.url = url?.absoluteString ?? ""
+                    tempSession!.token = token
+                    tempSession!.auth = false
+                    showLoginSheet = true
+                }
+            } else {
+                isCheckingServer = false
+                serverError = "Could not connect to server or server is not a Django Files instance"
+            }
+        }
+    }
 
     var body: some View {
         NavigationStack {
@@ -68,6 +86,7 @@ struct SessionEditor: View {
                             if temp?.scheme != nil && temp?.scheme != ""{
                                 url = temp
                                 insecureURL = (url?.scheme?.lowercased()) == ("http")
+                                serverError = nil
                             }
                         }
                     ), prompt: Text(verbatim: "https://df.example.com"))
@@ -86,11 +105,23 @@ struct SessionEditor: View {
                     let warningMessage = "⚠️ HTTPS strongly recommend."
                     TextField("", text: Binding(
                             get: { warningMessage },
-                            set: { _ in } // Prevents user from modifying the text
+                            set: { _ in }
                         ))
-                        .disabled(true) // Prevents user input
+                        .disabled(true)
+                        .foregroundColor(.red)
+                }
+                if let error = serverError {
+                    Text("❌ " + error)
+                        .disabled(true)
                         .foregroundColor(.red)
                 }
+                if isCheckingServer {
+                    HStack {
+                        ProgressView()
+                            .progressViewStyle(.circular)
+                        Text("Checking server...")
+                    }
+                }
             }
             .padding(.top, -40)
             .toolbar {
@@ -117,6 +148,7 @@ struct SessionEditor: View {
                         Text("Save")
                     }
                     .accessibilityIdentifier("serverSubmitButton")
+                    .disabled(isCheckingServer)
                     .alert(isPresented: $badURL){
                         Alert(title: Text("Invalid URL"), message: Text("Invalid URL format or scheme (http or https).\nExample: https://df.myserver.com"))
                     }
@@ -131,7 +163,6 @@ struct SessionEditor: View {
             }
             .onAppear {
                 if let session {
-                    // Edit the incoming animal.
                     url = URL(string: session.url)
                 }
             }
@@ -143,24 +174,26 @@ struct SessionEditor: View {
                 )
             }
             .sheet(isPresented: $showLoginSheet, onDismiss: {
-                if let newSession = newSession, newSession.auth {
-                    do {
-                        try modelContext.save()
-                        onSessionCreated?(newSession)
+                if let session = session {
+                    if session.auth {
+                        try? modelContext.save()
                         dismiss()
-                    } catch {
-                        print("Error saving session: \(error)")
                     }
+                } else if let tempSession = tempSession, tempSession.auth {
+                    modelContext.insert(tempSession)
+                    try? modelContext.save()
+                    onSessionCreated?(tempSession)
+                    dismiss()
                 }
             }) {
-                if let newSession = newSession {
-                    LoginView(selectedServer: newSession, onLoginSuccess: {
-                        newSession.auth = true
-                    })
-                } else if let session = session {
+                if let session = session {
                     LoginView(selectedServer: session, onLoginSuccess: {
                         session.auth = true
                     })
+                } else if let tempSession = tempSession {
+                    LoginView(selectedServer: tempSession, onLoginSuccess: {
+                        tempSession.auth = true
+                    })
                 }
             }
         }