Fix issue with Vapor returning false for missing body parameters

brokenhandsio · Jan 1, 2025 · a1da23f · a1da23f
1 parent 48a97c9
commit a1da23f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Sources/VaporOAuth/RouteHandlers/AuthorizePostHandler.swift b/Sources/VaporOAuth/RouteHandlers/AuthorizePostHandler.swift
@@ -83,7 +83,7 @@ struct AuthorizePostHandler {
             throw Abort(.badRequest)
         }
 
-        guard let approveApplication: Bool = request.content[OAuthRequestParameters.applicationAuthorized] else {
+        guard let approveApplicationReceived: Bool? = request.content[OAuthRequestParameters.applicationAuthorized], let approveApplication = approveApplicationReceived else {
             throw Abort(.badRequest)
         }
 

diff --git a/Sources/VaporOAuth/Utilities/StringDefines.swift b/Sources/VaporOAuth/Utilities/StringDefines.swift
@@ -1,4 +1,4 @@
-struct OAuthRequestParameters {
+enum OAuthRequestParameters {
     static let clientID = "client_id"
     static let clientSecret = "client_secret"
     static let redirectURI = "redirect_uri"
@@ -15,7 +15,7 @@ struct OAuthRequestParameters {
     static let token = "token"
 }
 
-struct OAuthResponseParameters {
+enum OAuthResponseParameters {
 
     static let error = "error"
     static let errorDescription = "error_description"
@@ -31,7 +31,7 @@ struct OAuthResponseParameters {
     static let email = "email_address"
     static let expiry = "exp"
 
-    struct ErrorType {
+    enum ErrorType {
         static let invalidRequest = "invalid_request"
         static let invalidScope = "invalid_scope"
         static let invalidClient = "invalid_client"
@@ -42,11 +42,11 @@ struct OAuthResponseParameters {
     }
 }
 
-struct ResponseType {
+enum ResponseType {
     static let code = "code"
     static let token = "token"
 }
 
-struct SessionData {
+enum SessionData {
     static let csrfToken = "CSRFToken"
 }