Merge pull request #387 from qutheory/json-fix

fix parsing of data in middleware
vapor · Jun 14, 2016 · 08f82b2 · 08f82b2
2 parents 4673559 + a72d01e
commit 08f82b2
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 9 deletions.
diff --git a/Sources/Vapor/Content/ContentMiddleware.swift b/Sources/Vapor/Content/ContentMiddleware.swift
@@ -1,8 +1,9 @@
 class ContentMiddleware: Middleware {
 
     func respond(to request: Request, chainingTo next: Responder) throws -> Response {
+        // mutable -- MUST be declared at top of function
         var request = request
-        
+
         request.data = Content(request: request)
 
         return try next.respond(to: request)

diff --git a/Sources/Vapor/Cookie/CookiesMiddleware.swift b/Sources/Vapor/Cookie/CookiesMiddleware.swift
@@ -1,5 +1,6 @@
 class CookiesMiddleware: Middleware {
     func respond(to request: Request, chainingTo next: Responder) throws -> Response {
+        // mutable -- MUST be declared at top of function
         var request = request
 
         if let cookie = request.headers["Cookie"] {

diff --git a/Sources/Vapor/FormURLEncoded/FormURLEncodedMiddleware.swift b/Sources/Vapor/FormURLEncoded/FormURLEncodedMiddleware.swift
@@ -1,12 +1,13 @@
 class FormURLEncodedMiddleware: Middleware {
     func respond(to request: Request, chainingTo next: Responder) throws -> Response {
-
-        if 
+        // mutable -- MUST be declared at top of function
+        var request = request
+
+        if
             case .buffer(let data) = request.body,
             let contentType = request.contentType
             where contentType.contains("application/x-www-form-urlencoded")
         {
-            var request = request
             request.formURLEncoded = StructuredData(formURLEncoded: data)
         }
 

diff --git a/Sources/Vapor/JSON/JSONMiddleware.swift b/Sources/Vapor/JSON/JSONMiddleware.swift
@@ -1,13 +1,14 @@
 class JSONMiddleware: Middleware {
     func respond(to request: Request, chainingTo next: Responder) throws -> Response {
-
+        // mutable -- MUST be declared at top of function
+        var request = request
+
         // Parse Request JSON
-        if 
+        if
             case .buffer(let data) = request.body,
             let contentType = request.contentType
             where contentType.contains("application/json")
         {
-            var request = request
             do {
                 request.json = try JSON(data)
             } catch {

diff --git a/Sources/Vapor/Multipart/MultipartMiddleware.swift b/Sources/Vapor/Multipart/MultipartMiddleware.swift
@@ -1,12 +1,13 @@
 class MultipartMiddleware: Middleware {
     func respond(to request: Request, chainingTo next: Responder) throws -> Response {
+        // mutable -- MUST be declared at top of function
+        var request = request
 
-        if 
+        if
             case .buffer(let data) = request.body,
             let contentType = request.contentType
             where contentType.contains("multipart/form-data")
         {
-            var request = request
             do {
                 let boundary = try Multipart.parseBoundary(contentType: contentType)
                 request.multipart = Multipart.parse(data, boundary: boundary)

diff --git a/Sources/Vapor/Query/QueryMiddleware.swift b/Sources/Vapor/Query/QueryMiddleware.swift
@@ -1,6 +1,7 @@
 class QueryMiddleware: Middleware {
 
     func respond(to request: Request, chainingTo next: Responder) throws -> Response {
+        // mutable -- MUST be declared at top of function
         var request = request
 
         if let queryString = request.uri.query {

diff --git a/Sources/Vapor/Session/SessionMiddleware.swift b/Sources/Vapor/Session/SessionMiddleware.swift
@@ -15,6 +15,7 @@ class SessionMiddleware: Middleware {
     }
 
     func respond(to request: Request, chainingTo chain: Responder) throws -> Response {
+        // mutable -- MUST be declared at top of function
         var request = request
 
         if