From 84f90613ce6a15d268e6797adbc745f007106391 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Wed, 30 Mar 2016 21:05:49 +0300
Subject: [PATCH] Fix bug on auth system.

---
 src/uxbox/data/auth.cljs | 27 +++++++++++++++++++--------
 src/uxbox/state.cljs     |  2 +-
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/uxbox/data/auth.cljs b/src/uxbox/data/auth.cljs
index d7678980b0..558e1f2678 100644
--- a/src/uxbox/data/auth.cljs
+++ b/src/uxbox/data/auth.cljs
@@ -30,7 +30,11 @@
 
   rs/EffectEvent
   (-apply-effect [this state]
-    (assoc! local-storage ::auth data)))
+    (assoc! local-storage :uxbox/auth data)))
+
+(defn logged-in
+  [data]
+  (LoggedIn. data))
 
 ;; --- Login
 
@@ -39,12 +43,15 @@
   (-apply-watch [this state s]
     (letfn [(on-error [err]
               (uum/error (tr "errors.auth"))
-              (rx/empty))
-            (on-success [{value :payload}]
-              (->LoggedIn value))]
-      (->> (rp/do :login (merge (into {} this) {:scope "webapp"}))
-           (rx/map on-success)
-           (rx/catch on-error)))))
+              (rx/empty))]
+      (let [params {:username username
+                    :password password
+                    :scope "webapp"}]
+        (println "login:params:" params)
+        (->> (rp/do :login params)
+             (rx/map :payload)
+             (rx/map logged-in)
+             (rx/catch on-error))))))
 
 (def ^:const ^:private +login-schema+
   {:username [sc/required sc/string]
@@ -64,7 +71,11 @@
 
   rs/WatchEvent
   (-apply-watch [_ state s]
-    (rx/of (r/navigate :auth/login))))
+    (rx/of (r/navigate :auth/login)))
+
+  rs/EffectEvent
+  (-apply-effect [this state]
+    (dissoc! local-storage :uxbox/auth)))
 
 (defn logout
   []
diff --git a/src/uxbox/state.cljs b/src/uxbox/state.cljs
index 0c9e3ebabe..f66b341858 100644
--- a/src/uxbox/state.cljs
+++ b/src/uxbox/state.cljs
@@ -17,7 +17,7 @@
   (rs/init {:dashboard {:project-order :name
                         :project-filter ""}
             :route nil
-            :auth (::auth local-storage)
+            :auth (:uxbox/auth local-storage)
             :workspace nil
             :shapes-by-id {}
             :elements-by-id {}