@auxcode/auxta 1.3.51-beta.13 → 1.3.51-beta.14

package/build/cjs/macros/helpers/AuxGoogleAuth.js

@@ -14,10 +14,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuxGoogleAuth = void 0;
 const config_1 = require("../../auxta/configs/config");
-const fs = require('fs');
-const readline = require('readline');
 const puppeteer_1 = __importDefault(require("../../puppeteer/puppeteer"));
 const code_helper_1 = __importDefault(require("../helpers/code.helper"));
+const status_of_step_1 = __importDefault(require("../../auxta/enums/status-of.step"));
+const fs = require('fs');
+const readline = require('readline');
 const { google } = require("googleapis");
 const SCOPES = [
     'https://www.googleapis.com/auth/gmail.addons.current.action.compose',
@@ -133,11 +134,13 @@ class AuxGoogleAuth {
                 scope: SCOPES,
             });
             const code = yield this.LogIn(authUrl);
+            code_helper_1.default.log('tes', code, status_of_step_1.default.PASSED);
             oAuth2Client.getToken(code, (err, token) => {
                 if (err)
                     return console.error('Error retrieving access token', err);
                 oAuth2Client.setCredentials(token);
-                TOKEN = token;
+                code_helper_1.default.log('tes', token, status_of_step_1.default.PASSED);
+                TOKEN = token.toString();
                 this._oAuth2Client = oAuth2Client;
             });
         });
@@ -148,7 +151,6 @@ class AuxGoogleAuth {
             const context = yield puppeteer_1.default.defaultPage.browser().createIncognitoBrowserContext();
             const page = yield context.newPage();
             yield page.goto(authUrl);
-            yield page.waitForNetworkIdle();
             yield code_helper_1.default.waitForSelector('visible', '#identifierId', config_1.config.timeout, page);
             yield ((_a = (yield page.$('#identifierId'))) === null || _a === void 0 ? void 0 : _a.type(EMAIL));
             yield (yield page.$$('button'))[3].click();
@@ -160,14 +162,14 @@ class AuxGoogleAuth {
             yield code_helper_1.default.waitForSelector('visible', '#headingText', config_1.config.timeout, page);
             yield (yield page.$$('button'))[2].click();
             yield code_helper_1.default.timeout(3000);
-            const checkbox = yield page.$('input[type="checkbox"]');
-            if (checkbox) {
+            const checkbox = yield page.$$('input[type="checkbox"]');
+            if (checkbox.length > 0) {
                 yield code_helper_1.default.waitForSelector('visible', 'input[type="checkbox"]', config_1.config.timeout, page);
-                yield checkbox.click();
+                yield checkbox[0].click();
                 yield (yield page.$$('button'))[2].click();
             }
             else {
-                yield (yield page.$$('button'))[3].click();
+                yield (yield page.$$('button'))[2].click();
             }
             yield code_helper_1.default.timeout(3000);
             const currentUrl = page.url();

package/build/esm/macros/helpers/AuxGoogleAuth.js

@@ -8,10 +8,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { config } from "../../auxta/configs/config";
-const fs = require('fs');
-const readline = require('readline');
 import puppeteer from "../../puppeteer/puppeteer";
 import FunctionHelper from "../helpers/code.helper";
+import StatusOfStep from "../../auxta/enums/status-of.step";
+const fs = require('fs');
+const readline = require('readline');
 const { google } = require("googleapis");
 const SCOPES = [
     'https://www.googleapis.com/auth/gmail.addons.current.action.compose',
@@ -127,11 +128,13 @@ export class AuxGoogleAuth {
                 scope: SCOPES,
             });
             const code = yield this.LogIn(authUrl);
+            FunctionHelper.log('tes', code, StatusOfStep.PASSED);
             oAuth2Client.getToken(code, (err, token) => {
                 if (err)
                     return console.error('Error retrieving access token', err);
                 oAuth2Client.setCredentials(token);
-                TOKEN = token;
+                FunctionHelper.log('tes', token, StatusOfStep.PASSED);
+                TOKEN = token.toString();
                 this._oAuth2Client = oAuth2Client;
             });
         });
@@ -142,7 +145,6 @@ export class AuxGoogleAuth {
             const context = yield puppeteer.defaultPage.browser().createIncognitoBrowserContext();
             const page = yield context.newPage();
             yield page.goto(authUrl);
-            yield page.waitForNetworkIdle();
             yield FunctionHelper.waitForSelector('visible', '#identifierId', config.timeout, page);
             yield ((_a = (yield page.$('#identifierId'))) === null || _a === void 0 ? void 0 : _a.type(EMAIL));
             yield (yield page.$$('button'))[3].click();
@@ -154,14 +156,14 @@ export class AuxGoogleAuth {
             yield FunctionHelper.waitForSelector('visible', '#headingText', config.timeout, page);
             yield (yield page.$$('button'))[2].click();
             yield FunctionHelper.timeout(3000);
-            const checkbox = yield page.$('input[type="checkbox"]');
-            if (checkbox) {
+            const checkbox = yield page.$$('input[type="checkbox"]');
+            if (checkbox.length > 0) {
                 yield FunctionHelper.waitForSelector('visible', 'input[type="checkbox"]', config.timeout, page);
-                yield checkbox.click();
+                yield checkbox[0].click();
                 yield (yield page.$$('button'))[2].click();
             }
             else {
-                yield (yield page.$$('button'))[3].click();
+                yield (yield page.$$('button'))[2].click();
             }
             yield FunctionHelper.timeout(3000);
             const currentUrl = page.url();