Fix multi-value query values in APIGatewayV2

hummingbird-project · Mar 5, 2024 · 59b99fe · 59b99fe
1 parent a36500e
commit 59b99fe
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 16 deletions.
diff --git a/Sources/HummingbirdLambda/APIGatewayLambda.swift b/Sources/HummingbirdLambda/APIGatewayLambda.swift
@@ -57,7 +57,25 @@ extension HBLambda where Output == APIGatewayResponse {
 }
 
 // conform `APIGatewayRequest` to `APIRequest` so we can use HBRequest.init(context:application:from)
-extension APIGatewayRequest: APIRequest {}
+extension APIGatewayRequest: APIRequest {
+    var queryString: String {
+        func urlPercentEncoded(_ string: String) -> String {
+            return string.addingPercentEncoding(withAllowedCharacters: .urlQueryComponentAllowed) ?? string
+        }
+        var queryParams: [String] = []
+        var queryStringParameters = self.queryStringParameters ?? [:]
+        // go through list of multi value query string params first, removing any
+        // from the single value list if they are found in the multi value list
+        self.multiValueQueryStringParameters?.forEach { multiValueQuery in
+            queryStringParameters[multiValueQuery.key] = nil
+            queryParams += multiValueQuery.value.map { "\(urlPercentEncoded(multiValueQuery.key))=\(urlPercentEncoded($0))" }
+        }
+        queryParams += queryStringParameters.map {
+            "\(urlPercentEncoded($0.key))=\(urlPercentEncoded($0.value))"
+        }
+        return queryParams.joined(separator: "&")
+    }
+}
 
 // conform `APIGatewayResponse` to `APIResponse` so we can use HBResponse.apiReponse()
 extension APIGatewayResponse: APIResponse {}
diff --git a/Sources/HummingbirdLambda/APIGatewayV2Lambda.swift b/Sources/HummingbirdLambda/APIGatewayV2Lambda.swift
@@ -65,6 +65,7 @@ extension APIGatewayV2Request: APIRequest {
     var httpMethod: AWSLambdaEvents.HTTPMethod { context.http.method }
     var multiValueQueryStringParameters: [String: [String]]? { nil }
     var multiValueHeaders: HTTPMultiValueHeaders { [:] }
+    var queryString: String { self.rawQueryString }
 }
 
 // conform `APIGatewayV2Response` to `APIResponse` so we can use HBResponse.apiReponse()

diff --git a/Sources/HummingbirdLambda/Request+APIGateway.swift b/Sources/HummingbirdLambda/Request+APIGateway.swift
@@ -23,8 +23,7 @@ import NIOCore
 protocol APIRequest {
     var path: String { get }
     var httpMethod: AWSLambdaEvents.HTTPMethod { get }
-    var queryStringParameters: [String: String]? { get }
-    var multiValueQueryStringParameters: [String: [String]]? { get }
+    var queryString: String { get }
     var headers: AWSLambdaEvents.HTTPHeaders { get }
     var multiValueHeaders: HTTPMultiValueHeaders { get }
     var body: String? { get }
@@ -44,19 +43,8 @@ extension HBRequest {
 
         // construct URI with query parameters
         var uri = from.path
-        var queryParams: [String] = []
-        var queryStringParameters = from.queryStringParameters ?? [:]
-        // go through list of multi value query string params first, removing any
-        // from the single value list if they are found in the multi value list
-        from.multiValueQueryStringParameters?.forEach { multiValueQuery in
-            queryStringParameters[multiValueQuery.key] = nil
-            queryParams += multiValueQuery.value.map { "\(urlPercentEncoded(multiValueQuery.key))=\(urlPercentEncoded($0))" }
-        }
-        queryParams += queryStringParameters.map {
-            "\(urlPercentEncoded($0.key))=\(urlPercentEncoded($0.value))"
-        }
-        if queryParams.count > 0 {
-            uri += "?\(queryParams.joined(separator: "&"))"
+        if from.queryString.count > 0 {
+            uri += "?\(from.queryString)"
         }
         // construct headers
         var authority: String?