[change] All query with pass to env.

keygenqt · Oct 26, 2024 · 9a4b46b · 9a4b46b
1 parent 2779dbf
commit 9a4b46b
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 ### Subscribe and like!
 
-[![Version](https://img.shields.io/badge/deb_package-0.0.5-blue)](https://github.com/keygenqt/aurora-toolbox/releases)
+[![Version](https://img.shields.io/badge/deb_package-0.0.6-blue)](https://github.com/keygenqt/aurora-toolbox/releases)
 
 ![Preview](https://raw.githubusercontent.com/keygenqt/aurora-toolbox/refs/heads/main/files/images/preview.png)
 

diff --git a/data/ui/dialogs/AboutDialog.ui b/data/ui/dialogs/AboutDialog.ui
@@ -4,7 +4,7 @@
 		<property name="presentation-mode">floating</property>
 		<property name="application-icon">com.keygenqt.aurora-toolbox</property>
 		<property name="application-name" translatable="yes">Aurora Toolbox</property>
-		<property name="version">0.0.5</property>
+		<property name="version">0.0.6</property>
 		<property name="copyright">© 2024 KeyGenQt</property>
 		<property name="issue_url">https://github.com/keygenqt/aurora-toolbox/issues</property>
 		<property name="developer-name" translatable="yes">Vitaliy Zarubin</property>

diff --git a/docs/install.md b/docs/install.md
@@ -13,7 +13,7 @@ hide:
 #### Install
 
 ```shell
-sudo dpkg -i aurora-toolbox_0.0.5-1_amd64.deb
+sudo dpkg -i aurora-toolbox_0.0.6-1_amd64.deb
 ```
 
 #### Install dependency

diff --git a/meson.build b/meson.build
@@ -1,7 +1,7 @@
 # Define our project
 project(
 	'aurora-toolbox',
-	version: '0.0.5',
+	version: '0.0.6',
 	license: ['Apache 2.0'],
 	meson_version: '>= 0.59.0',
 	default_options: ['cpp_std=c++17', 'cpp_rtti=false', 'cpp_eh=none',

diff --git a/scripts/deb.sh b/scripts/deb.sh
@@ -79,4 +79,4 @@ dpkg -x $FOLDER/$DEB_FOLDER.deb $FOLDER/$DEB_FOLDER
 
 # Install / Remove
 sudo dpkg -r com.keygenqt.aurora-toolbox
-sudo dpkg -i release/aurora-toolbox_0.0.5-1_amd64.deb
+sudo dpkg -i release/aurora-toolbox_0.0.6-1_amd64.deb
diff --git a/src/base/connectors/ShellExec.js b/src/base/connectors/ShellExec.js
@@ -16,8 +16,6 @@
 import Gio from 'gi://Gio';
 import GLib from 'gi://GLib';
 
-import { Log } from '../utils/Log.js';
-
 export const ShellExec = {
     /**
      * Execute command async multiple response
@@ -27,9 +25,9 @@ export const ShellExec = {
      * @param {function} reject - call error
      */
     communicateCallback(query = [], resolve = function(v) {}, reject = function(e) {}) {
-        Log.debug(query);
         try {
             const arg = Gio.SubprocessFlags.STDIN_PIPE | Gio.SubprocessFlags.STDOUT_PIPE;
+            query = ShellExec._setPassword(query);
             const subProcess = Gio.Subprocess.new(query, arg);
             // @todo
             // get_stdout_pipe
@@ -82,18 +80,7 @@ export const ShellExec = {
         return new Promise((resolve, _) => {
             try {
                 const arg = Gio.SubprocessFlags.STDOUT_PIPE | Gio.SubprocessFlags.STDERR_PIPE;
-
-                if (query[query.length-1].includes('password')) {
-                    // Get password
-                    const password = query[query.length-1].split('?')[1].split('&').filter((e) => e.includes('password'))[0].split('=')[1];
-                    // Remove password from query
-                    query[query.length-1] = query[query.length-1]
-                        .replace(`&password=${password}`, '')
-                        .replace(`?password=${password}`, '')
-                    // Set env
-                    GLib.setenv('cli_password', password, true);
-                }
-
+                query = ShellExec._setPassword(query);
                 const subProcess = Gio.Subprocess.new(query, arg);
                 subProcess.communicate_utf8_async(null, null, (proc, res) => {
                     let [success, stdout, stderr] = proc?.communicate_utf8_finish(res);
@@ -115,7 +102,7 @@ export const ShellExec = {
      * @returns Data response from API json
      */
     communicateSync(query = []) {
-        Log.debug(query);
+        query = ShellExec._setPassword(query);
         try {
             const arg = Gio.SubprocessFlags.STDOUT_PIPE | Gio.SubprocessFlags.STDERR_PIPE;
             const subProcess = Gio.Subprocess.new(query, arg);
@@ -128,4 +115,26 @@ export const ShellExec = {
             return null;
         }
     },
+    /**
+     * Set password to env
+     *
+     * @param {*} query
+     * @returns Query without password
+     */
+    _setPassword(query) {
+        if (query[query.length-1].includes('password')) {
+            // Get password
+            const password = query[query.length-1].split('?')[1].split('&').filter((e) => e.includes('password'))[0].split('=')[1];
+            // Remove password from query
+            query[query.length-1] = query[query.length-1]
+                .replace(`&password=${password}`, '')
+                .replace(`?password=${password}`, '')
+            // Set env
+            GLib.setenv('cli_password', password, true);
+            console.log('--------------------')
+            console.log(query)
+            console.log('--------------------')
+        }
+        return query;
+    }
 }