diff --git a/entry.js b/entry.js
index 1cf7298..2d08022 100644
--- a/entry.js
+++ b/entry.js
@@ -5,6 +5,7 @@ const pie = require("puppeteer-in-electron")
const puppeteer = require("puppeteer-core");
const path = require('path');
const https = require('https');
+process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
const axios = require('axios');
const $ = require('jquery');
const fs = require('fs');
@@ -51,8 +52,6 @@ app.disableHardwareAcceleration();
pie.initialize(app);
-const agent = new HttpsProxyAgent(CONFIG.PROXY);
-
const setupLogging = async () => {
console.log(">> Iniciando configuracion de logs..");
if (!fs.existsSync(logsDir)) {
@@ -91,6 +90,7 @@ const setupLogging = async () => {
async function getOkanToken() {
try {
+ const agent = new HttpsProxyAgent(CONFIG.PROXY);
const responseOkan = await axios.post(CONFIG.ENDPOINT_OKAN_TOKEN, { user: process.env.USUARIO }, {
headers: { 'Authorization': CONFIG.TOKEN_OKAN_USER },
httpsAgent: agent
@@ -121,15 +121,28 @@ const processArguments = async () => {
let url_okan = argv['_'];
let code_okan_str = url_okan.toString();
- // Handle OKAN code from URL or direct argument
- if (argv['_'] && !argv.dev) {
+ console.log(code_okan_str);
+ // Handle OKAN code from URL or direct argument
+ if (code_okan_str != '' && !argv.dev) {
+ console.log('sika desde okan');
let code_okan = code_okan_str.split('&')[0].replace('rpaclaro:///?code=', '');
let user_okan = code_okan_str.split('&')[1].replace('user=', '');
process.env.OKAN = code_okan;
process.env.USUARIO = user_okan;
from_okan = true;
+ } else if (code_okan_str == '' && argv['$0'] && argv['$0'].includes('RpaClaro.exe')) {
+ console.log('sika desde exe');
+ await dialog.showMessageBox({
+ type: 'error',
+ defaultId: 0,
+ title: 'Error de acceso',
+ message: 'Debes abrir RpaClaro desde Okan',
+ });
+ app.quit();
+ return null;
} else {
+ console.log('sika desde cli');
process.env.OKAN = argv.code;
process.env.USUARIO = argv.user;
}
@@ -151,14 +164,35 @@ const processArguments = async () => {
};
const setupProtocolClient = async () => {
- if (process.defaultApp) {
- if (process.argv.length >= 2) {
- app.setAsDefaultProtocolClient('RpaClaro', process.execPath, [path.resolve(process.argv[1])])
+ // Get the path to the packaged executable
+ const exePath = process.env.PORTABLE_EXECUTABLE_FILE || app.getPath('exe');
+
+ try {
+ // For development environment
+ if (process.defaultApp) {
+ if (process.argv.length >= 2) {
+ app.setAsDefaultProtocolClient('RpaClaro', process.execPath, [path.resolve(process.argv[1])]);
+ }
+ } else {
+ // For packaged executable
+ // Remove any existing protocol registration first
+ app.removeAsDefaultProtocolClient('RpaClaro');
+
+ // Register the protocol with the packaged exe path
+ const success = app.setAsDefaultProtocolClient('RpaClaro', exePath);
+
+ if (!success) {
+ throw new Error('Failed to register protocol handler');
+ }
}
- } else {
- app.setAsDefaultProtocolClient('RpaClaro')
+
+ console.log('>> Protocol configuration established successfully');
+ console.log('>> Executable path:', exePath);
+ } catch (error) {
+ console.error('>> Error setting up protocol client:', error);
+ // Attempt to register without arguments as fallback
+ app.setAsDefaultProtocolClient('RpaClaro');
}
- console.log('>> Configuracion de protocolos establecida.');
}
const copyFilesFromRR = () => {
@@ -187,7 +221,12 @@ const copyFilesFromRR = () => {
async function getOkanToken() {
try {
- const responseOkan = await axios.post(CONFIG.ENDPOINT_OKAN_TOKEN, { user: process.env.USUARIO }, { headers: { 'Authorization': CONFIG.TOKEN_OKAN_USER } });
+ const agent = new HttpsProxyAgent(CONFIG.PROXY);
+
+ const responseOkan = await axios.post(CONFIG.ENDPOINT_OKAN_TOKEN, { user: '45957768' }, {
+ headers: { 'Authorization': CONFIG.TOKEN_OKAN_USER },
+ httpsAgent: agent
+ });
if (responseOkan.data.cod == '0') {
console.log('>> Token de Okan obtenido.');
return responseOkan.data.data;
@@ -212,7 +251,12 @@ async function getProfile(token) {
const token_okan = 'Bearer ' + token;
try {
- const responseGetProfile = await axios.get(CONFIG.ENDPOINT_GET_PROFILE, { headers: { 'Authorization': token_okan } });
+ const agent_two = new HttpsProxyAgent(CONFIG.PROXY);
+
+ const responseGetProfile = await axios.get(CONFIG.ENDPOINT_GET_PROFILE, {
+ headers: { 'Authorization': token_okan },
+ httpsAgent: agent_two
+ });
if (responseGetProfile.data.cod == '0') {
documento = responseGetProfile.data.data.document_number;
profile = responseGetProfile.data.data.profile.id;
@@ -226,59 +270,87 @@ async function getProfile(token) {
async function getApps(data_apps_user) {
try {
+ const agent_three = new HttpsProxyAgent(CONFIG.PROXY);
- const urlAplicativos = CONFIG.ENDPOINT_GET_APPS + `${documento}/${profile}`;
- const responseAplicativos = await axios.get(urlAplicativos, { headers: { "Accept": "*/*", "Content-Type": "application/json" } });
+ // First attempt with proxy
+ try {
+ const urlAplicativos = CONFIG.ENDPOINT_GET_APPS + `${documento}/${profile}`;
+ const responseAplicativos = await axios.get(urlAplicativos, {
+ headers: {
+ "Accept": "*/*",
+ "Content-Type": "application/json"
+ },
+ httpsAgent: agent_three,
+ timeout: 30000
+ });
- var apps_okan = [];
- if (responseAplicativos.data['cod'] == '0') {
-
- const new_apps = responseAplicativos.data['data']
- .filter(element => element['nombre_app'].startsWith('RPA'))
- .sort((a, b) => a.nombre_app.localeCompare(b.nombre_app));
-
- console.log('>> Aplicativos Okan: ' + new_apps.length);
-
- // Process each app from new_apps
- for (const app of new_apps) {
- let code = app.url.replace('rpaclaro://?code=', '');
- code = code.replace('RpaClaro://?code=', '');
- code = code.replace('&user={user}', '');
- let appExists = data_apps_user.desk?.some(deskApp => deskApp.code === code) || data_apps_user.web?.some(webApp => webApp.code === code);
-
- const appInfo = {
- nombre_app: app.nombre_app,
- code_app: code,
- logo: app.logo,
- status: appExists,
- status_integrado: appExists ? 'integrado' : 'no_integrado',
- };
-
- apps_okan.push(appInfo);
-
- // Generate HTML for all apps at once using map and join
- appHtml = apps_okan.map(app => `
-
-
-
-
-
${app.nombre_app}
-
-
-
+
+
+
+
${app.nombre_app}
+
+
+