From cfcfea282be6d7192a206f6ab1a3e4fbfbadb91d Mon Sep 17 00:00:00 2001
From: Vomitblood <tohyouxuan@gmail.com>
Date: Mon, 11 Nov 2024 23:32:30 +0800
Subject: [PATCH] tauri permissions are a mess

---
 .idea/vcs.xml                              |  6 ---
 .idea/workspace.xml                        | 59 ----------------------
 client/src-tauri/capabilities/default.json | 18 ++-----
 client/src-tauri/tauri.conf.json           |  6 ++-
 4 files changed, 7 insertions(+), 82 deletions(-)
 delete mode 100644 .idea/vcs.xml
 delete mode 100644 .idea/workspace.xml

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1dd..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index 5445902..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AutoImportSettings">
-    <option name="autoReloadType" value="NONE" />
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="efa3fcd6-c1ff-4b9e-a1d7-99ba1286a556" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/client/src-tauri/tauri.conf.json" beforeDir="false" afterPath="$PROJECT_DIR$/client/src-tauri/tauri.conf.json" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="ClangdSettings">
-    <option name="formatViaClangd" value="false" />
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="MarkdownSettingsMigration">
-    <option name="stateVersion" value="1" />
-  </component>
-  <component name="ProjectColorInfo"><![CDATA[{
-  "customColor": "",
-  "associatedIndex": 1
-}]]></component>
-  <component name="ProjectId" id="2oi1Ms2SvRyte650GZ1Icv5OYnZ" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "AnalyzeApkAction.lastApkPath": "/home/vomitblood/build/cspj-application/client/src-tauri/gen/android/app/build/outputs/apk/universal/release/app-universal-release-unsigned.apk",
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "RunOnceActivity.cidr.known.project.marker": "true",
-    "RunOnceActivity.readMode.enableVisualFormatting": "true",
-    "cf.first.check.clang-format": "false",
-    "cidr.known.project.marker": "true",
-    "dart.analysis.tool.window.visible": "false",
-    "kotlin-language-version-configured": "true",
-    "last_opened_file_path": "/home/vomitblood/build/cspj-application/client/src-tauri/gen/android/app/build/outputs/apk/universal/release/app-universal-release-unsigned.apk",
-    "settings.editor.selected.configurable": "AndroidSdkUpdater"
-  }
-}]]></component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="efa3fcd6-c1ff-4b9e-a1d7-99ba1286a556" name="Changes" comment="" />
-      <created>1731337537201</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1731337537201</updated>
-    </task>
-    <servers />
-  </component>
-</project>
\ No newline at end of file
diff --git a/client/src-tauri/capabilities/default.json b/client/src-tauri/capabilities/default.json
index 678b627..dc33f09 100644
--- a/client/src-tauri/capabilities/default.json
+++ b/client/src-tauri/capabilities/default.json
@@ -6,22 +6,10 @@
     "main"
   ],
   "permissions": [
+    "core:default",
+    "http:default",
     {
-      "identifier": "core:window:default",
-      "permissions": [
-        "core:window:default",
-        "core:window:allow-start-dragging",
-        "core:window:allow-is-fullscreen",
-        "core:window:allow-minimize",
-        "core:window:allow-toggle-maximize",
-        "core:window:allow-close"
-      ],
-      "windows": [
-        "main"
-      ]
-    },
-    {
-      "identifier": "http:default",
+      "identifier": "http:allow-fetch",
       "allow": [
         {
           "url": "https://ip.vomitblood.com"
diff --git a/client/src-tauri/tauri.conf.json b/client/src-tauri/tauri.conf.json
index 42ec1d9..e4d38b7 100644
--- a/client/src-tauri/tauri.conf.json
+++ b/client/src-tauri/tauri.conf.json
@@ -4,14 +4,16 @@
     "security": {
       "capabilities": [
         {
-          "identifier": "my-identifier",
+          "identifier": "default",
           "permissions": [
             "core:window:default",
             "core:window:allow-start-dragging",
             "core:window:allow-is-fullscreen",
             "core:window:allow-minimize",
             "core:window:allow-toggle-maximize",
-            "core:window:allow-close"
+            "core:window:allow-close",
+            "http:default",
+            "http:allow-fetch"
           ],
           "windows": [
             "main"