Browse Source

done somthing

unknown 3 years ago
parent
commit
2bdf0744f5

+ 6 - 5
controllers/user.js

@@ -35,7 +35,7 @@ const saveAvatarForStatic = async (req, res, next) => {
 			status: 'success',
 			code: 200,
 			data: {
-				newUrl,
+				avatarUrl: newUrl,
 			},
 		});
 	} catch (e) {
@@ -80,11 +80,11 @@ const logIn = async (req, res, next) => {
 				data: 'UNAUTHORIZED',
 				message: 'Invalid credentials',
 			});
-
 		const id = user._id;
 		const payload = { id };
 		const token = jwt.sign(payload, SECRET_KEY, { expiresIn: '24h' });
-		const registration = user.name? false: true
+		let registration = false;
+		if (!user.name || !user.lastName || !user.avatarUrl) registration = true;
 		await UserModel.updateToken(id, token);
 		await UserModel.updateCode(id, '');
 		return res.status(200).json({
@@ -92,7 +92,7 @@ const logIn = async (req, res, next) => {
 			code: 200,
 			data: {
 				token,
-				registration
+				registration,
 			},
 		});
 	} catch (e) {
@@ -147,7 +147,8 @@ const updateCredentials = async (req, res, next) => {
 		const user = await UserModel.updateCredentials(id, req.body);
 		return res.status(200).json({
 			data: {
-				user},
+				...user,
+			},
 		});
 	} catch (e) {
 		next(e);

BIN
images/6202872a6f9ce92fa4bd0e1e/6-1.png


BIN
images/6202872a6f9ce92fa4bd0e1e/6-2.png


+ 13 - 6
routes/user.js

@@ -6,11 +6,18 @@ const guard = require('../helpers/guard');
 const upload = require('../helpers/upload');
 
 router
-	.post('/register', validation.registration, controllers.createNewUser)
-	.post('/login', validation.logIn, controllers.logIn)
-	.post('/logout', guard, controllers.logOut)
-	.patch('/users/current', [guard, validation.updateUser], controllers.updateCredentials)
+	.post('/auth/register', validation.registration, controllers.createNewUser)
+	.post('/auth/login', validation.logIn, controllers.logIn)
+	.post('/auth/logout', guard, controllers.logOut)
+	.patch(
+		'/users/current',
+		[guard, validation.updateUser],
+		controllers.updateCredentials
+	)
 	.get('/users/current', guard, controllers.getCurrent)
-	.patch('/avatars',[guard, upload.single('avatar'),
-	 validation.validateUploadAvatar],controllers.saveAvatarForStatic)
+	.patch(
+		'/users/avatar',
+		[guard, upload.single('avatar'), validation.validateUploadAvatar],
+		controllers.saveAvatarForStatic
+	);
 module.exports = router;