fix callbackURL in DiscordRouter

Sources/ImperialDiscord/DiscordCallbackBody.swift

@@ -8,14 +8,12 @@ struct DiscordCallbackBody: Content {
     let grantType: String
     let code: String
     let redirectUri: String
-    let scope: String
 
     enum CodingKeys: String, CodingKey {
         case clientId = "client_id"
         case clientSecret = "client_secret"
         case grantType = "grant_type"
         case code
         case redirectUri = "redirect_uri"
-        case scope
     }
 }

Sources/ImperialDiscord/DiscordRouter.swift

@@ -1,13 +1,13 @@
-import Vapor
 import Foundation
+import Vapor
 
 public class DiscordRouter: FederatedServiceRouter {
-
     public static var baseURL: String = "https://discord.com/"
     public static var callbackURL: String = "callback"
     public let tokens: FederatedServiceTokens
     public let callbackCompletion: (Request, String) throws -> (EventLoopFuture<ResponseEncodable>)
     public var scope: [String] = []
+    public var requiredScopes = ["identify"]
     public let callbackURL: String
     public let accessTokenURL: String = "\(DiscordRouter.baseURL.finished(with: "/"))api/oauth2/token"
     public let service: OAuthService = .discord
@@ -20,16 +20,17 @@ public class DiscordRouter: FederatedServiceRouter {
     }
 
     public func authURL(_ request: Request) throws -> String {
+        let allScopes = scope + requiredScopes
 
         var components = URLComponents()
         components.scheme = "https"
         components.host = "discord.com"
         components.path = "/api/oauth2/authorize"
         components.queryItems = [
             clientIDItem,
-            .init(name: "redirect_uri", value: DiscordRouter.callbackURL),
+            .init(name: "redirect_uri", value: callbackURL),
             .init(name: "response_type", value: "code"),
-            scopeItem
+            .init(name: "scope", value: allScopes.joined(separator: " "))
         ]
 
         guard let url = components.url else {
@@ -45,9 +46,7 @@ public class DiscordRouter: FederatedServiceRouter {
             clientSecret: tokens.clientSecret,
             grantType: "authorization_code",
             code: code,
-            redirectUri: DiscordRouter.callbackURL,
-            scope: scope.joined(separator: " ")
+            redirectUri: callbackURL
         )
     }
-
 }

docs/Discord/README.md

@@ -15,3 +15,9 @@ You can use Discord with the `ImperialDiscord` package. This expects two environ
 Additionally you must set `DiscordRouter.callbackURL` to an valid Redirect URL you added in the Developer Portal.
 
 You can then register the OAuth provider like normal.
+
+### References
+
+Some potentially useful references:
+
+* [Discord OAuth2 scopes](https://discord.com/developers/docs/topics/oauth2#shared-resources-oauth2-scopes)