Mesto Russia (sprint 16): fix after 2 review

MalakhN · May 18, 2023 · 3051172 · 3051172
1 parent 4539ccb
commit 3051172
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 15 deletions.
diff --git a/backend/controllers/users.js b/backend/controllers/users.js
@@ -22,7 +22,7 @@ const getUserById = (req, res, next) => {
       if (!user) {
         throw new NotFoundError('Пользователь не найден');
       } else {
-        res.send({ data: user });
+        res.send(user);
       }
     })
     .catch((err) => {
@@ -40,7 +40,7 @@ const getUserInfo = (req, res, next) => {
       if (!user) {
         throw new NotFoundError('Пользователь не найден');
       } else {
-        res.send({ data: user });
+        res.send(user);
       }
     })
     .catch((err) => {
@@ -59,7 +59,7 @@ const createUser = (req, res, next) => {
   bcrypt
     .hash(req.body.password, 10)
     .then((hash) => User.create({
-      name, about, avatar, email, password: hash
+      email, password: hash, name, about, avatar
     }))
     .then((newUser) => {
       res.status(201).send({
@@ -124,7 +124,7 @@ const updateProfile = (req, res, next) => {
       if (!user) {
         throw new NotFoundError('Пользователь с данным id не найден');
       } else {
-        res.send({ data: user });
+        res.send(user);
       }
     })
     .catch((err) => {
@@ -151,7 +151,7 @@ const updateAvatar = (req, res, next) => {
       if (!user) {
         throw new NotFoundError('Пользователь с данным id не найден');
       } else {
-        res.send({ data: user });
+        res.send(user);
       }
     })
     .catch((err) => {

diff --git a/frontend/src/components/App.js b/frontend/src/components/App.js
@@ -27,10 +27,7 @@ function App() {
     link: "",
   });
   const [isConfirmPopupOpen, setIsConfirmPopupOpen] = React.useState(false);
-  const [currentUser, setCurrentUser] = React.useState({
-    name: "",
-    about: "",
-  });
+  const [currentUser, setCurrentUser] = React.useState({});
   const [cards, setCards] = React.useState([]);
   const [isTooltipOpen, setIsTooltipOpen] = React.useState(false);
   const [loggedIn, setLoggedIn] = React.useState(false);
@@ -82,6 +79,7 @@ function App() {
       .authorization(email, password)
       .then((data) => {
         if (data.token) {
+          localStorage.setItem('token', data.token)
           setEmail("");
           handleLogin();
           navigate("/main", { replace: true });

diff --git a/frontend/src/utils/auth.js b/frontend/src/utils/auth.js
@@ -28,12 +28,6 @@ class Auth {
       body: JSON.stringify({ email: `${email}`, password: `${password}` }),
     })
       .then(this._checkResponse)
-      .then((data) => {
-        if (data.token) {
-          localStorage.setItem("token", data.token);
-          return data;
-        }
-      });
   }
 
   // Публичный метод проверки валидности токена и получения email для вставки в шапку сайта