🤖 Merge PR DefinitelyTyped#73094 refactor: changed RequestHandler and ErrorRequestHandler return type to unknown by @beejay141

Author: beejay141

types/express-oauth-server/express-oauth-server-tests.ts

@@ -56,12 +56,12 @@ let resultingTokenMiddleware: (
     request: express.Request,
     response: express.Response,
     next: express.NextFunction,
-) => Promise<void>;
+) => Promise<OAuth2Server.Token>;
 let resultingAuthorizationCodeMiddleware: (
     request: express.Request,
     response: express.Response,
     next: express.NextFunction,
-) => Promise<void>;
+) => Promise<OAuth2Server.AuthorizationCode>;
 
 oAuthServer = expressOAuthServer.server;
 resultingTokenMiddleware = expressOAuthServer.authenticate();

types/express-oauth-server/index.d.ts

@@ -17,19 +17,19 @@ declare class ExpressOAuthServer {
         request: express.Request,
         response: express.Response,
         next: express.NextFunction,
-    ) => Promise<void>;
+    ) => Promise<OAuth2Server.Token>;
 
     authorize(options?: OAuth2Server.AuthorizeOptions): (
         request: express.Request,
         response: express.Response,
         next: express.NextFunction,
-    ) => Promise<void>;
+    ) => Promise<OAuth2Server.AuthorizationCode>;
 
     token(options?: OAuth2Server.TokenOptions): (
         request: express.Request,
         response: express.Response,
         next: express.NextFunction,
-    ) => Promise<void>;
+    ) => Promise<OAuth2Server.Token>;
 }
 
 export = ExpressOAuthServer;

types/express-serve-static-core/index.d.ts

@@ -61,7 +61,7 @@ export interface RequestHandler<
         req: Request<P, ResBody, ReqBody, ReqQuery, LocalsObj>,
         res: Response<ResBody, LocalsObj>,
         next: NextFunction,
-    ): void | Promise<void>;
+    ): unknown;
 }
 
 export type ErrorRequestHandler<
@@ -75,7 +75,7 @@ export type ErrorRequestHandler<
     req: Request<P, ResBody, ReqBody, ReqQuery, LocalsObj>,
     res: Response<ResBody, LocalsObj>,
     next: NextFunction,
-) => void | Promise<void>;
+) => unknown;
 
 export type PathParams = string | RegExp | Array<string | RegExp>;
 

types/logfmt/logfmt-tests.ts

@@ -44,15 +44,14 @@ const app = express();
 app.use(logfmt.bodyParserStream());
 app.post("/logs", (req, res) => {
     if (!req.body) {
-        res.send("OK");
-        return;
+        return res.send("OK");
     }
 
     req.body.pipe(through((line) => {
         console.dir(line);
     }));
 
-    res.send("OK");
+    return res.send("OK");
 });
 
 const app2 = express();

types/mock-req-res/mock-req-res-tests.ts

@@ -2,7 +2,7 @@ import { Request, RequestHandler, Response } from "express";
 import { mockRequest, mockResponse } from "mock-req-res";
 
 const handler: RequestHandler = (req: Request, res: Response) => {
-    res.status(200).json(`Hello from handler with an originalUrl value of '${req.originalUrl}'`);
+    return res.status(200).json(`Hello from handler with an originalUrl value of '${req.originalUrl}'`);
 };
 
 const req = mockRequest({ originalUrl: "/" });

types/swaggerize-express/swaggerize-express-tests.ts

@@ -27,9 +27,7 @@ app.use(swaggerize({
         "api": {
             "v1": {
                 "version": {
-                    "$get": (req: express.Request, res: express.Response) => {
-                        res.send("v1");
-                    },
+                    "$get": (req: express.Request, res: express.Response) => res.send("v1"),
                 },
             },
         },