feat: add requestProcess helper for extracting data from requests

Author: dhensby

index.d.ts

@@ -210,6 +210,16 @@ declare namespace OAuth2Server {
         authorizationCodeLifetime?: number;
     }
 
+    interface TokenRequest {
+        grant_type: string;
+        client_assertion?: string;
+        client_assertion_type?: string;
+        client_id?: string;
+        client_secret?: string;
+        code_verifier?: string;
+        scope?: string;
+    }
+
     interface TokenOptions {
         /**
          * Lifetime of generated access tokens in seconds (default = 1 hour)
@@ -243,6 +253,11 @@ declare namespace OAuth2Server {
          * Additional supported grant types.
          */
         extendedGrantTypes?: Record<string, typeof AbstractGrantType>;
+
+        /**
+         * Request processor
+         */
+        requestProcessor?: ((request: Request) => TokenRequest)
     }
 
     interface AssertionCredential {

lib/handlers/token-handler.js

@@ -62,6 +62,7 @@ class TokenHandler {
     this.requireClientAuthentication = options.requireClientAuthentication || {};
     this.alwaysIssueNewRefreshToken = options.alwaysIssueNewRefreshToken !== false;
     this.enablePlainPKCE = options.enablePlainPKCE === true;
+    this.requestProcessor = options.requestProcessor;
   }
 
   /**
@@ -86,8 +87,13 @@ class TokenHandler {
     }
 
     try {
-      const client = await this.getClient(request, response);
-      const data = await this.handleGrantType(request, client);
+      const body = this.requestProcessor?.(request) ?? request.body;
+      const req = new Request({
+        ...request,
+        body,
+      });
+      const client = await this.getClient(req, response);
+      const data = await this.handleGrantType(req, client);
       const model = new TokenModel(data, {
         allowExtendedTokenAttributes: this.allowExtendedTokenAttributes,
       });
@@ -146,7 +152,9 @@ class TokenHandler {
     }
 
     try {
-      const client = await (isAssertion ? this.model.getClientFromAssertion?.(credentials) : this.model.getClient(credentials.clientId, credentials.clientSecret));
+      const client = await (isAssertion
+        ? this.model.getClientFromAssertion?.(credentials)
+        : this.model.getClient(credentials.clientId, credentials.clientSecret));
 
       if (!client) {
         throw new InvalidClientError('Invalid client: client is invalid');
@@ -204,7 +212,11 @@ class TokenHandler {
     }
 
     if (this.isClientAssertionRequest(request)) {
-      return { clientId: request.body.client_id, clientAssertion: request.body.client_assertion, clientAssertionType: request.body.client_assertion_type };
+      return {
+        clientId: request.body.client_id,
+        clientAssertion: request.body.client_assertion,
+        clientAssertionType: request.body.client_assertion_type,
+      };
     }
 
     if (pkce.isPKCERequest({ grantType, codeVerifier })) {