add support for checkpoint verification

igdmapps · Sep 20, 2018 · 8f76506 · ailton123 · Dec 4, 2018 · 8f76506
1 parent 2e6ad17
commit 8f76506
Show file tree

Hide file tree

Showing 5 changed files with 113 additions and 8 deletions.
diff --git a/browser/checkpoint.html b/browser/checkpoint.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <title>IG:dm - Instagram Desktop Messenger</title>
+    <meta charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
+    <link rel="stylesheet" type="text/css" href="../node_modules/bootstrap/dist/css/bootstrap.min.css">
+    <link rel="stylesheet" type="text/css" href="css/login.css">
+  </head>
+  <body>
+    <div class="container cardBox pb-5 pt-3 pt-sm-5">
+      <form class="pageCard mx-auto p-4 p-sm-5">
+        <div class="clearfix welcomeBox"><span class="d-block text-center">Please enter the verification code sent to your e-mail address</span></div>
+        <div class="input-group loginInputs mt-4">
+          <input class="form-control code" type="text" name="code" required="true" placeholder="Code">
+        </div>
+        <button class="loginButton mt-3 btn btn-primary" type="submit">Submit Code</button><span class="d-block errorMessage text-center mt-3" id="error"></span>
+      </form>
+    </div>
+    <script type="text/javascript" src="js/checkpoint.js"></script>
+  </body>
+</html>
diff --git a/browser/js/checkpoint.js b/browser/js/checkpoint.js
@@ -0,0 +1,13 @@
+var electron = require('electron');
+var ipcRenderer = electron.ipcRenderer;
+
+document.addEventListener('DOMContentLoaded', () => {
+  document.querySelector('form').onsubmit = (e) => {
+    e.preventDefault()
+    let button = document.querySelector('button[type=submit]');
+    button.innerText = 'Submitting code...'
+    button.classList.add('loggingIn', 'disabled');
+    const code = document.querySelector('input[name=code]').value;
+    ipcRenderer.send('checkpointCode', {code})
+  }
+})
diff --git a/browser/views/checkpoint.pug b/browser/views/checkpoint.pug
@@ -0,0 +1,15 @@
+extends _layout
+
+append head
+  link(rel='stylesheet', type='text/css', href='css/login.css')
+
+block content
+  .container.cardBox.pb-5.pt-3.pt-sm-5
+    form.pageCard.mx-auto.p-4.p-sm-5
+      .clearfix.welcomeBox
+        span.d-block.text-center Please enter the verification code sent to your e-mail address
+      .input-group.loginInputs.mt-4
+        input.form-control.code(type='text', name='code', required='true', placeholder='Code')
+      button.loginButton.mt-3.btn.btn-primary(type='submit') Submit Code
+      span#error.d-block.errorMessage.text-center.mt-3
+  script(type='text/javascript', src='js/checkpoint.js')
diff --git a/main/instagram.js b/main/instagram.js
@@ -18,8 +18,10 @@ exports.checkAuth = function (session) {
   });
 }
 
-exports.login = function (username, password) {
-  utils.clearCookieFiles();
+exports.login = function (username, password, keepLastSession) {
+  if (!keepLastSession) {
+    utils.clearCookieFiles();
+  }
   return new Promise((resolve, reject) => {
     const device = utils.getDevice(username);
     const storage = utils.getCookieStorage(`${username}.json`);
@@ -31,6 +33,14 @@ exports.logout = function () {
   utils.clearCookieFiles();
 }
 
+exports.isCheckpointError = (error) => {
+  return (error instanceof Client.Exceptions.CheckpointError)
+}
+
+exports.startCheckpoint = (error) => {
+  return Client.Web.Challenge.resolve(error, 'email')
+}
+
 exports.getChatList = function (session) {
   return new Promise((resolve, reject) => {
     var feed = new Client.Feed.Inbox(session, 10);

diff --git a/main/main.js b/main/main.js
@@ -48,6 +48,22 @@ function createWindow () {
   mainWindow.on('closed', () => mainWindow = null)
 }
 
+function createCheckpointWindow() {
+  const checkpointWindow = new BrowserWindow({
+    width: 300,
+    height: 300,
+    resizable: false,
+    icon: `${__dirname}/../browser/img/icon.png`,
+  })
+  checkpointWindow.setTitle('IG:dm - Instagram verification code')
+  checkpointWindow.loadURL(url.format({
+    pathname: path.join(__dirname, '../browser/checkpoint.html'),
+    protocol: 'file:',
+    slashes: true
+  }))
+  return checkpointWindow
+}
+
 function getChatList () {
   instagram.getChatList(session).then((chats) => {
     mainWindow.webContents.send('chatList', chats)
@@ -73,6 +89,20 @@ function getChat (evt, id) {
   }).catch(() => setTimeout(getChat, RATE_LIMIT_DELAY, evt, id))
 }
 
+function handleCheckpoint (checkpointError) {
+  return new Promise((resolve, reject) => {
+    instagram.startCheckpoint(checkpointError)
+      .then((challenge) => {
+        const cpWindow = createCheckpointWindow()
+        electron.ipcMain.on('checkpointCode', (evt, data) => {
+          electron.ipcMain.removeAllListeners('checkpointCode')
+          cpWindow.close()
+          challenge.code(data.code).then(resolve).catch(reject)
+        })
+      }).catch(reject)
+  })
+}
+
 app.on('ready', () => {
   createWindow();
   // only set the menu template when in production mode/
@@ -110,18 +140,32 @@ electron.ipcMain.on('login', (evt, data) => {
   if(data.username === "" || data.password === "") {
     return mainWindow.webContents.send('loginError', "Please enter all required fields");
   }
-  instagram.login(data.username, data.password).then((session_) => {
-    session = session_
-    createWindow()
-  }).catch((error) => {
+  const login = (keepLastSession) => {
+    instagram.login(data.username, data.password, keepLastSession).then((session_) => {
+      session = session_
+      createWindow()
+    }).catch((error) => {
+      if (instagram.isCheckpointError(error)) {
+        handleCheckpoint(error)
+          .then(() => login(true))
+          .catch(() => mainWindow.webContents.send('loginError', getErrorMsg(error)))
+      } else {
+        mainWindow.webContents.send('loginError', getErrorMsg(error));
+      }
+    })
+  }
+
+  const getErrorMsg = (error) => {
     let message = 'An unknown error occurred.';
     if (error.message) {
       message = error.message;
     } else if (error.hasOwnProperty('json') && !!error.json.two_factor_required) {
       message = 'You have two factor authentication enabled. Two factor authentication is not yet supported.';
     }
-    mainWindow.webContents.send('loginError', message);
-  })
+    return message
+  }
+
+  login()
 })
 
 electron.ipcMain.on('logout', () => {