Improvements

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>

Author: marinofaggiana

Sources/NextcloudKit/NKCommon.swift

@@ -438,6 +438,40 @@ public struct NKCommon: Sendable {
         return completion(filesChunk)
     }
 
+    // MARK: - Server Error GroupDefaults
+
+    public func appendServerErrorAccount(_ account: String, errorCode: Int) {
+        guard let groupDefaults = UserDefaults(suiteName: groupIdentifier) else {
+            return
+        }
+
+        /// Unavailable
+        if errorCode == 503 {
+            var array = groupDefaults.array(forKey: NextcloudKit.shared.nkCommonInstance.groupDefaultsUnavailable) as? [String] ?? []
+
+            if !array.contains(account) {
+                array.append(account)
+                groupDefaults.set(array, forKey: NextcloudKit.shared.nkCommonInstance.groupDefaultsUnavailable)
+            }
+        /// Unauthorized
+        } else if errorCode == 401 {
+            var array = groupDefaults.array(forKey: NextcloudKit.shared.nkCommonInstance.groupDefaultsUnauthorized) as? [String] ?? []
+
+            if !array.contains(account) {
+                array.append(account)
+                groupDefaults.set(array, forKey: NextcloudKit.shared.nkCommonInstance.groupDefaultsUnauthorized)
+            }
+        /// ToS
+        } else if errorCode == 403 {
+            var array = groupDefaults.array(forKey: NextcloudKit.shared.nkCommonInstance.groupDefaultsToS) as? [String] ?? []
+
+            if !array.contains(account) {
+                array.append(account)
+                groupDefaults.set(array, forKey: NextcloudKit.shared.nkCommonInstance.groupDefaultsToS)
+            }
+        }
+    }
+
     // MARK: - Common
 
     public func getSession(account: String) -> NKSession? {

Sources/NextcloudKit/NKInterceptor.swift

@@ -13,9 +13,6 @@ final class NKInterceptor: RequestInterceptor, Sendable {
     }
 
     func adapt(_ urlRequest: URLRequest, for session: Session, completion: @escaping (Result<URLRequest, Error>) -> Void) {
-        //
-        // Detect if exists in the groupDefaults Unauthorized array the account
-        //
         if let url: String = urlRequest.url?.absoluteString,
            self.nkCommonInstance.levelLog > 0 {
             debugPrint("[DEBUG] Interceptor request url: " + url)

Sources/NextcloudKit/NKMonitor.swift

@@ -28,6 +28,16 @@ final class NKMonitor: EventMonitor, Sendable {
     func request<Value>(_ request: DataRequest, didParseResponse response: AFDataResponse<Value>) {
         nkCommonInstance.delegate?.request(request, didParseResponse: response)
 
+        //
+        // Server Error GroupDefaults
+        //
+        if let statusCode = response.response?.statusCode,
+           let headerCheckInterceptor = request.request?.allHTTPHeaderFields?[self.nkCommonInstance.headerCheckInterceptor],
+           headerCheckInterceptor.lowercased() == "true",
+           let account = request.request?.allHTTPHeaderFields?[self.nkCommonInstance.headerAccount] as? String {
+            self.nkCommonInstance.appendServerErrorAccount(account, errorCode: statusCode)
+        }
+
         //
         // LOG
         //