From b86899630862c66eb9420693604baaac54568687 Mon Sep 17 00:00:00 2001 From: Teemu Patja Date: Wed, 22 Feb 2017 19:46:11 +0200 Subject: [PATCH] Do not expose user's email addresses to client side, rename parameter --- src/clj/commiteth/github/core.clj | 4 ++-- src/clj/commiteth/routes/services.clj | 3 ++- src/clj/commiteth/scheduler.clj | 1 + src/cljs/commiteth/core.cljs | 1 - 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/clj/commiteth/github/core.clj b/src/clj/commiteth/github/core.clj index 08330d0..1d6e9a3 100644 --- a/src/clj/commiteth/github/core.clj +++ b/src/clj/commiteth/github/core.clj @@ -186,8 +186,8 @@ (defn get-issue-events - [user repo issue-id] - (issues/issue-events user repo issue-id (self-auth-params))) + [user repo issue-number] + (issues/issue-events user repo issue-number (self-auth-params))) (defn create-label [full-repo token] diff --git a/src/clj/commiteth/routes/services.clj b/src/clj/commiteth/routes/services.clj index 69dbd77..7af19df 100644 --- a/src/clj/commiteth/routes/services.clj +++ b/src/clj/commiteth/routes/services.clj @@ -108,7 +108,8 @@ :current-user user (ok {:user (dissoc (users/get-user (:id user)) - :token)})) + :token + :email)})) (POST "/address" [] :auth-rules authenticated? :body-params [user-id :- Long, address :- String] diff --git a/src/clj/commiteth/scheduler.clj b/src/clj/commiteth/scheduler.clj index d0d1810..79101ce 100644 --- a/src/clj/commiteth/scheduler.clj +++ b/src/clj/commiteth/scheduler.clj @@ -129,6 +129,7 @@ (stop-scheduler) (log/debug "Starting scheduler thread") (while (get-thread-by-name scheduler-thread-name) + (log/debug "Waiting") (Thread/sleep 1)) (every ms tasks)) diff --git a/src/cljs/commiteth/core.cljs b/src/cljs/commiteth/core.cljs index b6f44dd..97ecba0 100644 --- a/src/cljs/commiteth/core.cljs +++ b/src/cljs/commiteth/core.cljs @@ -179,7 +179,6 @@ (rf/dispatch [:load-bounties])) (defn load-data [] - (println "load-data") (load-issues) (load-user))