hendrik-hog/Nextcloud-Cookbook-iOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Nextcloud Login refactoring

Browse Source
This commit is contained in:
VincentMeilinger
2025-05-31 11:12:14 +02:00
parent 5acf3b9c4f
commit 48b31a7997
29 changed files with 1277 additions and 720 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Nextcloud Cookbook iOS Client/Networking/CookbookApi/CookbookApi.swift
View File

@@ -99,7 +99,7 @@ protocol CookbookApi {
/// - Returns: A list of categories. A NetworkError if the request fails.
static func getCategories(
auth: String
) async -> ([Category]?, NetworkError?)
) async -> ([CookbookApiCategory]?, NetworkError?)
/// Get all recipes of a specified category.
/// - Parameters:

8
Nextcloud Cookbook iOS Client/Networking/CookbookApi/CookbookApiV1.swift
View File

@@ -77,7 +77,7 @@ class CookbookApiV1: CookbookApi {
if let id = json as? Int {
return nil
} else if let dict = json as? [String: Any] {
return .serverError
return .unknownError
}
} catch {
return .decodingFailed
@@ -103,7 +103,7 @@ class CookbookApiV1: CookbookApi {
static func updateRecipe(auth: String, recipe: Recipe) async -> (NetworkError?) {
let cookbookRecipe = CookbookApiRecipeDetailV1.fromRecipe(recipe)
guard let recipeData = JSONEncoder.safeEncode(recipe) else {
guard let recipeData = JSONEncoder.safeEncode(cookbookRecipe) else {
return .dataError
}
let request = ApiRequest(
@@ -121,7 +121,7 @@ class CookbookApiV1: CookbookApi {
if let id = json as? Int {
return nil
} else if let dict = json as? [String: Any] {
return .serverError
return .unknownError
}
} catch {
return .decodingFailed
@@ -143,7 +143,7 @@ class CookbookApiV1: CookbookApi {
return nil
}
static func getCategories(auth: String) async -> ([Category]?, NetworkError?) {
static func getCategories(auth: String) async -> ([CookbookApiCategory]?, NetworkError?) {
let request = ApiRequest(
path: basePath + "/categories",
method: .GET,

6
Nextcloud Cookbook iOS Client/Networking/CookbookApi/CookbookModelsV1.swift
View File

@@ -8,10 +8,10 @@
import Foundation
import SwiftUI
struct Category: Codable, Identifiable, Hashable {
struct CookbookApiCategory: Codable, Identifiable, Hashable {
var id: String { name }
let name: String
let recipe_count: Int
var name: String
var recipe_count: Int
private enum CodingKeys: String, CodingKey {
case name, recipe_count