Merge pull request #4 from naresh97/development

Development

src/routes/LoginRoute.js

@@ -4,8 +4,15 @@ const { addContact, createUser } = require("../db/utils");
 
 function LoginRoute(req, res) {
   const telegramResponse = req.body.telegramResponse;
+
   authUser(telegramResponse, (success, msg) => {
     if (success) {
+      // User is already logged in
+      if (req.session.user == telegramResponse.id) {
+        res.send({ authorized: success });
+        return;
+      }
+
       const verified = req.session.verified;
       const verifiedBy = req.session.verifiedBy;
       req.session.regenerate(() => {

src/routes/TelegramWebhookRoute.js

@@ -3,80 +3,93 @@ const { User, Contact } = require("../db/db");
 const { sendTelegramMessage } = require("../telegram");
 
 function TelegramWebhookRoute(req, res) {
-
-    try{
-        const messageText = req.body.message.text;
-        const telegramID = req.body.message.from.id;
-        if (messageText.toLowerCase() == "/covidpositive") {
-            userInfected(telegramID, (result) => {
-                if(result.saved){
-                    sendTelegramMessage(telegramID, "Thanks for informing us. We will notify the people you were in contact with!", ()=>{});
-                    informContacts(telegramID, ()=>{});
-                }else{
-                    sendTelegramMessage(telegramID, "Sorry, something went wrong.", ()=>{});
-                }
-            });
+  try {
+    const messageText = req.body.message.text;
+    const telegramID = req.body.message.from.id;
+    if (messageText.toLowerCase() == "/covidpositive") {
+      userInfected(telegramID, (result) => {
+        if (result.saved) {
+          sendTelegramMessage(
+            telegramID,
+            "Thanks for informing us. We will notify the people you were in contact with!",
+            () => {}
+          );
+          informContacts(telegramID, () => {});
+        } else {
+          sendTelegramMessage(
+            telegramID,
+            "Sorry, something went wrong.",
+            () => {}
+          );
         }
+      });
     }
-    catch(e){
-        console.log("Could not get Telegram Message");
-    }
-    
+  } catch (e) {
+    console.log("Could not get Telegram Message");
+  }
 
-    res.send();
+  res.send();
 }
 
-function informContacts(telegramID, doneCallback){
-    User.findOne({
+function informContacts(telegramID, doneCallback) {
+  User.findOne({
+    where: {
+      telegram: telegramID,
+    },
+  }).then((user) => {
+    if (user) {
+      const userRowID = user.id;
+      Contact.findAll({
         where: {
-            telegram: telegramID,
-        }
-    }).then(user => {
-        if(user){
-            const userRowID = user.id;
-            Contact.findAll({
-                where: {
-                    [Op.or]: [{user: userRowID}, {with: userRowID}],
-                }
-            })
-            .then(result => {
-                result.forEach(contact => {
-                    const otherPersonID = contact.user == userRowID ? contact.with : contact.user;
-                    User.findOne({
-                        where: {
-                            id: otherPersonID,
-                        }
-                    }).then(otherPerson => {
-                        sendTelegramMessage(otherPerson.telegram, "You're infected.", ()=>{});
-                    });
-                });
-            });
-        }
-    });
-
+          [Op.or]: [{ user: userRowID }, { with: userRowID }],
+        },
+      }).then((result) => {
+        result.forEach((contact) => {
+          const otherPersonID =
+            contact.user == userRowID ? contact.with : contact.user;
+          User.findOne({
+            where: {
+              id: otherPersonID,
+            },
+          }).then((otherPerson) => {
+            sendTelegramMessage(
+              otherPerson.telegram,
+              "You're infected.",
+              () => {}
+            );
+          });
+        });
+      });
+    }
+  });
 }
 
 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;
+exports.TelegramWebhookRoute = TelegramWebhookRoute;