From 10713fa58f837bc453887493b33de0fa988e0a4a Mon Sep 17 00:00:00 2001 From: gered Date: Sun, 31 Jul 2016 15:08:08 -0400 Subject: [PATCH] fix client-side state handling on user logout --- src/mtgcoll/client/auth.cljs | 8 +++++--- src/mtgcoll/client/page.cljs | 5 ++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/mtgcoll/client/auth.cljs b/src/mtgcoll/client/auth.cljs index 72cf7e3..b32af4f 100644 --- a/src/mtgcoll/client/auth.cljs +++ b/src/mtgcoll/client/auth.cljs @@ -36,6 +36,8 @@ (reset! show-login false)) (defn logout! - [] - (reset! user-profile nil) - (ajax/POST (->url "/logout"))) + [on-success] + (ajax/POST (->url "/logout") + :on-success (fn [_] + (reset! user-profile nil) + (on-success)))) diff --git a/src/mtgcoll/client/page.cljs b/src/mtgcoll/client/page.cljs index 05b5eb3..dbbda3b 100644 --- a/src/mtgcoll/client/page.cljs +++ b/src/mtgcoll/client/page.cljs @@ -45,9 +45,8 @@ [bs/Nav {:pull-right true} (if (auth/authenticated?) [bs/NavDropdown {:title (:username @auth/user-profile)} - [bs/MenuItem {:on-click (fn [_] - (auth/logout!) - (views/reconnect!))} "Logout"]] + [bs/MenuItem {:on-click #(auth/logout! + (fn [] (views/reconnect!)))} "Logout"]] [bs/NavItem {:on-click auth/show-login-form!} "Login"])])]] [bs/Modal {:show (boolean @error)