clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-27 14:14:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

enhance: use /api instead of /api-invoker

Browse Source
This commit is contained in:
Tienson Qin
2022-12-29 23:16:12 +08:00
parent 7fd33b5971
commit c2a4e55f02
3 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/electron/electron/server.cljs
View File

@@ -69,11 +69,12 @@
(defn- validate-auth-token
[token]
(when-let [valid-tokens (cfgs/get-item :server/tokens)]
(when (or (string/blank? token)
(not (some #(or (= % token)
(= (:value %) token)) valid-tokens)))
(throw (js/Error. "Access Deny!")))))
(let [token (string/replace token "Bearer " "")]
(when-let [valid-tokens (cfgs/get-item :server/tokens)]
(when (or (string/blank? token)
(not (some #(or (= % token)
(= (:value %) token)) valid-tokens)))
(throw (js/Error. "Access Deny!"))))))
(defn- api-pre-handler!
[^js req ^js rep callback]
@@ -98,7 +99,7 @@
(utils/send-to-renderer @*win :invokeLogseqAPI {:syncId sid :method method :args args})
(.handleOnce ipcMain (str ::sync! sid) ret-handle)))))
(defn- api-invoker-fn!
(defn- api-handler!
[^js req ^js rep]
(if-let [^js body (.-body req)]
(if-let [method (resolve-real-api-method (.-method body))]
@@ -132,7 +133,7 @@
;; hooks & routes
_ (doto s
(.addHook "preHandler" api-pre-handler!)
(.post "/api-invoker" api-invoker-fn!)
(.post "/api" api-handler!)
(.get "/" (fn [_ ^js rep]
(let [html (fs-extra/readFileSync (.join path js/__dirname "./docs/api_server.html"))
HOST (get-host)
@@ -164,4 +165,4 @@
[^js win]
(reset! *win win)
(let [t (setup-state-watch!)]
(reset-state!) t))
(reset-state!) t))

10
src/main/frontend/fs.cljs
View File

@@ -57,10 +57,12 @@
[dir & {:keys [path-only?]}]
(p/let [result (protocol/readdir (get-fs dir) dir)
result (bean/->clj result)]
(if (and path-only? (map? (first result)))
(->> (map :uri result)
(map gp-util/path-normalize))
(map #(update % :uri gp-util/path-normalize) result))))
(let [result (if (and path-only? (map? (first result)))
(map :uri result)
result)]
(if (and (map? (first result)) (:uri (first result)))
(map #(update % :uri gp-util/path-normalize) result)
(map gp-util/path-normalize result)))))
(defn unlink!
"Should move the path to logseq/recycle instead of deleting it."