Fix Github contents api auth issue

pull/645/head
Tienson Qin 2020-09-04 10:17:36 +08:00
parent f1dee012bf
commit b7fcdc9af0
3 changed files with 7 additions and 5 deletions

View File

@ -11,7 +11,7 @@
(defn get-content
[token repo-url path ref ok-handler error-handler]
(let [[owner repo-name] (util/get-git-owner-and-repo repo-url)
token (str "Basic "(b64/encodeString (str token ":x-oauth-basic")))
token (str "Basic " (b64/encodeString (str owner ":" token)))
url (util/format (str API "repos/%s/%s/contents/%s?ref=%s")
owner
repo-name
@ -35,7 +35,7 @@
(defn get-repo-permission
[token repo-url current-user-name true-handler false-handler]
(let [[owner repo-name] (util/get-git-owner-and-repo repo-url)
token (str "Basic "(b64/encodeString (str token ":x-oauth-basic")))
token (str "Basic "(b64/encodeString (str owner ":" token)))
url (util/format (str API "repos/%s/%s/collaborators/%s/permission")
owner
repo-name

View File

@ -26,12 +26,13 @@
content)
(p/catch
(fn [e]
(println "Load file failed: " path)
(js/console.error e)))))
(defn load-multiple-files
[repo-url paths]
(let [repo-dir (util/get-repo-dir repo-url)]
(doall (mapv #(fs/read-file repo-dir %) paths))))
(doall
(mapv #(load-file repo-url %) paths)))
(defn- keep-formats
[files formats]

View File

@ -75,6 +75,7 @@
true)]
(reset! pushing? false)
(state/clear-changed-files! repo)
(notification/clear! nil)
(route-handler/redirect! {:to :home})))))
(defn git-set-username-email!