diff --git a/Sources/InfomaniakCore/Networking/ApiFetcher+Dispatch.swift b/Sources/InfomaniakCore/Networking/ApiFetcher+Dispatch.swift index 26c3070..5f2f641 100644 --- a/Sources/InfomaniakCore/Networking/ApiFetcher+Dispatch.swift +++ b/Sources/InfomaniakCore/Networking/ApiFetcher+Dispatch.swift @@ -70,7 +70,7 @@ extension ApiFetcher: RequestDispatchable { parameters: nil) } - return try await perform(request: request).data + return try await perform(request: request) } func dispatchNSURLSession(_ requestable: Requestable) async throws -> Result { diff --git a/Sources/InfomaniakCore/Networking/ApiFetcher.swift b/Sources/InfomaniakCore/Networking/ApiFetcher.swift index c0d1a0c..50f6e91 100644 --- a/Sources/InfomaniakCore/Networking/ApiFetcher.swift +++ b/Sources/InfomaniakCore/Networking/ApiFetcher.swift @@ -180,7 +180,11 @@ open class ApiFetcher { itemsPerPage: apiResponse.itemsPerPage, responseAt: apiResponse.responseAt ) - return ValidServerResponse(responseHeaders: serverResponse.headers, validApiResponse: validApiResponse) + return ValidServerResponse( + statusCode: serverResponse.statusCode, + responseHeaders: serverResponse.headers, + validApiResponse: validApiResponse + ) } else if let apiError = apiResponse.error { throw InfomaniakError.apiError(apiError) } else { @@ -189,11 +193,11 @@ open class ApiFetcher { } public func userOrganisations() async throws -> [OrganisationAccount] { - try await perform(request: authenticatedRequest(.organisationAccounts)).data + try await perform(request: authenticatedRequest(.organisationAccounts)) } public func userProfile() async throws -> UserProfile { - try await perform(request: authenticatedRequest(.profile)).data + try await perform(request: authenticatedRequest(.profile)) } } diff --git a/Sources/InfomaniakCore/Networking/ValidApiResponse.swift b/Sources/InfomaniakCore/Networking/ValidApiResponse.swift index c1b4711..92e8d2f 100644 --- a/Sources/InfomaniakCore/Networking/ValidApiResponse.swift +++ b/Sources/InfomaniakCore/Networking/ValidApiResponse.swift @@ -19,6 +19,7 @@ import Alamofire public struct ValidServerResponse { + public let statusCode: Int public let responseHeaders: HTTPHeaders public let validApiResponse: ValidApiResponse }