Merge pull request #380 from SkyAjax/feature-reset-password

[#355] Feature reset password
hexlet-rus · Sep 18, 2023 · adc5e15 · adc5e15
2 parents f396268 + c2e847a
commit adc5e15
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 2 deletions.
diff --git a/backend/src/users/users.controller.ts b/backend/src/users/users.controller.ts
@@ -101,6 +101,14 @@ export class UsersController {
     return this.usersService.recover(recoverUserDto);
   }
 
+  @Get('recover/:hash')
+  @UseFilters(new HttpValidationFilter())
+  @ApiParam({ name: 'hash', description: 'Hash key for user recovery!' })
+  @ApiOkResponse({ description: 'Successfully checked recovery hash key' })
+  async checkHash(@Param('hash') hash: string) {
+    return this.usersService.checkHash(hash);
+  }
+
   @Post('recover/:hash')
   @UseFilters(new HttpValidationFilter())
   @ApiParam({ name: 'hash', description: 'Hash key for user password reset!' })

diff --git a/backend/src/users/users.service.ts b/backend/src/users/users.service.ts
@@ -89,6 +89,16 @@ export class UsersService {
     }
   }
 
+  async checkHash(hash: string): Promise<{ id: number | null }> {
+    const email = await decipher(Buffer.from(hash, 'hex'));
+    const currentUser = await this.find(email);
+
+    if (currentUser && currentUser.recover_hash === hash) {
+      return { id: currentUser.id };
+    }
+    return { id: null };
+  }
+
   async resetPassword(
     { password }: UpdateUserDto,
     hash,

diff --git a/frontend/src/pages/reset-password/index.jsx b/frontend/src/pages/reset-password/index.jsx
@@ -1,5 +1,8 @@
+import { useEffect, useState } from 'react';
+import axios from 'axios';
+
 import { useTranslation } from 'react-i18next';
-import { useNavigate } from 'react-router-dom';
+import { useNavigate, useParams } from 'react-router-dom';
 
 import Col from 'react-bootstrap/Col';
 import Container from 'react-bootstrap/Container';
@@ -8,12 +11,23 @@ import Row from 'react-bootstrap/Row';
 import routes from '../../routes.js';
 
 import ResetPasswordForm from '../../components/Forms/ResetPasswordForm';
+import NotFoundPage from '../404';
 
 function ResetPasswordPage() {
   const { t } = useTranslation();
   const navigate = useNavigate();
+  const { hash } = useParams();
+  const [userId, setUserId] = useState(false);
+
+  useEffect(() => {
+    const checkHash = async () => {
+      const { data } = await axios.get(`${routes.resetPassPath()}/${hash}`);
+      setUserId(data.id);
+    };
+    checkHash();
+  }, [userId, hash]);
 
-  return (
+  return userId ? (
     <div className="page-bg-image">
       <Container className="h-100" fluid="sm">
         <Row className="justify-content-center align-items-center m-auto py-3 py-sm-5 h-100">
@@ -30,6 +44,8 @@ function ResetPasswordPage() {
         </Row>
       </Container>
     </div>
+  ) : (
+    <NotFoundPage />
   );
 }