fix unix isAdmin &&

some refactoring

Author: Mahdi-zarei

include/api/gRPC.h

@@ -14,7 +14,7 @@ namespace NekoGui_rpc {
 
     class Client {
     public:
-        explicit Client(std::function<void(const QString &)> onError, const QString &target, const QString &token);
+        explicit Client(std::function<void(const QString &)> onError, const QString &target);
 
         void Exit();
 

include/global/NekoGui_DataStore.hpp

@@ -30,7 +30,6 @@ namespace NekoGui {
     public:
         // Running
 
-        QString core_token;
         int core_port = 19810;
         int started_id = -1919;
         bool core_running = false;

src/api/gRPC.cpp

@@ -125,7 +125,7 @@ namespace QtGrpc {
         }
 
     public:
-        Http2GrpcChannelPrivate(const QString &url_, const QString &nekoray_auth_, const QString &serviceName_) {
+        Http2GrpcChannelPrivate(const QString &url_, const QString &serviceName_) {
             url_base = "http://" + url_;
             serviceName = serviceName_;
             //
@@ -182,8 +182,8 @@ namespace QtGrpc {
 
 namespace NekoGui_rpc {
 
-    Client::Client(std::function<void(const QString &)> onError, const QString &target, const QString &token) {
-        this->make_grpc_channel = [=]() { return std::make_unique<QtGrpc::Http2GrpcChannelPrivate>(target, token, "libcore.LibcoreService"); };
+    Client::Client(std::function<void(const QString &)> onError, const QString &target) {
+        this->make_grpc_channel = [=]() { return std::make_unique<QtGrpc::Http2GrpcChannelPrivate>(target, "libcore.LibcoreService"); };
         this->default_grpc_channel = make_grpc_channel();
         this->onError = std::move(onError);
     }

src/ui/mainwindow.cpp

@@ -72,6 +72,33 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
     themeManager->ApplyTheme(NekoGui::dataStore->theme);
     ui->setupUi(this);
 
+    // Prepare core
+    NekoGui::dataStore->core_port = MkPort();
+    if (NekoGui::dataStore->core_port <= 0) NekoGui::dataStore->core_port = 19810;
+
+    auto core_path = QApplication::applicationDirPath() + "/";
+    core_path += "nekobox_core";
+
+    QStringList args;
+    args.push_back("nekobox");
+    args.push_back("-port");
+    args.push_back(Int2String(NekoGui::dataStore->core_port));
+    if (NekoGui::dataStore->flag_debug) args.push_back("-debug");
+
+    // Start core
+    runOnUiThread(
+        [=] {
+            core_process = new NekoGui_sys::CoreProcess(core_path, args);
+            // Remember last started
+            if (NekoGui::dataStore->remember_enable && NekoGui::dataStore->remember_id >= 0) {
+                core_process->start_profile_when_core_is_up = NekoGui::dataStore->remember_id;
+            }
+            // Setup
+            core_process->Start();
+            setup_grpc();
+        },
+        DS_cores);
+
     if (!NekoGui::dataStore->font.isEmpty()) {
         qApp->setFont(NekoGui::dataStore->font);
     }
@@ -432,34 +459,6 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
     });
     refresh_status();
 
-    // Prepare core
-    NekoGui::dataStore->core_token = GetRandomString(32);
-    NekoGui::dataStore->core_port = MkPort();
-    if (NekoGui::dataStore->core_port <= 0) NekoGui::dataStore->core_port = 19810;
-
-    auto core_path = QApplication::applicationDirPath() + "/";
-    core_path += "nekobox_core";
-
-    QStringList args;
-    args.push_back("nekobox");
-    args.push_back("-port");
-    args.push_back(Int2String(NekoGui::dataStore->core_port));
-    if (NekoGui::dataStore->flag_debug) args.push_back("-debug");
-
-    // Start core
-    runOnUiThread(
-        [=] {
-            core_process = new NekoGui_sys::CoreProcess(core_path, args);
-            // Remember last started
-            if (NekoGui::dataStore->remember_enable && NekoGui::dataStore->remember_id >= 0) {
-                core_process->start_profile_when_core_is_up = NekoGui::dataStore->remember_id;
-            }
-            // Setup
-            core_process->Start();
-            setup_grpc();
-        },
-        DS_cores);
-
     connect(qApp, &QGuiApplication::commitDataRequest, this, &MainWindow::on_commitDataRequest);
 
     auto t = new QTimer;

src/ui/mainwindow_grpc.cpp

@@ -20,9 +20,9 @@ void MainWindow::setup_grpc() {
     // Setup Connection
     defaultClient = new Client(
         [=](const QString &errStr) {
-            MW_show_log("[Error] gRPC: " + errStr);
+            MW_show_log("[Error] Core: " + errStr);
         },
-        "127.0.0.1:" + Int2String(NekoGui::dataStore->core_port), NekoGui::dataStore->core_token);
+        "127.0.0.1:" + Int2String(NekoGui::dataStore->core_port));
 
     // Looper
     runOnNewThread([=] { NekoGui_traffic::trafficLooper->Loop(); });