daniil/pulse-mobile
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: show/hide password, better error messages, prefill email

Browse Source
This commit is contained in:
Cosmo
2026-03-25 11:04:07 +00:00
parent 7cda5deaab
commit 7ca78bfd1f
2 changed files with 127 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
PulseHealth/Services/APIService.swift
View File

@@ -1,12 +1,17 @@
import Foundation
enum APIError: Error, LocalizedError {
case unauthorized, networkError, decodingError
case unauthorized
case networkError(String)
case decodingError(String)
case serverError(Int, String)
var errorDescription: String? {
switch self {
case .unauthorized: return "Неверный email или пароль"
case .networkError: return "Ошибка сети"
case .decodingError: return "Ошибка данных"
case .networkError(let msg): return "Ошибка сети: \(msg)"
case .decodingError(let msg): return "Ошибка данных: \(msg)"
case .serverError(let code, let msg): return "Ошибка сервера \(code): \(msg)"
}
}
}
@@ -15,38 +20,68 @@ class APIService {
static let shared = APIService()
let baseURL = "https://health.digital-home.site"
private func makeRequest(url: URL, method: String = "GET", token: String? = nil, body: Data? = nil) -> URLRequest {
var req = URLRequest(url: url)
req.httpMethod = method
req.setValue("application/json", forHTTPHeaderField: "Content-Type")
req.timeoutInterval = 15
if let token = token {
req.setValue("Bearer \(token)", forHTTPHeaderField: "Authorization")
}
req.httpBody = body
return req
}
func login(email: String, password: String) async throws -> LoginResponse {
let url = URL(string: "\(baseURL)/api/auth/login")!
var req = URLRequest(url: url)
req.httpMethod = "POST"
req.setValue("application/json", forHTTPHeaderField: "Content-Type")
req.httpBody = try JSONEncoder().encode(LoginRequest(email: email, password: password))
let body = try JSONEncoder().encode(LoginRequest(email: email, password: password))
let req = makeRequest(url: url, method: "POST", body: body)
let (data, response) = try await URLSession.shared.data(for: req)
guard let r = response as? HTTPURLResponse, r.statusCode == 200 else { throw APIError.unauthorized }
return try JSONDecoder().decode(LoginResponse.self, from: data)
guard let httpResponse = response as? HTTPURLResponse else {
throw APIError.networkError("Нет ответа от сервера")
}
if httpResponse.statusCode == 401 {
throw APIError.unauthorized
}
if httpResponse.statusCode != 200 {
let msg = String(data: data, encoding: .utf8) ?? "Unknown"
throw APIError.serverError(httpResponse.statusCode, msg)
}
do {
return try JSONDecoder().decode(LoginResponse.self, from: data)
} catch {
throw APIError.decodingError(error.localizedDescription)
}
}
func getProfile(token: String) async throws -> ProfileResponse {
let url = URL(string: "\(baseURL)/api/profile")!
var req = URLRequest(url: url)
req.setValue("Bearer \(token)", forHTTPHeaderField: "Authorization")
let req = makeRequest(url: url, token: token)
let (data, _) = try await URLSession.shared.data(for: req)
return try JSONDecoder().decode(ProfileResponse.self, from: data)
}
func getReadiness(token: String) async throws -> ReadinessResponse {
let url = URL(string: "\(baseURL)/api/health/readiness")!
var req = URLRequest(url: url)
req.setValue("Bearer \(token)", forHTTPHeaderField: "Authorization")
let (data, _) = try await URLSession.shared.data(for: req)
let req = makeRequest(url: url, token: token)
let (data, response) = try await URLSession.shared.data(for: req)
guard let httpResponse = response as? HTTPURLResponse, httpResponse.statusCode == 200 else {
throw APIError.networkError("Readiness недоступен")
}
return try JSONDecoder().decode(ReadinessResponse.self, from: data)
}
func getLatest(token: String) async throws -> LatestHealthResponse {
let url = URL(string: "\(baseURL)/api/health/latest")!
var req = URLRequest(url: url)
req.setValue("Bearer \(token)", forHTTPHeaderField: "Authorization")
let (data, _) = try await URLSession.shared.data(for: req)
let req = makeRequest(url: url, token: token)
let (data, response) = try await URLSession.shared.data(for: req)
guard let httpResponse = response as? HTTPURLResponse, httpResponse.statusCode == 200 else {
throw APIError.networkError("Latest недоступен")
}
return try JSONDecoder().decode(LatestHealthResponse.self, from: data)
}
}