diff --git a/src/routes/LoginRoute.js b/src/routes/LoginRoute.js index b1b7a9d..89d0292 100644 --- a/src/routes/LoginRoute.js +++ b/src/routes/LoginRoute.js @@ -7,10 +7,9 @@ function LoginRoute(req, res) { authUser(telegramResponse, (success, msg) => { if (success) { - // User is already logged in - if(req.session.user == telegramResponse.id){ - res.send({authorized: success}); + if (req.session.user == telegramResponse.id) { + res.send({ authorized: success }); return; } @@ -34,7 +33,6 @@ function LoginRoute(req, res) { res.status(401).send({ authorized: success, message: msg }); } }); - } function authUser(telegramResponse, done) { diff --git a/src/routes/TelegramWebhookRoute.js b/src/routes/TelegramWebhookRoute.js index 474c6f9..542ccbe 100644 --- a/src/routes/TelegramWebhookRoute.js +++ b/src/routes/TelegramWebhookRoute.js @@ -22,6 +22,7 @@ function TelegramWebhookRoute(req, res) { }); } } + }); } catch(e){ console.log("Could not get Telegram Message"); @@ -30,7 +31,7 @@ function TelegramWebhookRoute(req, res) { - res.send(); + res.send(); } function informContacts(telegramID, doneCallback=()=>{}){ @@ -64,26 +65,31 @@ function informContacts(telegramID, doneCallback=()=>{}){ } function userInfected(telegramID, doneCallback) { - User.findOne({ - where: { - telegram: telegramID, - }, - }).then((user) => { - if (!user) { - done({saved: false}); - } else { - user.isInfected = true; - user.save().then(result => { - if(result){ - - doneCallback({saved: true}); - } - }).catch(err=>{doneCallback({saved: false})}); - } + User.findOne({ + where: { + telegram: telegramID, + }, + }) + .then((user) => { + if (!user) { + done({ saved: false }); + } else { + user.isInfected = true; + user + .save() + .then((result) => { + if (result) { + doneCallback({ saved: true }); + } + }) + .catch((err) => { + doneCallback({ saved: false }); + }); + } }) - .catch(err=>{ - doneCallback({saved: false}); + .catch((err) => { + doneCallback({ saved: false }); }); } -exports.TelegramWebhookRoute = TelegramWebhookRoute; \ No newline at end of file +exports.TelegramWebhookRoute = TelegramWebhookRoute;