From 5c70adc77e6bdb4eb59decf14743f526c9d64d60 Mon Sep 17 00:00:00 2001 From: 3daddict Date: Sun, 14 Jun 2020 13:29:37 -0700 Subject: [PATCH] login js fix --- src/routes/auth/login.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/routes/auth/login.js b/src/routes/auth/login.js index 6c7225c..c37b857 100644 --- a/src/routes/auth/login.js +++ b/src/routes/auth/login.js @@ -4,16 +4,12 @@ export function post(req, res) { const user = req.body; api.post('auth/login', user ).then(response => { -<<<<<<< HEAD //Send the user and token object to the server for persistant data storage. //if (response.user) req.session.user = response.user; req.session.token = response.token; if (response.user) { req.session.user = response.user; req.session.token = response.token; } -======= - if (response.user) req.session.user = response.user; ->>>>>>> dev res.end(JSON.stringify(response)); }); }