0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-03-15 17:21:17 -05:00

Fix bug on auth system.

This commit is contained in:
Andrey Antukh 2016-03-30 21:05:49 +03:00
parent 37454ca305
commit 84f90613ce
2 changed files with 20 additions and 9 deletions

View file

@ -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
[]

View file

@ -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 {}