Shun Miyazawa 3 лет назад
Родитель
Сommit
4102a43e8f

+ 1 - 1
packages/app/src/components/CompleteUserRegistrationForm.tsx

@@ -95,7 +95,7 @@ const CompleteUserRegistrationForm: React.FC<Props> = (props: Props) => {
                 <div className="input-group-prepend">
                   <span className="input-group-text"><i className="icon-envelope"></i></span>
                 </div>
-                <input type="text" className="form-control" disabled value={email} />
+                <input type="text" className="form-control" placeholder={t('Email')} disabled value={email} />
               </div>
 
               <div className="input-group" id="input-group-username">

+ 3 - 2
packages/app/src/server/middlewares/inject-user-registration-order-by-token-middleware.ts

@@ -1,6 +1,7 @@
 import { Request, Response, NextFunction } from 'express';
 import createError from 'http-errors';
 
+import { UserActivationErrorCode } from '~/interfaces/errors/user-activation';
 import loggerFactory from '~/utils/logger';
 
 import UserRegistrationOrder, { IUserRegistrationOrder } from '../models/user-registration-order';
@@ -18,7 +19,7 @@ export default async(req: ReqWithUserRegistrationOrder, res: Response, next: Nex
   if (token == null) {
     const msg = 'Token not found';
     logger.error(msg);
-    return next(createError(400, msg, { code: 'token-not-found' }));
+    return next(createError(400, msg, { code: UserActivationErrorCode.TOKEN_NOT_FOUND }));
   }
 
   const userRegistrationOrder = await UserRegistrationOrder.findOne({ token });
@@ -27,7 +28,7 @@ export default async(req: ReqWithUserRegistrationOrder, res: Response, next: Nex
   if (userRegistrationOrder == null || userRegistrationOrder.isExpired() || userRegistrationOrder.isRevoked) {
     const msg = 'userRegistrationOrder is null or expired or revoked';
     logger.error(msg);
-    return next(createError(400, msg, { code: 'user-registration-order-is-not-appropriate' }));
+    return next(createError(400, msg, { code: UserActivationErrorCode.USER_REGISTRATION_ORDER_IS_NOT_APPROPRIATE }));
   }
 
   req.userRegistrationOrder = userRegistrationOrder;