From c8d48d466789f6f07a881ab33cd8aa249e855390 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Mon, 16 May 2016 13:27:10 +0300
Subject: [PATCH] Simplified login event.

---
 src/uxbox/data/auth.cljs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/uxbox/data/auth.cljs b/src/uxbox/data/auth.cljs
index b0e11df807..81b648138a 100644
--- a/src/uxbox/data/auth.cljs
+++ b/src/uxbox/data/auth.cljs
@@ -28,7 +28,8 @@
 
   rs/WatchEvent
   (-apply-watch [this state s]
-    (rx/of (r/navigate :dashboard/projects)))
+    (rx/of (udu/fetch-profile)
+           (r/navigate :dashboard/projects)))
 
   rs/EffectEvent
   (-apply-effect [this state]
@@ -53,13 +54,12 @@
   (-apply-watch [this state s]
     (let [params {:username username
                   :password password
-                  :scope "webapp"}]
+                  :scope "webapp"}
+          on-error #(udm/error (tr "errors.auth.unauthorized"))]
       (->> (rp/req :fetch/token params)
            (rx/map :payload)
-           (rx/mapcat #(rx/of (logged-in %)
-                              (udp/fetch-projects)
-                              (udu/fetch-profile)))
-           (rx/catch rp/client-error? #(udm/error (tr "errors.auth.unauthorized")))))))
+           (rx/map logged-in)
+           (rx/catch rp/client-error? on-error)))))
 
 (defn login
   [params]