API Refactoring

Campus-iOS/App.swift

@@ -11,6 +11,7 @@ import KVKCalendar
 import Firebase
 
 @main
+@MainActor
 struct CampusApp: App {
     @StateObject var model: Model = Model()
 
@@ -46,13 +47,38 @@ struct CampusApp: App {
                 })
                 .environmentObject(model)
                 .environment(\.managedObjectContext, persistenceController.container.viewContext)
+                .task {
+                    if model.loginController.credentials == Credentials.noTumID {
+                        model.isUserAuthenticated = false
+                    } else {
+                        await model.loginController.confirmToken() { result in
+                            switch result {
+                            case .success:
+                                #if !targetEnvironment(macCatalyst)
+                                Analytics.logEvent("token_confirmed", parameters: nil)
+                                #endif
+                                DispatchQueue.main.async {
+                                    model.isLoginSheetPresented = false
+                                    model.isUserAuthenticated = true
+                                }
+
+//                                    model.loadProfile()
+                            case .failure(_):
+                                model.isUserAuthenticated = false
+                                if !model.showProfile {
+                                    model.isLoginSheetPresented = true
+                                }
+                            }
+                        }
+                    }
+                }
         }
     }
 
     func tabViewComponent() -> some View {
         TabView(selection: $selectedTab) {
             NavigationView {
-                CalendarContentView(
+                CalendarScreen(
                     model: model,
                     refresh: $model.isUserAuthenticated
                 )

Campus-iOS/Base/Enums/Enums.swift

@@ -31,7 +31,22 @@ enum Gender: Decodable, Hashable {
     }
 }
 
-enum ContactInfo {
+enum ContactInfo: Identifiable {
+    var id: String {
+        switch self {
+        case .phone(let phone):
+            return phone
+        case .mobilePhone(let mobile):
+            return mobile
+        case .fax(let fax):
+            return fax
+        case .additionalInfo(let info):
+            return info
+        case .homepage(let homepage):
+            return homepage
+        }
+    }
+
     case phone(String)
     case mobilePhone(String)
     case fax(String)

Campus-iOS/Base/Networking/APIErrors/EatAPIError.swift

@@ -0,0 +1,37 @@
+//
+//  EatAPIError.swift
+//  Campus-iOS
+//
+//  Created by David Lin on 10.02.23.
+//
+
+import Foundation
+
+enum EatAPIError: APIError, LocalizedError {
+    case unknown(String)
+
+    enum CodingKeys: String, CodingKey {
+        case message
+    }
+
+    init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        let error = try container.decode(String.self, forKey: .message)
+
+        switch error {
+        default:
+            self = .unknown(error)
+        }
+    }
+
+    init(message: String) {
+        self = .unknown(message)
+    }
+
+    public var errorDescription: String? {
+        switch self {
+        case let .unknown(message):
+            return "\("Unkonw error".localized): \(message)"
+        }
+    }
+}

Campus-iOS/Base/Networking/APIErrors/MVGAPIError.swift

@@ -0,0 +1,37 @@
+//
+//  MVGAPIError.swift
+//  Campus-iOS
+//
+//  Created by David Lin on 10.02.23.
+//
+
+import Foundation
+
+enum MVGAPIError: APIError, LocalizedError {
+    case unknown(String)
+
+    enum CodingKeys: String, CodingKey {
+        case message
+    }
+
+    init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        let error = try container.decode(String.self, forKey: .message)
+
+        switch error {
+        default:
+            self = .unknown(error)
+        }
+    }
+
+    init(message: String) {
+        self = .unknown(message)
+    }
+
+    public var errorDescription: String? {
+        switch self {
+        case let .unknown(message):
+            return "\("Unkonw error".localized): \(message)"
+        }
+    }
+}

Campus-iOS/Base/Networking/APIErrors/TUMCabeAPIError.swift

@@ -0,0 +1,37 @@
+//
+//  TUMCabeAPIError.swift
+//  Campus-iOS
+//
+//  Created by David Lin on 10.02.23.
+//
+
+import Foundation
+
+enum TUMCabeAPIError: APIError, LocalizedError {
+    case unknown(String)
+
+    enum CodingKeys: String, CodingKey {
+        case message
+    }
+
+    init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        let error = try container.decode(String.self, forKey: .message)
+
+        switch error {
+        default:
+            self = .unknown(error)
+        }
+    }
+
+    init(message: String) {
+        self = .unknown(message)
+    }
+
+    public var errorDescription: String? {
+        switch self {
+        case let .unknown(message):
+            return "\("Unkonw error".localized): \(message)"
+        }
+    }
+}

Campus-iOS/Base/Networking/APIErrors/TUMDevAppAPIError.swift

@@ -0,0 +1,37 @@
+//
+//  TUMDevAppAPI.swift
+//  Campus-iOS
+//
+//  Created by David Lin on 10.02.23.
+//
+
+import Foundation
+
+enum TUMDevAppAPIError: APIError, LocalizedError {
+    case unknown(String)
+
+    enum CodingKeys: String, CodingKey {
+        case message
+    }
+
+    init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        let error = try container.decode(String.self, forKey: .message)
+
+        switch error {
+        default:
+            self = .unknown(error)
+        }
+    }
+
+    init(message: String) {
+        self = .unknown(message)
+    }
+
+    public var errorDescription: String? {
+        switch self {
+        case let .unknown(message):
+            return "\("Unkonw error".localized): \(message)"
+        }
+    }
+}

Campus-iOS/Base/Networking/APIErrors/TUMOnlineAPIError.swift

@@ -0,0 +1,66 @@
+//
+//  TUMOnlineAPIError.swift
+//  Campus-iOS
+//
+//  Created by David Lin on 10.02.23.
+//
+
+import Foundation
+
+enum TUMOnlineAPIError: APIError, LocalizedError {
+    case noPermission
+    case tokenNotConfirmed
+    case invalidToken
+    case unknown(String)
+
+    enum CodingKeys: String, CodingKey {
+        case message = "message"
+    }
+
+    init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        let error = try container.decode(String.self, forKey: .message)
+
+        switch error {
+        case let str where str.contains("Keine Rechte für Funktion"):
+            self = .noPermission
+        case "Token ist nicht bestätigt!":
+            self = .tokenNotConfirmed
+        case "Token ist ungültig!":
+            self = .invalidToken
+        default:
+            self = .unknown(error)
+        }
+    }
+
+    init(message: String) {
+        self = .unknown(message)
+    }
+
+    public var errorDescription: String? {
+        switch self {
+        case .noPermission:
+            return "No Permission".localized
+        case .tokenNotConfirmed:
+            return "Token not confirmed".localized
+        case .invalidToken:
+            return "Token invalid".localized
+        case let .unknown(message):
+            return "\("Unkonw error".localized): \(message)"
+
+        }
+    }
+
+    public var recoverySuggestion: String? {
+        switch self {
+        case .noPermission:
+            return "Make sure to enable the right permissions for your token.".localized
+        case .tokenNotConfirmed:
+            return "Go to TUMonline and confirm your token.".localized
+        case .invalidToken:
+            return "Try creating a new token.".localized
+        default:
+            return nil
+        }
+    }
+}

Campus-iOS/Base/Networking/APIErrors/TUMSexyAPIError.swift

@@ -0,0 +1,37 @@
+//
+//  TUMSexyAPIError.swift
+//  Campus-iOS
+//
+//  Created by David Lin on 10.02.23.
+//
+
+import Foundation
+
+enum TUMSexyAPIError: APIError, LocalizedError {
+    case unknown(String)
+
+    enum CodingKeys: String, CodingKey {
+        case message
+    }
+
+    init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        let error = try container.decode(String.self, forKey: .message)
+
+        switch error {
+        default:
+            self = .unknown(error)
+        }
+    }
+
+    init(message: String) {
+        self = .unknown(message)
+    }
+
+    public var errorDescription: String? {
+        switch self {
+        case let .unknown(message):
+            return "\("Unkonw error".localized): \(message)"
+        }
+    }
+}

Campus-iOS/Base/Networking/APIs/EatAPI.swift

@@ -0,0 +1,46 @@
+//
+//  EatAPI.swift
+//  Campus-iOS
+//
+//  Created by David Lin on 10.02.23.
+//
+
+import Foundation
+import Alamofire
+
+enum EatAPI: API {
+    case canteens
+    case languages
+    case labels
+    case all
+    case all_ref
+    case menu(location: String, year: Int = Date().year, week: Int = Date().weekOfYear)
+
+    static var baseURL: String = "https://tum-dev.github.io/eat-api/"
+
+    static var baseHeaders: Alamofire.HTTPHeaders = []
+
+    static var error: APIError.Type = EatAPIError.self
+
+    var paths: String {
+        switch self {
+            case .canteens:                         return "enums/canteens.json"
+            case .languages:                        return "enums/languages.json"
+            case .labels:                           return "enums/labels.json"
+            case .all:                              return "all.json"
+            case .all_ref:                          return "all_ref.json"
+            case let .menu(location, year, week):   return "\(location)/\(year)/\(String(format: "%02d", week)).json"
+        }
+    }
+
+    var parameters: [String : String] { [:] }
+
+    var needsAuth: Bool { false }
+
+    func decode<T>(_ type: T.Type, from data: Data) throws -> T where T : Decodable {
+        let jsonDecoder = JSONDecoder()
+        jsonDecoder.dateDecodingStrategy = .formatted(DateFormatter.yyyyMMdd)
+
+        return try jsonDecoder.decode(type, from: data)
+    }
+}