More fixes

Author: NovaDev404

iRAM-Plus/LoginViewModel.swift

@@ -53,19 +53,19 @@ class LoginViewModel: ObservableObject {
         if isLoginInProgress {
             return false
         }
-        
+
         logs = ""
         isLoginInProgress = true
         isAuthenticationCancellationRequested = false
-        
+
         progressCallback?(0.0, "Starting...")
-        
+
         func logging(text: String) {
             Task { @MainActor [weak self] in
                 self?.logs.append("\(text)\n")
             }
         }
-        
+
         AnisetteDataHelper.shared.loggingFunc = logging
 
         defer {
@@ -85,20 +85,16 @@ class LoginViewModel: ObservableObject {
             progressCallback?(0.3, "Client info received")
 
             progressCallback?(0.4, "Authenticating with Apple")
-            logging(text: "Starting Apple authentication")
-            
             let (account, session) = try await AppleAPI.shared.authenticate(appleID: appleID, password: password, anisetteData: anisetteData) { [weak self] completionHandler in
                 guard let self else {
                     completionHandler(nil)
                     return
                 }
 
-                logging(text: "AppleAPI requested 2FA code")
                 self.prepareForVerification(using: completionHandler)
             }
-            
+
             progressCallback?(0.65, "Authentication successful")
-            logging(text: "Apple authentication completed successfully")
 
             guard !isAuthenticationCancellationRequested else {
                 throw CancellationError()
@@ -119,8 +115,6 @@ class LoginViewModel: ObservableObject {
 
             return true
         } catch {
-            logging(text: "Authentication error: \(error.localizedDescription)")
-            
             if isAuthenticationCancellationRequested {
                 throw CancellationError()
             }

iRAM-Plus/WizardViewModel.swift

@@ -10,10 +10,9 @@ import SwiftUI
 enum WizardStep: Int, CaseIterable {
     case welcome = 0
     case login = 1
-    case twoFactor = 2
-    case apps = 3
-    case addCapability = 4
-    case finish = 5
+    case apps = 2
+    case addCapability = 3
+    case finish = 4
 }
 
 @MainActor

iRAM-Plus/WizardViews.swift

@@ -106,6 +106,28 @@ struct LoginSlide: View {
                     Text(viewModel.loginStatus)
                         .font(.subheadline)
                         .foregroundStyle(.secondary)
+                    
+                    // 2FA Input (shown when needed, below progress)
+                    if viewModel.loginViewModel.needVerificationCode {
+                        TextField("Verification Code", text: $viewModel.loginViewModel.verificationCode)
+                            .textFieldStyle(.roundedBorder)
+                            .autocapitalization(.none)
+                            .keyboardType(.numberPad)
+                            .padding(.top)
+                        
+                        Button(action: {
+                            submitTwoFactorCode()
+                        }) {
+                            Text("Verify")
+                                .font(.headline)
+                                .foregroundStyle(.white)
+                                .frame(maxWidth: .infinity)
+                                .padding()
+                                .background(.blue.gradient)
+                                .cornerRadius(15)
+                        }
+                        .disabled(viewModel.loginViewModel.isVerificationCodeSubmitting)
+                    }
                 }
                 .padding()
                 .background(Color(UIColor.secondarySystemGroupedBackground))
@@ -220,16 +242,44 @@ struct LoginSlide: View {
                     isLoggingIn = false
                     viewModel.nextStep()
                 }
+            } catch is CancellationError {
+                await MainActor.run {
+                    isLoggingIn = false
+                }
             } catch {
                 await MainActor.run {
-                    viewModel.errorMessage = error.localizedDescription
-                    viewModel.showError = true
+                    // If 2FA is needed, don't show error - the 2FA input will be shown
+                    if !viewModel.loginViewModel.needVerificationCode {
+                        viewModel.errorMessage = error.localizedDescription
+                        viewModel.showError = true
+                    }
                     isLoggingIn = false
                 }
             }
         }
     }
 
+    private func submitTwoFactorCode() {
+        viewModel.loginViewModel.submitVerificationCode()
+        
+        // Wait for authentication to complete
+        Task {
+            try? await Task.sleep(nanoseconds: 2_000_000_000) // 2 seconds
+            
+            await MainActor.run {
+                if DataManager.shared.model.session != nil {
+                    // Authentication succeeded
+                    isLoggingIn = false
+                    viewModel.nextStep()
+                } else {
+                    // Authentication failed
+                    viewModel.errorMessage = "Failed to verify 2FA code"
+                    viewModel.showError = true
+                }
+            }
+        }
+    }
+    
     private func handleSideStoreImport(url: URL) {
         guard url.startAccessingSecurityScopedResource() else {
             viewModel.errorMessage = "Could not access the file"
@@ -273,75 +323,6 @@ struct LoginSlide: View {
     }
 }
 
-// MARK: - 2FA Slide
-struct TwoFactorSlide: View {
-    @ObservedObject var viewModel: WizardViewModel
-    @State private var twoFactorCode: String = ""
-    
-    var body: some View {
-        VStack(spacing: 30) {
-            Spacer()
-            
-            Image(systemName: "lock.shield.fill")
-                .resizable()
-                .frame(width: 80, height: 80)
-                .foregroundStyle(.blue.gradient)
-            
-            VStack(spacing: 10) {
-                Text("Enter 2FA Code")
-                    .font(.system(size: 28, weight: .bold))
-                    .foregroundStyle(.primary)
-                
-                Text("Enter the verification code sent to your trusted devices")
-                    .font(.subheadline)
-                    .foregroundStyle(.secondary)
-                    .multilineTextAlignment(.center)
-                    .padding(.horizontal)
-            }
-            
-            TextField("6-digit code", text: $twoFactorCode)
-                .textFieldStyle(.roundedBorder)
-                .keyboardType(.numberPad)
-                .multilineTextAlignment(.center)
-                .font(.system(size: 24, weight: .bold, design: .monospaced))
-                .padding(.horizontal, 40)
-            
-            Button(action: {
-                submitTwoFactorCode()
-            }) {
-                Text("Verify")
-                    .font(.headline)
-                    .foregroundStyle(.white)
-                    .frame(maxWidth: .infinity)
-                    .padding()
-                    .background(.blue.gradient)
-                    .cornerRadius(15)
-            }
-            .padding(.horizontal, 40)
-            .disabled(twoFactorCode.count != 6)
-            
-            Spacer()
-        }
-        .background(Color(UIColor.systemGroupedBackground))
-    }
-    
-    private func submitTwoFactorCode() {
-        Task {
-            do {
-                try await viewModel.loginViewModel.verifyTwoFactorCode(twoFactorCode)
-                await MainActor.run {
-                    viewModel.nextStep()
-                }
-            } catch {
-                await MainActor.run {
-                    viewModel.errorMessage = error.localizedDescription
-                    viewModel.showError = true
-                }
-            }
-        }
-    }
-}
-
 // MARK: - Apps List Slide
 struct AppsListSlide: View {
     @ObservedObject var viewModel: WizardViewModel
@@ -631,9 +612,6 @@ struct WizardView: View {
             LoginSlide(viewModel: viewModel)
                 .tag(WizardStep.login)
 
-            TwoFactorSlide(viewModel: viewModel)
-                .tag(WizardStep.twoFactor)
-            
             AppsListSlide(viewModel: viewModel)
                 .tag(WizardStep.apps)