Shun Miyazawa 3 лет назад
Родитель
Сommit
e14f6affdc
2 измененных файлов с 16 добавлено и 4 удалено
  1. 15 3
      packages/app/src/server/routes/forgot-password.ts
  2. 1 1
      packages/app/src/server/routes/index.js

+ 15 - 3
packages/app/src/server/routes/forgot-password.ts

@@ -1,7 +1,6 @@
 import {
 import {
   NextFunction, Request, RequestHandler, Response,
   NextFunction, Request, RequestHandler, Response,
 } from 'express';
 } from 'express';
-
 import createError from 'http-errors';
 import createError from 'http-errors';
 
 
 import loggerFactory from '~/utils/logger';
 import loggerFactory from '~/utils/logger';
@@ -11,6 +10,15 @@ import { ReqWithPasswordResetOrder } from '../middlewares/inject-reset-order-by-
 const logger = loggerFactory('growi:routes:forgot-password');
 const logger = loggerFactory('growi:routes:forgot-password');
 
 
 
 
+type Crowi = {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  nextApp: any,
+}
+
+type CrowiReq = Request & {
+  crowi: Crowi,
+}
+
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types, @typescript-eslint/no-explicit-any
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types, @typescript-eslint/no-explicit-any
 export const checkForgotPasswordEnabledMiddlewareFactory = (crowi: any, forApi = false) => {
 export const checkForgotPasswordEnabledMiddlewareFactory = (crowi: any, forApi = false) => {
 
 
@@ -33,8 +41,12 @@ export const checkForgotPasswordEnabledMiddlewareFactory = (crowi: any, forApi =
 
 
 };
 };
 
 
-export const forgotPassword = (req: Request, res: Response): void => {
-  return res.render('forgot-password');
+export const forgotPassword = (crowi: any) => {
+  return (req: CrowiReq, res: Response): void => {
+    const { nextApp } = crowi;
+    req.crowi = crowi;
+    nextApp.render(req, res, '/forgot-password');
+  };
 };
 };
 
 
 export const resetPassword = (req: ReqWithPasswordResetOrder, res: Response): void => {
 export const resetPassword = (req: ReqWithPasswordResetOrder, res: Response): void => {

+ 1 - 1
packages/app/src/server/routes/index.js

@@ -235,7 +235,7 @@ module.exports = function(crowi, app) {
 
 
   app.use('/forgot-password', express.Router()
   app.use('/forgot-password', express.Router()
     .use(forgotPassword.checkForgotPasswordEnabledMiddlewareFactory(crowi))
     .use(forgotPassword.checkForgotPasswordEnabledMiddlewareFactory(crowi))
-    .get('/', forgotPassword.forgotPassword)
+    .get('/', forgotPassword.forgotPassword(crowi))
     .get('/:token', injectResetOrderByTokenMiddleware, forgotPassword.resetPassword)
     .get('/:token', injectResetOrderByTokenMiddleware, forgotPassword.resetPassword)
     .use(forgotPassword.handleErrosMiddleware));
     .use(forgotPassword.handleErrosMiddleware));