Browse Source

fix: force to accept :email instead of :user/email

Tienson Qin 3 weeks ago
parent
commit
db28be9ba7

+ 3 - 7
deps/db-sync/src/logseq/db_sync/malli_schema.cljs

@@ -183,13 +183,9 @@
    [:encrypted-aes-key {:optional true} [:maybe :string]]])
 
 (def e2ee-grant-access-entry-schema
-  [:or
-   [:map
-    [:user/email :string]
-    [:encrypted-aes-key :string]]
-   [:map
-    [:email :string]
-    [:encrypted-aes-key :string]]])
+  [:map
+   [:email :string]
+   [:encrypted-aes-key :string]])
 
 (def e2ee-grant-access-request-schema
   [:map

+ 1 - 1
deps/db-sync/src/logseq/db_sync/worker.cljs

@@ -1143,7 +1143,7 @@
                                          missing (atom [])]
                                      (p/let [_ (p/all
                                                 (map (fn [entry]
-                                                       (let [email (or (:user/email entry) (:email entry))
+                                                       (let [email (:email entry)
                                                              encrypted-aes-key (:encrypted-aes-key entry)]
                                                          (p/let [target-user-id (index/<user-id-by-email db email)
                                                                  access? (and target-user-id

+ 1 - 2
src/main/frontend/components/repo.cljs

@@ -138,8 +138,7 @@
               "Use Logseq sync (Beta testing)"))
 
            (when (and remote?
-                      ;; manager?
-                      )
+                      manager?)
              (shui/dropdown-menu-item
               {:key "delete-remotely"
                :class "delete-remote-graph-menu-item"

+ 1 - 1
src/main/frontend/worker/db_sync.cljs

@@ -512,7 +512,7 @@
                   encrypted-str (ldb/write-transit-str encrypted)
                   body (coerce-http-request :e2ee/grant-access
                                             {:target-user-email+encrypted-aes-key-coll
-                                             [{:user/email target-email
+                                             [{:email target-email
                                                :encrypted-aes-key encrypted-str}]})
                   _ (when (nil? body)
                       (fail-fast :db-sync/invalid-field {:type :e2ee/grant-access :body body}))