From b4ce1005f0324b4a76df3bf521fe7e311135fa7f Mon Sep 17 00:00:00 2001
From: "shi.changliang" <shi.changliang@zhaopin.com.cn>
Date: Fri, 5 Jun 2026 09:48:53 +0800
Subject: [PATCH] Add optional secret export

---
 src/main.ts                  | 26 ++++++++++++++++-----
 src/settings/SettingsApp.vue | 44 ++++++++++++++++++++++++++++++------
 src/styles.scss              |  5 ++++
 3 files changed, 62 insertions(+), 13 deletions(-)

diff --git a/src/main.ts b/src/main.ts
index fcccbf1..de0b2b8 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -32,6 +32,8 @@ interface ConnectionConfig {
   accountKey: string;
   vaultKey: string;
   vaultId?: string;
+  accessKeyId?: string;
+  secretAccessKey?: string;
 }
 
 const DEFAULT_SETTINGS: ObsyncSettings = {
@@ -326,8 +328,8 @@ export default class ObsyncPlugin extends Plugin {
     await this.saveSettings();
   }
 
-  getConnectionConfig(): Record<string, string | number> {
-    return {
+  getConnectionConfig(includeSecrets = false): Record<string, string | number> {
+    const config: Record<string, string | number> = {
       schemaVersion: 1,
       endpoint: this.settings.endpoint,
       bucket: this.settings.bucket,
@@ -337,6 +339,13 @@ export default class ObsyncPlugin extends Plugin {
       vaultKey: this.settings.vaultKey,
       vaultId: this.settings.vaultId,
     };
+
+    if (includeSecrets) {
+      config.accessKeyId = this.settings.accessKeyId;
+      config.secretAccessKey = this.settings.secretAccessKey;
+    }
+
+    return config;
   }
 
   async importConnectionConfig(configText: string): Promise<void> {
@@ -349,6 +358,8 @@ export default class ObsyncPlugin extends Plugin {
       rootPrefix: config.rootPrefix,
       accountKey: config.accountKey,
       vaultKey: config.vaultKey,
+      accessKeyId: config.accessKeyId || this.settings.accessKeyId,
+      secretAccessKey: config.secretAccessKey || this.settings.secretAccessKey,
     });
   }
 }
@@ -394,6 +405,8 @@ function parseConnectionConfig(configText: string): ConnectionConfig {
     accountKey: readOptionalString(parsed, "accountKey", "default"),
     vaultKey: readRequiredString(parsed, "vaultKey"),
     vaultId: readOptionalString(parsed, "vaultId", ""),
+    accessKeyId: readOptionalString(parsed, "accessKeyId", ""),
+    secretAccessKey: readOptionalString(parsed, "secretAccessKey", ""),
   };
 
   if (config.vaultId) {
@@ -535,9 +548,9 @@ class ObsyncSettingTab extends PluginSettingTab {
         await navigator.clipboard.writeText(this.plugin.settings.deviceId);
         new Notice("设备 ID 已复制。");
       },
-      onCopyConnectionConfig: async () => {
-        await navigator.clipboard.writeText(JSON.stringify(this.plugin.getConnectionConfig(), null, 2));
-        new Notice("连接配置已复制。");
+      onCopyConnectionConfig: async (includeSecrets: boolean) => {
+        await navigator.clipboard.writeText(JSON.stringify(this.plugin.getConnectionConfig(includeSecrets), null, 2));
+        new Notice(includeSecrets ? "完整连接配置已复制。" : "连接配置已复制。");
       },
       onPasteConnectionConfig: async () => {
         try {
@@ -545,7 +558,8 @@ class ObsyncSettingTab extends PluginSettingTab {
           await this.plugin.importConnectionConfig(configText);
           Object.assign(settings, this.plugin.settings);
           Object.assign(connectionConfig, this.plugin.getConnectionConfig());
-          new Notice("连接配置已导入。请继续填写 Access Key ID 和 Secret Access Key。");
+          const hasSecrets = Boolean(this.plugin.settings.accessKeyId && this.plugin.settings.secretAccessKey);
+          new Notice(hasSecrets ? "连接配置已导入。" : "连接配置已导入。请继续填写 Access Key ID 和 Secret Access Key。");
         } catch (error) {
           const message = error instanceof Error ? error.message : String(error);
           new Notice(`导入连接配置失败：${message}`);
diff --git a/src/settings/SettingsApp.vue b/src/settings/SettingsApp.vue
index fc0ccb7..ef61c70 100644
--- a/src/settings/SettingsApp.vue
+++ b/src/settings/SettingsApp.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { setIcon } from "obsidian";
-import { ref, watchEffect } from "vue";
+import { computed, ref, watchEffect } from "vue";
 
 type ObsyncSettings = {
   endpoint: string;
@@ -26,13 +26,25 @@ const props = defineProps<{
 const emit = defineEmits<{
   update: [update: Partial<ObsyncSettings>];
   copyDeviceId: [];
-  copyConnectionConfig: [];
+  copyConnectionConfig: [includeSecrets: boolean];
   pasteConnectionConfig: [];
   releaseDeletedContent: [];
 }>();
 
 const showSecretAccessKey = ref(false);
+const includeSecrets = ref(false);
 const secretAccessKeyButton = ref<HTMLButtonElement | null>(null);
+const connectionConfigPreview = computed(() => {
+  if (!includeSecrets.value) {
+    return props.connectionConfig;
+  }
+
+  return {
+    ...props.connectionConfig,
+    accessKeyId: props.settings.accessKeyId,
+    secretAccessKey: props.settings.secretAccessKey,
+  };
+});
 
 watchEffect(() => {
   const button = secretAccessKeyButton.value;
@@ -242,15 +254,33 @@ watchEffect(() => {
     <section class="obsync-card">
       <div class="obsync-row obsync-row-block">
         <div class="obsync-row-copy">
-          <h3>连接配置</h3>
-          <p>复制到另一台设备导入。这里不包含 Access Key 和 Secret。</p>
+          <div class="obsync-row-title">
+            <div>
+              <h3>连接配置</h3>
+              <p>
+                {{ includeSecrets ? "将包含 Access Key 和 Secret，仅用于导入自己的设备。" : "复制到另一台设备导入。默认不包含 Access Key 和 Secret。" }}
+              </p>
+            </div>
+
+            <label class="obsync-inline-switch">
+              <span>包含密钥</span>
+              <span class="obsync-switch">
+                <input
+                  type="checkbox"
+                  :checked="includeSecrets"
+                  @change="includeSecrets = ($event.target as HTMLInputElement).checked"
+                />
+                <span></span>
+              </span>
+            </label>
+          </div>
         </div>
 
-        <pre class="obsync-config-display">{{ JSON.stringify(props.connectionConfig, null, 2) }}</pre>
+        <pre class="obsync-config-display">{{ JSON.stringify(connectionConfigPreview, null, 2) }}</pre>
 
         <div class="obsync-action-row">
-          <button type="button" class="obsync-primary" @click="emit('copyConnectionConfig')">
-            复制连接配置
+          <button type="button" class="obsync-primary" @click="emit('copyConnectionConfig', includeSecrets)">
+            {{ includeSecrets ? "复制完整配置" : "复制连接配置" }}
           </button>
 
           <button type="button" class="obsync-secondary" @click="emit('pasteConnectionConfig')">
diff --git a/src/styles.scss b/src/styles.scss
index 15ab2ea..2b365a2 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -94,6 +94,11 @@
   @apply flex items-center justify-between gap-3;
 }
 
+.obsync-inline-switch {
+  @apply flex shrink-0 cursor-pointer items-center gap-2 text-sm font-medium;
+  color: var(--text-muted);
+}
+
 .obsync-link-button {
   @apply shrink-0 cursor-pointer rounded px-2 py-1 text-xs font-semibold leading-4 transition;
   background: transparent;