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.
80 lines
2.8 KiB
Swift
80 lines
2.8 KiB
Swift
//
|
|
// InfoApiClient.swift
|
|
// readeck
|
|
//
|
|
// Created by Ilyas Hallak
|
|
|
|
import Foundation
|
|
|
|
protocol PInfoApiClient {
|
|
func getServerInfo(endpoint: String?) async throws -> ServerInfoDto
|
|
}
|
|
|
|
class InfoApiClient: PInfoApiClient {
|
|
private let tokenProvider: TokenProvider
|
|
private let logger = Logger.network
|
|
|
|
init(tokenProvider: TokenProvider = KeychainTokenProvider()) {
|
|
self.tokenProvider = tokenProvider
|
|
}
|
|
|
|
func getServerInfo(endpoint: String? = nil) async throws -> ServerInfoDto {
|
|
let baseEndpoint = try await resolveEndpoint(endpoint)
|
|
let url = try buildInfoURL(baseEndpoint: baseEndpoint)
|
|
let request = try await buildInfoRequest(url: url, useStoredEndpoint: endpoint == nil)
|
|
|
|
logger.logNetworkRequest(method: "GET", url: url.absoluteString)
|
|
|
|
let (data, response) = try await URLSession.shared.data(for: request)
|
|
|
|
guard let httpResponse = response as? HTTPURLResponse else {
|
|
logger.error("Invalid HTTP response for server info")
|
|
throw APIError.invalidResponse
|
|
}
|
|
|
|
guard 200...299 ~= httpResponse.statusCode else {
|
|
logger.logNetworkError(method: "GET", url: url.absoluteString, error: APIError.serverError(httpResponse.statusCode))
|
|
throw APIError.serverError(httpResponse.statusCode)
|
|
}
|
|
|
|
logger.logNetworkRequest(method: "GET", url: url.absoluteString, statusCode: httpResponse.statusCode)
|
|
|
|
return try JSONDecoder().decode(ServerInfoDto.self, from: data)
|
|
}
|
|
|
|
// MARK: - Private Helpers
|
|
|
|
private func resolveEndpoint(_ providedEndpoint: String?) async throws -> String {
|
|
if let providedEndpoint = providedEndpoint {
|
|
return providedEndpoint
|
|
} else if let storedEndpoint = await tokenProvider.getEndpoint() {
|
|
return storedEndpoint
|
|
} else {
|
|
logger.error("No endpoint available for server info")
|
|
throw APIError.invalidURL
|
|
}
|
|
}
|
|
|
|
private func buildInfoURL(baseEndpoint: String) throws -> URL {
|
|
guard let url = URL(string: "\(baseEndpoint)/api/info") else {
|
|
logger.error("Invalid endpoint URL for server info: \(baseEndpoint)")
|
|
throw APIError.invalidURL
|
|
}
|
|
return url
|
|
}
|
|
|
|
private func buildInfoRequest(url: URL, useStoredEndpoint: Bool) async throws -> URLRequest {
|
|
var request = URLRequest(url: url)
|
|
request.httpMethod = "GET"
|
|
request.setValue("application/json", forHTTPHeaderField: "accept")
|
|
request.timeoutInterval = 5.0
|
|
|
|
// Only add token if using stored endpoint (not custom endpoint)
|
|
if useStoredEndpoint, let token = await tokenProvider.getToken() {
|
|
request.setValue("Bearer \(token)", forHTTPHeaderField: "authorization")
|
|
}
|
|
|
|
return request
|
|
}
|
|
}
|