From 0361de475f4c38f08b51ede9a6672f8bc6eab188 Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Sat, 18 Jun 2022 23:11:03 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E9=87=8D=E7=BD=AE=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93=20Fix=20https://github.com/siyuan-note/siyua?=
 =?UTF-8?q?n/issues/5212?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/appearance/langs/en_US.json  | 2 ++
 app/appearance/langs/fr_FR.json  | 2 ++
 app/appearance/langs/zh_CHT.json | 2 ++
 app/appearance/langs/zh_CN.json  | 2 ++
 app/src/config/about.ts          | 8 ++++----
 kernel/api/repo.go               | 4 ++--
 kernel/model/repository.go       | 6 +++---
 7 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json
index 946fe6d9388..22c3baa0d3c 100644
--- a/app/appearance/langs/en_US.json
+++ b/app/appearance/langs/en_US.json
@@ -1,4 +1,6 @@
 {
+  "resetRepoTip": "Resetting the data repository will completely delete the key and all snapshots, are you sure you want to reset?",
+  "resetRepo": "Reset data repo",
   "createSnapshot": "Create snapshot",
   "dataSnapshot": "Data snapshot",
   "copyKey": "Copy key string",
diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json
index 386c22e3660..cdb1c1e3eb3 100644
--- a/app/appearance/langs/fr_FR.json
+++ b/app/appearance/langs/fr_FR.json
@@ -1,4 +1,6 @@
 {
+  "resetRepoTip": "La réinitialisation du référentiel de données supprimera complètement la clé et tous les instantanés, êtes-vous sûr de vouloir réinitialiser ?",
+  "resetRepo": "Réinitialiser le référentiel de données",
   "createSnapshot": "Créer un instantané",
   "dataSnapshot": "Instantané de données",
   "copyKey": "Copier la chaîne de clé",
diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json
index 8fa2b9cc958..9a0092b44ec 100644
--- a/app/appearance/langs/zh_CHT.json
+++ b/app/appearance/langs/zh_CHT.json
@@ -1,4 +1,6 @@
 {
+  "resetRepoTip": "重置數據倉庫會徹底刪除密鑰和所有快照，確定進行重置嗎？",
+  "resetRepo": "重置數據倉庫",
   "createSnapshot": "創建快照",
   "dataSnapshot": "數據快照",
   "copyKey": "複製密鑰字符串",
diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json
index 19e3206ae36..6291b60bce8 100644
--- a/app/appearance/langs/zh_CN.json
+++ b/app/appearance/langs/zh_CN.json
@@ -1,4 +1,6 @@
 {
+  "resetRepoTip": "重置数据仓库会彻底删除密钥和所有快照，确定进行重置吗？",
+  "resetRepo": "重置数据仓库",
   "createSnapshot": "创建快照",
   "dataSnapshot": "数据快照",
   "copyKey": "复制密钥字符串",
diff --git a/app/src/config/about.ts b/app/src/config/about.ts
index 2c027ec6ebb..a22c64b5684 100644
--- a/app/src/config/about.ts
+++ b/app/src/config/about.ts
@@ -104,8 +104,8 @@ export const about = {
             <svg><use xlink:href="#iconCopy"></use></svg>${window.siyuan.languages.copyKey}
         </button>
         <div class="fn__hr"></div>
-        <button class="b3-button b3-button--outline fn__size200" id="removeKey">
-            <svg><use xlink:href="#iconTrashcan"></use></svg>${window.siyuan.languages.remove}
+        <button class="b3-button b3-button--outline fn__size200" id="resetRepo">
+            <svg><use xlink:href="#iconTrashcan"></use></svg>${window.siyuan.languages.resetRepo}
         </button>
     </div>
 </div>
@@ -249,8 +249,8 @@ export const about = {
             showMessage(window.siyuan.languages.copied);
             writeText(window.siyuan.config.repo.key);
         });
-        about.element.querySelector("#removeKey").addEventListener("click", () => {
-            confirmDialog(window.siyuan.languages.remove, "", () => {
+        about.element.querySelector("#resetRepo").addEventListener("click", () => {
+            confirmDialog("⚠️ " + window.siyuan.languages.resetRepo, window.siyuan.languages.resetRepoTip, () => {
                 fetchPost("/api/repo/resetRepo", {}, () => {
                     window.siyuan.config.repo.key = "";
                     importKeyElement.parentElement.classList.remove("fn__none");
diff --git a/kernel/api/repo.go b/kernel/api/repo.go
index f663535eeb2..b68d7df9835 100644
--- a/kernel/api/repo.go
+++ b/kernel/api/repo.go
@@ -93,8 +93,8 @@ func importRepoKey(c *gin.Context) {
 		return
 	}
 
-	hexKey := arg["key"].(string)
-	if err := model.ImportRepoKey(hexKey); nil != err {
+	base64Key := arg["key"].(string)
+	if err := model.ImportRepoKey(base64Key); nil != err {
 		ret.Code = -1
 		ret.Msg = model.Conf.Language(137)
 		return
diff --git a/kernel/model/repository.go b/kernel/model/repository.go
index c3f2d1be301..46f14db31a0 100644
--- a/kernel/model/repository.go
+++ b/kernel/model/repository.go
@@ -18,7 +18,7 @@ package model
 
 import (
 	"crypto/rand"
-	"encoding/hex"
+	"encoding/base64"
 	"errors"
 	"fmt"
 	"os"
@@ -59,10 +59,10 @@ func GetRepoIndexLogs(page int) (logs []*dejavu.Log, pageCount, totalCount int,
 	return
 }
 
-func ImportRepoKey(hexKey string) (err error) {
+func ImportRepoKey(base64Key string) (err error) {
 	msgId := util.PushMsg(Conf.Language(136), 1000*7)
 
-	key, err := hex.DecodeString(hexKey)
+	key, err := base64.StdEncoding.DecodeString(base64Key)
 	if nil != err {
 		return
 	}