Skip to content

Commit 53d9b5d

Browse files
ethanndicksonethanndickson
committed
chore: add API errors to SDK
1 parent c070ac7 commit 53d9b5d

File tree

10 files changed

+173
-97
lines changed

10 files changed

+173
-97
lines changed

‎Coder Desktop/Coder Desktop.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"originHash" : "42dc2e0a0e0417a7f4f62b3e875c9559038beef7d2265073dd4fc81f2e11ee13",
2+
"originHash" : "aa8dd97dc6e28dedc4a5c45c435467a247486474bf3c1caf5e67085d52325132",
33
"pins" : [
44
{
55
"identity" : "alamofire",
@@ -41,8 +41,8 @@
4141
"kind" : "remoteSourceControl",
4242
"location" : "https://github.com/nalexn/ViewInspector",
4343
"state" : {
44-
"revision" : "5acfa0a3c095ac9ad050abe51c60d1831e8321da",
45-
"version" : "0.10.0"
44+
"revision" : "788e7879d38a839c4e348ab0762dcc0364e646a2",
45+
"version" : "0.10.1"
4646
}
4747
}
4848
],

‎Coder Desktop/Coder Desktop/Preview Content/PreviewClient.swift

+21-17
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,26 @@ import SwiftUI
33
struct PreviewClient: Client {
44
init(url _: URL, token _: String? = nil) {}
55

6-
func user(_: String) async throws -> User {
7-
try await Task.sleep(for: .seconds(1))
8-
return User(
9-
id: UUID(),
10-
username: "admin",
11-
avatar_url: "",
12-
name: "admin",
13-
email: "[email protected]",
14-
created_at: Date.now,
15-
updated_at: Date.now,
16-
last_seen_at: Date.now,
17-
status: "active",
18-
login_type: "none",
19-
theme_preference: "dark",
20-
organization_ids: [],
21-
roles: []
22-
)
6+
func user(_: String) async throws(ClientError) -> User {
7+
do {
8+
try await Task.sleep(for: .seconds(1))
9+
return User(
10+
id: UUID(),
11+
username: "admin",
12+
avatar_url: "",
13+
name: "admin",
14+
email: "[email protected]",
15+
created_at: Date.now,
16+
updated_at: Date.now,
17+
last_seen_at: Date.now,
18+
status: "active",
19+
login_type: "none",
20+
theme_preference: "dark",
21+
organization_ids: [],
22+
roles: []
23+
)
24+
} catch {
25+
throw ClientError.badResponse
26+
}
2327
}
2428
}

‎Coder Desktop/Coder Desktop/SDK/Client.swift

+97-13
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import Foundation
33

44
protocol Client {
55
init(url: URL, token: String?)
6-
func user(_ ident: String) async throws -> User
6+
func user(_ ident: String) async throws(ClientError) -> User
77
}
88

99
struct CoderClient: Client {
@@ -25,38 +25,122 @@ struct CoderClient: Client {
2525
func request<T: Encodable>(
2626
_ path: String,
2727
method: HTTPMethod,
28-
body: T
29-
) async -> DataResponse<Data, AFError> {
28+
body: T? = nil
29+
) async throws(ClientError) -> HTTPResponse {
3030
let url = self.url.appendingPathComponent(path)
31-
let headers: HTTPHeaders = [Headers.sessionToken: token ?? ""]
32-
return await AF.request(
31+
let headers: HTTPHeaders? = token.map { [Headers.sessionToken: $0] }
32+
let out = await AF.request(
3333
url,
3434
method: method,
3535
parameters: body,
36-
encoder: JSONParameterEncoder.default,
3736
headers: headers
3837
).serializingData().response
38+
guard let response = out.response else {
39+
throw ClientError.noResponse
40+
}
41+
switch out.result {
42+
case .success(let data):
43+
return HTTPResponse(resp: response, data: data, req: out.request)
44+
case .failure:
45+
throw ClientError.badResponse
46+
}
3947
}
4048

4149
func request(
4250
_ path: String,
4351
method: HTTPMethod
44-
) async -> DataResponse<Data, AFError> {
52+
) async throws(ClientError) -> HTTPResponse {
4553
let url = self.url.appendingPathComponent(path)
46-
let headers: HTTPHeaders = [Headers.sessionToken: token ?? ""]
47-
return await AF.request(
54+
let headers: HTTPHeaders? = token.map { [Headers.sessionToken: $0] }
55+
let out = await AF.request(
4856
url,
4957
method: method,
5058
headers: headers
5159
).serializingData().response
60+
guard let response = out.response else {
61+
throw ClientError.noResponse
62+
}
63+
switch out.result {
64+
case .success(let data):
65+
return HTTPResponse(resp: response, data: data, req: out.request)
66+
case .failure:
67+
throw ClientError.badResponse
68+
}
5269
}
70+
71+
func responseAsError(_ resp: HTTPResponse) throws(ClientError) -> APIError {
72+
do {
73+
let body = try CoderClient.decoder.decode(Response.self, from: resp.data)
74+
return APIError(
75+
response: body,
76+
statusCode: resp.resp.statusCode,
77+
method: resp.req?.httpMethod,
78+
url: resp.req?.url
79+
)
80+
} catch {
81+
throw ClientError.badResponse
82+
}
83+
}
84+
85+
enum Headers {
86+
static let sessionToken = "Coder-Session-Token"
87+
}
88+
89+
}
90+
91+
struct HTTPResponse {
92+
let resp: HTTPURLResponse
93+
let data: Data
94+
let req: URLRequest?
95+
}
96+
97+
struct APIError: Decodable {
98+
let response: Response
99+
let statusCode: Int
100+
let method: String?
101+
let url: URL?
102+
103+
var description: String {
104+
var components: [String] = []
105+
if let method = method, let url = url {
106+
components.append("\(method) \(url.absoluteString)")
107+
}
108+
components.append("Unexpected status code \(statusCode):\n\(response.message)")
109+
if let detail = response.detail {
110+
components.append("\tError: \(detail)")
111+
}
112+
if let validations = response.validations, !validations.isEmpty {
113+
let validationMessages = validations.map { "\t\($0.field): \($0.detail)" }
114+
components.append(contentsOf: validationMessages)
115+
}
116+
return components.joined(separator: "\n")
117+
}
118+
}
119+
120+
struct Response: Decodable {
121+
let message: String
122+
let detail: String?
123+
let validations: [ValidationError]?
124+
}
125+
126+
struct ValidationError: Decodable {
127+
let field: String
128+
let detail: String
53129
}
54130

55131
enum ClientError: Error {
56-
case unexpectedStatusCode
132+
case apiError(APIError)
57133
case badResponse
58-
}
134+
case noResponse
59135

60-
enum Headers {
61-
static let sessionToken = "Coder-Session-Token"
136+
var description: String {
137+
switch self {
138+
case .apiError(let error):
139+
return error.description
140+
case .badResponse:
141+
return "Bad response"
142+
case .noResponse:
143+
return "No response"
144+
}
145+
}
62146
}

‎Coder Desktop/Coder Desktop/SDK/User.swift

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
import Foundation
22

33
extension CoderClient {
4-
func user(_ ident: String) async throws -> User {
5-
let resp = await request("/api/v2/users/\(ident)", method: .get)
6-
guard let response = resp.response, response.statusCode == 200 else {
7-
throw ClientError.unexpectedStatusCode
4+
func user(_ ident: String) async throws(ClientError) -> User {
5+
let res = try await request("/api/v2/users/\(ident)", method: .get)
6+
guard res.resp.statusCode == 200 else {
7+
let error = try responseAsError(res)
8+
throw ClientError.apiError(error)
89
}
9-
guard let data = resp.data else {
10+
do {
11+
return try CoderClient.decoder.decode(User.self, from: res.data)
12+
} catch {
1013
throw ClientError.badResponse
1114
}
12-
return try CoderClient.decoder.decode(User.self, from: data)
1315
}
1416
}
1517

‎Coder Desktop/Coder Desktop/Views/LoginForm.swift

+20-20
Original file line numberDiff line numberDiff line change
@@ -37,29 +37,29 @@ struct LoginForm<C: Client, S: Session>: View {
3737
}
3838
.animation(.easeInOut, value: currentPage)
3939
.onAppear {
40-
loginError = nil
4140
baseAccessURL = session.baseAccessURL?.absoluteString ?? baseAccessURL
4241
sessionToken = ""
43-
}.padding(.top, 35)
44-
VStack(alignment: .center) {
45-
if let loginError {
46-
Text("\(loginError.description)")
47-
.font(.headline)
48-
.foregroundColor(.red)
49-
.multilineTextAlignment(.center)
42+
}.padding(.vertical, 35)
43+
.alert("Error", isPresented: Binding(
44+
get: { loginError != nil },
45+
set: { isPresented in
46+
if !isPresented {
47+
loginError = nil
48+
}
49+
}
50+
)) {
51+
Button("OK", role: .cancel) {}.keyboardShortcut(.defaultAction)
52+
} message: {
53+
Text(loginError?.description ?? "")
5054
}
51-
}
52-
.frame(height: 35)
5355
}.padding()
5456
.frame(width: 450, height: 220)
5557
.disabled(loading)
5658
.onReceive(inspection.notice) { self.inspection.visit(self, $0) } // ViewInspector
5759
}
5860

5961
internal func submit() async {
60-
loginError = nil
6162
guard sessionToken != "" else {
62-
loginError = .invalidToken
6363
return
6464
}
6565
guard let url = URL(string: baseAccessURL), url.scheme == "https" else {
@@ -69,11 +69,10 @@ struct LoginForm<C: Client, S: Session>: View {
6969
loading = true
7070
defer { loading = false}
7171
let client = C(url: url, token: sessionToken)
72-
do {
72+
do throws(ClientError) {
7373
_ = try await client.user("me")
7474
} catch {
75-
loginError = .failedAuth
76-
print("Set error")
75+
loginError = .failedAuth(error)
7776
return
7877
}
7978
session.store(baseAccessURL: url, sessionToken: sessionToken)
@@ -142,7 +141,9 @@ struct LoginForm<C: Client, S: Session>: View {
142141
}
143142

144143
private func next() {
145-
loginError = nil
144+
guard baseAccessURL != "" else {
145+
return
146+
}
146147
guard let url = URL(string: baseAccessURL), url.scheme == "https" else {
147148
loginError = .invalidURL
148149
return
@@ -155,7 +156,6 @@ struct LoginForm<C: Client, S: Session>: View {
155156

156157
private func back() {
157158
withAnimation {
158-
loginError = nil
159159
currentPage = .serverURL
160160
focusedField = .baseAccessURL
161161
}
@@ -165,16 +165,16 @@ struct LoginForm<C: Client, S: Session>: View {
165165
enum LoginError {
166166
case invalidURL
167167
case invalidToken
168-
case failedAuth
168+
case failedAuth(ClientError)
169169

170170
var description: String {
171171
switch self {
172172
case .invalidURL:
173173
return "Invalid URL"
174174
case .invalidToken:
175175
return "Invalid Session Token"
176-
case .failedAuth:
177-
return "Could not authenticate with Coder deployment"
176+
case .failedAuth(let err):
177+
return "Could not authenticate with Coder deployment:\n\(err.description)"
178178
}
179179
}
180180
}

‎Coder Desktop/Coder DesktopTests/AgentsTests.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ struct AgentsTests {
5656
vpn.state = .connected
5757
vpn.agents = createMockAgents(count: 7)
5858

59-
try await ViewHosting.host(view) { _ in
59+
try await ViewHosting.host(view) {
6060
try await sut.inspection.inspect { view in
6161
var toggle = try view.find(ViewType.Toggle.self)
6262
#expect(try toggle.labelView().text().string() == "Show All")

0 commit comments

Comments
 (0)