Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions Storage/Sources/API/StorageObjectAPI.swift
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,7 @@ extension StorageObjectAPI {
public final class GoogleCloudStorageObjectAPI: StorageObjectAPI {
let endpoint = "https://www.googleapis.com/storage/v1/b"
let uploadEndpoint = "https://www.googleapis.com/upload/storage/v1/b"
let mediaDownloadEndpoint = "https://storage.googleapis.com"
let request: GoogleCloudStorageRequest

init(request: GoogleCloudStorageRequest) {
Expand Down Expand Up @@ -382,10 +383,7 @@ public final class GoogleCloudStorageObjectAPI: StorageObjectAPI {
public func getMedia(bucket: String, object: String, range: ClosedRange<Int>?, queryParameters: [String: String]?) -> EventLoopFuture<GoogleCloudStorgeDataResponse> {
var queryParams = ""
if var queryParameters = queryParameters {
queryParameters["alt"] = "media"
queryParams = queryParameters.queryParameters
} else {
queryParams = "alt=media"
}

var headers: HTTPHeaders = [:]
Expand All @@ -394,7 +392,7 @@ public final class GoogleCloudStorageObjectAPI: StorageObjectAPI {
headers.add(name: "Range", value: "bytes=\(range.lowerBound)-\(range.upperBound)")
}

return request.send(method: .GET, headers: headers, path: "\(endpoint)/\(bucket)/o/\(object)", query: queryParams)
return request.send(method: .GET, headers: headers, path: "\(mediaDownloadEndpoint)/\(bucket)/\(object)", query: queryParams)
}

public func createSimpleUpload(bucket: String,
Expand Down