check for valid token.

bradgarropy · Dec 21, 2019 · ad87671 · ad87671
1 parent 23a6ee4
commit ad87671
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 7 deletions.
diff --git a/src/github.js b/src/github.js
@@ -1,4 +1,4 @@
-const {getOctokit} = require("./octokit")
+const {createOctokit, getOctokit} = require("./octokit")
 
 const getRateLimit = async () => {
     const octokit = getOctokit()
@@ -8,6 +8,18 @@ const getRateLimit = async () => {
     console.log(`${remaining}/${limit} remaining`)
 }
 
+const validToken = async token => {
+    const octokit = createOctokit(token)
+
+    try {
+        await octokit.users.getAuthenticated()
+    } catch (error) {
+        return false
+    }
+
+    return true
+}
+
 const getLabels = async (owner, repo) => {
     const parameters = {
         owner,
@@ -61,6 +73,7 @@ const createLabels = async (labels, owner, repo) => {
 
 module.exports = {
     getRateLimit,
+    validToken,
     getLabels,
     deleteLabels,
     createLabels,

diff --git a/src/handlers.js b/src/handlers.js
@@ -1,5 +1,6 @@
 const conf = require("conf")
 const clone = require("./clone")
+const {validToken} = require("./github")
 const {createOctokit} = require("./octokit")
 
 const config = new conf()
@@ -13,15 +14,17 @@ const loginHandler = async argv => {
         return
     }
 
-    const octokit = createOctokit(token)
+    const valid = await validToken(token)
 
-    try {
-        await octokit.users.getAuthenticated()
-        config.set({username, token})
-        console.log("Login successful!")
-    } catch (error) {
+    if (!valid) {
         console.log("Login failed! Please try again.")
+        return
     }
+
+    config.set({username, token})
+    console.log("Login successful!")
+
+    return
 }
 
 const logoutHandler = () => {