Ilyas Hallak
ec432a037c
Add complete OAuth 2.0 Authorization Code Flow with PKCE as alternative to API token authentication, with automatic server detection and graceful fallback to classic login. **OAuth Core (RFC 7636 PKCE):** - PKCEGenerator: S256 challenge generation for secure code exchange - OAuth DTOs: Client registration, token request/response models - OAuthClient, OAuthToken, AuthenticationMethod domain models - API.swift: registerOAuthClient() and exchangeOAuthToken() endpoints - OAuthRepository + POAuthRepository protocol **Browser Integration (ASWebAuthenticationSession):** - OAuthSession: Wraps native authentication session - OAuthFlowCoordinator: Orchestrates 5-phase OAuth flow - readeck:// URL scheme for OAuth callback handling - State verification for CSRF protection - User cancellation handling **Token Management:** - KeychainHelper: OAuth token storage alongside API tokens - TokenProvider: getOAuthToken(), setOAuthToken(), getAuthMethod() - AuthenticationMethod enum to distinguish token types - AuthRepository: loginWithOAuth(), getAuthenticationMethod() - Endpoint persistence in both Keychain and Settings **Server Feature Detection:** - ServerInfo extended with features array and supportsOAuth flag - GET /api/info endpoint integration (backward compatible) - GetServerInfoUseCase with optional endpoint parameter **User Profile Integration:** - ProfileApiClient: Fetch user data via GET /api/profile - UserProfileDto with username, email, provider information - GetUserProfileUseCase: Extract username from profile - Username saved and displayed for OAuth users (like classic auth) **Automatic OAuth Flow (No User Selection):** - OnboardingServerView: 2-phase flow (endpoint → auto-OAuth or classic) - OAuth attempted automatically if server supports it - Fallback to username/password on OAuth failure or unsupported - SettingsServerViewModel: checkServerOAuthSupport(), loginWithOAuth() **Cleanup & Refactoring:** - Remove all #if os(iOS) && !APP_EXTENSION conditionals - Remove LoginMethodSelectionView (no longer needed) - Remove switchToClassicLogin() method - Factories updated with OAuth dependencies **Testing:** - PKCEGeneratorTests: Verify RFC 7636 compliance - ServerInfoTests: Feature detection and backward compatibility - Mock implementations for all OAuth components **Documentation:** - docs/OAuth2-Implementation-Plan.md: Complete implementation guide - openapi.json: Readeck API specification **Scopes Requested:** - bookmarks:read, bookmarks:write, profile:read OAuth users now have full feature parity with classic authentication. Server auto-detects OAuth support via /info endpoint. Seamless UX with browser-based login and automatic fallback.
76 lines
2.4 KiB
Swift
76 lines
2.4 KiB
Swift
//
|
|
// readeckApp.swift
|
|
// readeck
|
|
//
|
|
// Created by Ilyas Hallak on 10.06.25.
|
|
//
|
|
|
|
import SwiftUI
|
|
import netfox
|
|
|
|
@main
|
|
struct readeckApp: App {
|
|
@State private var appViewModel = AppViewModel()
|
|
@StateObject private var appSettings = AppSettings()
|
|
@Environment(\.scenePhase) private var scenePhase
|
|
@State private var showDebugMenu = false
|
|
|
|
var body: some Scene {
|
|
WindowGroup {
|
|
Group {
|
|
if appViewModel.hasFinishedSetup {
|
|
MainTabView()
|
|
} else {
|
|
OnboardingServerView()
|
|
.padding()
|
|
}
|
|
}
|
|
.environmentObject(appSettings)
|
|
.environment(\.managedObjectContext, CoreDataManager.shared.context)
|
|
.preferredColorScheme(appSettings.theme.colorScheme)
|
|
.onShake {
|
|
// Only show debug menu in non-production builds (DEBUG + TestFlight)
|
|
if !Bundle.main.isProduction {
|
|
showDebugMenu = true
|
|
}
|
|
}
|
|
.sheet(isPresented: $showDebugMenu) {
|
|
DebugMenuView()
|
|
.environmentObject(appSettings)
|
|
}
|
|
.onAppear {
|
|
// Start NetFox in non-production builds
|
|
if !Bundle.main.isProduction {
|
|
// Disable NetFox shake gesture since we use it for our debug menu
|
|
NFX.sharedInstance().setGesture(.custom)
|
|
NFX.sharedInstance().start()
|
|
}
|
|
Task {
|
|
await loadAppSettings()
|
|
}
|
|
appViewModel.bindNetworkStatus(to: appSettings)
|
|
}
|
|
.onReceive(NotificationCenter.default.publisher(for: .settingsChanged)) { _ in
|
|
Task {
|
|
await loadAppSettings()
|
|
}
|
|
}
|
|
.onChange(of: scenePhase) { oldPhase, newPhase in
|
|
if newPhase == .active {
|
|
Task {
|
|
await appViewModel.onAppResume()
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
private func loadAppSettings() async {
|
|
let settingsRepository = SettingsRepository()
|
|
let settings = try? await settingsRepository.loadSettings()
|
|
await MainActor.run {
|
|
appSettings.settings = settings
|
|
}
|
|
}
|
|
}
|