0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-03-12 07:41:43 -05:00

Merge pull request #4817 from penpot/niwinz-hotfix-1

🐛 More fixes on account deletion process
This commit is contained in:
Alejandro 2024-06-28 07:43:07 +02:00 committed by GitHub
commit 5e5c105d92
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 20 additions and 19 deletions

View file

@ -537,8 +537,8 @@
on-success identity}} (meta params)] on-success identity}} (meta params)]
(->> (rp/cmd! :delete-profile {}) (->> (rp/cmd! :delete-profile {})
(rx/tap on-success) (rx/tap on-success)
(rx/catch on-error)
(rx/map logged-out) (rx/map logged-out)
(rx/catch on-error)
(rx/delay-at-least 300)))))) (rx/delay-at-least 300))))))
;; --- EVENT: request-profile-recovery ;; --- EVENT: request-profile-recovery

View file

@ -70,7 +70,8 @@
(rx/subs! (rx/subs!
(fn [tdata] (fn [tdata]
(handle-token tdata)) (handle-token tdata))
(fn [{:keys [type code] :as error}] (fn [cause]
(let [{:keys [type code] :as error} (ex-data cause)]
(cond (cond
(or (= :validation type) (or (= :validation type)
(= :invalid-token code) (= :invalid-token code)
@ -90,7 +91,7 @@
:else :else
(let [msg (tr "errors.generic")] (let [msg (tr "errors.generic")]
(ts/schedule 100 #(st/emit! (msg/error msg))) (ts/schedule 100 #(st/emit! (msg/error msg)))
(st/emit! (rt/nav :auth-login)))))))) (st/emit! (rt/nav :auth-login)))))))))
(if @bad-token (if @bad-token
[:> static/invalid-token {}] [:> static/invalid-token {}]