Skip to content

Commit 165fd9d

Browse files
committed
refactor: Change RequestMethod parameters to contextual lookup
1 parent f8592b2 commit 165fd9d

8 files changed

Lines changed: 15 additions & 17 deletions

File tree

FileBrowserClient/FileBrowserClient/Utilities/BackgroundLogin.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ struct BackgroundLogin {
5656

5757
guard var preparedRequest = baseRequest.prepare(
5858
pathComponents: ["api", "login"],
59-
method: RequestMethod.post,
59+
method: .post,
6060
) else {
6161
return loginResponse("Failed to prepare request for: /api/login")
6262
}

FileBrowserClient/FileBrowserClient/Utilities/Request.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class Request {
7070
func prepare(
7171
pathComponents: [String],
7272
queryItems: [URLQueryItem]? = nil,
73-
method: RequestMethod = RequestMethod.get,
73+
method: RequestMethod = .get,
7474
headers: [RequestHeader]? = nil,
7575
contentType: ContentType = ContentType.json,
7676
timeout: RequestTimeout = RequestTimeout(request: 3.0, resource: 5.0)

FileBrowserClient/FileBrowserClient/Utilities/Utils.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ func getTimeStamp(from date: Date? = nil, as customFormat: String = "MMddyyyy_HH
432432
func getServerVersion(baseRequest: Request) async -> ServerResponse {
433433
guard let preparedRequest = baseRequest.prepare(
434434
pathComponents: ["api", "version"],
435-
method: RequestMethod.post
435+
method: .post
436436
) else {
437437
return ServerResponse(success: false, text: "Failed to prepare request for: /version")
438438
}

FileBrowserClient/FileBrowserClient/Views/ContentView.swift

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,11 +173,9 @@ struct ContentView: View {
173173

174174
private func showOtpFaceID(session: StoredSession?) -> Bool {
175175
guard transitProtection else {
176-
Log.info("Transit protection is disabled")
177176
return false
178177
}
179178
guard session?.otpSecret == nil || session?.otpSecret == "" else {
180-
Log.info("otpSecret not stored")
181179
return false
182180
}
183181
return showOtpFaceIDJWT(
@@ -396,7 +394,7 @@ struct ContentView: View {
396394
func terminator(endpoint: String, success: String, failure: String) async -> Bool {
397395
if let preparedRequest = baseRequest.prepare(
398396
pathComponents: ["api", endpoint],
399-
method: RequestMethod.post
397+
method: .post
400398
) {
401399
do {
402400
let (_, response) = try await preparedRequest.session.data(for: preparedRequest.request)
@@ -509,7 +507,7 @@ struct ContentView: View {
509507
return
510508
}
511509

512-
guard var preparedRequest = baseRequest.prepare(pathComponents: ["api", "login"], method: RequestMethod.post) else {
510+
guard var preparedRequest = baseRequest.prepare(pathComponents: ["api", "login"], method: .post) else {
513511
let msg = "Failed to prepare request for: /api/login"
514512
Log.error("\(msg)")
515513
errorMessage = msg

FileBrowserClient/FileBrowserClient/Views/FileDetailView.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ struct FileDetailView: View {
431431
URLQueryItem(name: "override", value: "false"),
432432
URLQueryItem(name: "rename", value: "false")
433433
],
434-
method: RequestMethod.patch
434+
method: .patch
435435
) else {
436436
let msg = "Failed to prepare request for: /api/resources/\(fromPath)"
437437
Log.error("\(msg)")
@@ -466,7 +466,7 @@ struct FileDetailView: View {
466466
func deleteFile() {
467467
guard let preparedRequest = baseRequest.prepare(
468468
pathComponents: ["api", "resources", file.path],
469-
method: RequestMethod.delete
469+
method: .delete
470470
) else {
471471
let msg = "Failed to prepare request for: /api/resources/\(file.path)"
472472
Log.error("\(msg)")

FileBrowserClient/FileBrowserClient/Views/FileListView.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2231,7 +2231,7 @@ struct FileListView: View {
22312231

22322232
guard let preparedRequest = baseRequest.prepare(
22332233
pathComponents: ["api", "users", String(currentSettings.id)],
2234-
method: RequestMethod.get
2234+
method: .get
22352235
) else {
22362236
let msg = "Failed to prepare request for: /api/users/\(currentSettings.id)"
22372237
Log.error("\(msg)")
@@ -2287,7 +2287,7 @@ struct FileListView: View {
22872287

22882288
guard var preparedRequest = baseRequest.prepare(
22892289
pathComponents: ["api", "users", String(currentSettings.id)],
2290-
method: RequestMethod.put
2290+
method: .put
22912291
) else {
22922292
let msg = "Failed to prepare request for: /api/users/\(currentSettings.id)"
22932293
Log.error("\(msg)")
@@ -2349,7 +2349,7 @@ struct FileListView: View {
23492349
for item in selectedItems {
23502350
guard let preparedRequest = baseRequest.prepare(
23512351
pathComponents: ["api", "resources", item.path],
2352-
method: RequestMethod.delete
2352+
method: .delete
23532353
) else {
23542354
let msg = "Failed to prepare request for: /api/resources/\(item.path)"
23552355
Log.error("\(msg)")
@@ -2390,7 +2390,7 @@ struct FileListView: View {
23902390
URLQueryItem(name: "override", value: "false"),
23912391
URLQueryItem(name: "rename", value: "false")
23922392
],
2393-
method: RequestMethod.patch
2393+
method: .patch
23942394
) else {
23952395
let msg = "Failed to prepare request for: \(item.name)"
23962396
Log.error("\(msg)")
@@ -2472,7 +2472,7 @@ struct FileListView: View {
24722472
Log.info("📄 Creating \(resourceType) at path: \(fullPath)")
24732473
guard let preparedRequest = baseRequest.prepare(
24742474
pathComponents: ["/api/resources\(encodedPath)\(separator)override=false"],
2475-
method: RequestMethod.post
2475+
method: .post
24762476
) else {
24772477
let msg = "Failed to prepare request for: /api/resources/\(fullPath)"
24782478
Log.error("\(msg)")

FileBrowserClient/FileBrowserClient/Views/ShareManagementView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ struct ShareManagementView: View {
7878
Log.info("Deleting share with hash: \(item.hash)")
7979
guard let preparedRequest = baseRequest.prepare(
8080
pathComponents: ["api", "share", item.hash],
81-
method: RequestMethod.delete
81+
method: .delete
8282
) else {
8383
let msg = "Failed to prepare request for: /api/share/\(item.hash)"
8484
Log.error("\(msg)")

FileBrowserClient/FileBrowserClient/Views/ShareSheetView.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ struct ShareSheetView: View {
145145
}
146146
guard let preparedRequest = baseRequest.prepare(
147147
pathComponents: ["api", "share", hash],
148-
method: RequestMethod.delete
148+
method: .delete
149149
) else {
150150
let msg = "Failed to prepare request for: /api/share/\(hash)"
151151
Log.error("\(msg)")
@@ -206,7 +206,7 @@ struct ShareSheetView: View {
206206
URLQueryItem(name: "expires", value: String(expiryTime)),
207207
URLQueryItem(name: "unit", value: shareDuration)
208208
],
209-
method: RequestMethod.post
209+
method: .post
210210
) else {
211211
let msg = "Failed to prepare request for: /api/share/\(file.path)"
212212
Log.error("\(msg)")

0 commit comments

Comments
 (0)