fix: token

orkestral · Mar 31, 2021 · b75c51a · b75c51a · jonalan7 · Mar 31, 2021
1 parent 074dc28
commit b75c51a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/src/api/layers/host.layer.ts b/src/api/layers/host.layer.ts
@@ -61,7 +61,7 @@ import { scrapeImg } from '../helpers';
 import {
   asciiQr,
   isAuthenticated,
-  isInsideChat,
+  isInsideChats,
   needsToScan,
   retrieveQR,
 } from '../../controllers/auth';
@@ -235,11 +235,11 @@ export class HostLayer {
   }
 
   public async waitForInChat() {
-    let inChat = await isInsideChat(this.page);
+    let inChat = await isInsideChats(this.page);
 
     while (inChat === false) {
       await sleep(200);
-      inChat = await isInsideChat(this.page);
+      inChat = await isInsideChats(this.page);
     }
     return inChat;
   }
@@ -262,8 +262,17 @@ export class HostLayer {
       .catch(() => {});
 
     this.spin('Checking is logged...');
+
     let authenticated = await isAuthenticated(this.page).catch(() => null);
+
+    if (typeof authenticated === 'object') {
+      this.spin(`Error http: ${authenticated.type}`, 'fail');
+      this.page.close();
+      throw `Error http: ${authenticated.type}`;
+    }
+
     this.startAutoClose();
+
     if (authenticated === false) {
       this.spin('Waiting for QRCode Scan...');
       statusFind && statusFind('notLogged', this.session);

diff --git a/src/controllers/browser.ts b/src/controllers/browser.ts
@@ -72,15 +72,14 @@ export async function initWhatsapp(
 ): Promise<Page> {
   const waPage: Page = await getWhatsappPage(browser);
   if (waPage != null) {
-    // Auth with token
-    await auth_InjectToken(waPage, session, options, token);
     await waPage.setUserAgent(useragentOverride);
-
     const timeout = 2 * 1000;
     await Promise.race([
       waPage.goto(puppeteerConfig.whatsappUrl, { timeout }).catch(() => {}),
       waPage.waitForSelector('body', { timeout }).catch(() => {}),
     ]);
+    // Auth with token
+    await auth_InjectToken(waPage, session, options, token);
     return waPage;
   }
 }