Add check-login

AstroCB · Jul 20, 2020 · 3fcab33 · 3fcab33
1 parent 1c7d241
commit 3fcab33
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 28 deletions.
diff --git a/src/check-login.js b/src/check-login.js
@@ -0,0 +1,32 @@
+const login = require("facebook-chat-api");
+const chalk = require("chalk");
+
+const tools = require("./tools");
+
+module.exports = (fail, succeed) => {
+    try {
+        const config = tools.loadConfig();
+        login({ "appState": config.appState }, tools.silentOpt, (err, api) => {
+            if (err) {
+                if (config.email && config.password) {
+                    login({ "email": config.email, "password": config.password },
+                        tools.silentOpt, (err, api) => {
+                            if (err) {
+                                fail()
+                            } else {
+                                // Re-login succeeded; need to update stored session
+                                tools.updateLogin(config, api);
+                                succeed();
+                            }
+                        });
+                } else {
+                    fail();
+                }
+            } else {
+                succeed();
+            }
+        });
+    } catch {
+        fail()
+    }
+}
diff --git a/src/mnotify.js b/src/mnotify.js
@@ -3,6 +3,7 @@
 // Locals
 const init = require("./init");
 const tools = require("./tools")
+const checkLogin = require("./check-login");
 
 // Stdlib
 const fs = require("fs");
@@ -17,7 +18,8 @@ const usage = require("command-line-usage");
 // Command-line args
 const argDefs = [
     { "name": "help", "alias": "h", "type": Boolean, "description": "Display this help message." },
-    { "name": "init", "type": Boolean, "description": "Initialize mnotify so that it can be used to send notifications." }
+    { "name": "init", "type": Boolean, "description": "Initialize mnotify so that it can be used to send notifications." },
+    { "name": "check-login", "alias": "c", "type": Boolean, "description": "Check whether your currently-stored login information is valid." }
 ];
 
 const helpSections = [
@@ -33,31 +35,22 @@ const helpSections = [
 ]
 
 function start() {
-    getStdin(input => {
+    tools.getStdin(input => {
         try {
-            loginWithConfig(load_config(), input);
+            loginWithConfig(tools.loadConfig(), input);
         } catch (e) {
             console.log(`${chalk.black.bgYellowBright.bold("WARN")} mnotify must \
 be configured before you can use it. Running ${chalk.blue("mnotify --init")}...\n`);
 
             init.init(success => {
                 if (!success) { return process.exit(1); }
 
-                loginWithConfig(load_config(), input);
+                loginWithConfig(tools.loadConfig(), input);
             });
         }
     });
 }
 
-function load_config() {
-    if (tools.configExists()) {
-        const config = fs.readFileSync(tools.getConfigPath());
-        return JSON.parse(config);
-    } else {
-        throw Error("Config not found");
-    }
-}
-
 function loginWithConfig(config, msg) {
     login({ "appState": config.appState }, tools.silentOpt, (err, api) => {
         if (err) {
@@ -67,7 +60,8 @@ function loginWithConfig(config, msg) {
                         if (err) {
                             failedLogin(config, msg, true)
                         } else {
-                            updateLogin(config, api)
+                            // Re-login succeeded; need to update stored session
+                            tools.updateLogin(config, api)
                             notify(config, api, msg);
                         }
                     });
@@ -109,20 +103,6 @@ Try again by running")} ${chalk.blue("mnotify --init")}${chalk.red(".")}`);
     });
 }
 
-function updateLogin(config, api) {
-    config.appState = api.getAppState();
-    fs.writeFile(tools.getConfigPath(), JSON.stringify(config), () => { });
-}
-
-function getStdin(cb) {
-    process.stdin.on('readable', () => {
-        const chunk = process.stdin.read();
-        if (chunk !== null) {
-            cb(chunk.toString());
-        }
-    });
-}
-
 function notify(config, api, msg) {
     api.sendMessage(`New message from mnotify: ${msg}`, config.recipient);
 }
@@ -140,6 +120,12 @@ if (require.main === module) {
         init.init(() => { });
     } else if (options.help) {
         printHelp();
+    } else if (options["check-login"]) {
+        checkLogin(() => {
+            console.log(`${chalk.red("Unable to load config. Try running ")}${chalk.blue("mnotify --init")}${chalk.red(".")}`);
+        }, () => {
+            console.log(chalk.green("Your current login is still valid."));
+        });
     } else {
         start();
     }

diff --git a/src/tools.js b/src/tools.js
@@ -15,12 +15,35 @@ exports.configExists = () => {
     return fs.existsSync(exports.getConfigDir());
 }
 
+exports.loadConfig = () => {
+    if (exports.configExists()) {
+        const config = fs.readFileSync(exports.getConfigPath());
+        return JSON.parse(config);
+    } else {
+        throw Error("Config not found");
+    }
+}
+
+exports.updateLogin = (config, api) => {
+    config.appState = api.getAppState();
+    fs.writeFile(exports.getConfigPath(), JSON.stringify(config), () => { });
+}
+
 exports.printHeader = () => {
     console.log(chalk.blue("======="));
     console.log(chalk.bgBlue("mnotify"));
     console.log(chalk.blue("======="));
 }
 
+exports.getStdin = cb => {
+    process.stdin.on('readable', () => {
+        const chunk = process.stdin.read();
+        if (chunk !== null) {
+            cb(chunk.toString());
+        }
+    });
+}
+
 // Stored options for common invocations
 
 exports.silentOpt = {