mirror of
https://github.com/penpot/penpot.git
synced 2026-09-11 22:49:30 +00:00
Publish team/org notifications to team-id and organization-id topics instead of broadcasting to all connections via uuid/zero. Dashboard and workspace now subscribe to their current team and organization on initialization, receiving only relevant events. Backend: added subscribe-organization/unsubscribe-organization WebSocket handlers and updated :close to clean up organization subscriptions. Modified notify-team-change, notify-organization-deletion, and notify-organization-change-sso to publish to specific topics. Frontend: dashboard and workspace now subscribe to team-id and organization-id (when applicable) on initialization, with nil-guard in topic filters. Closes #11455 AI-assisted-by: longcat-2.0
133 lines
5.4 KiB
Clojure
133 lines
5.4 KiB
Clojure
;; This Source Code Form is subject to the terms of the Mozilla Public
|
|
;; License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
;;
|
|
;; Copyright (c) KALEIDOS SUBSIDIARY SL
|
|
|
|
(ns frontend-tests.data.dashboard-test
|
|
(:require
|
|
[app.common.uuid :as uuid]
|
|
[app.config :as cf]
|
|
[app.main.data.common :as dcm]
|
|
[app.main.data.dashboard :as dd]
|
|
[app.main.data.websocket :as dws]
|
|
[app.main.repo :as rp]
|
|
[app.main.router :as rt]
|
|
[beicon.v2.core :as rx]
|
|
[cljs.test :as t :include-macros true]
|
|
[frontend-tests.helpers.mock :as mock]
|
|
[potok.v2.core :as ptk]))
|
|
|
|
(t/deftest moving-current-team-into-sso-organization-redirects
|
|
(t/async done
|
|
(let [team-id (uuid/next)
|
|
organization {:id (uuid/next) :name "OrgA"}
|
|
current-url (str "https://penpot.example.com/#/dashboard/recent?team-id=" team-id)
|
|
redirect-url "https://idp.example.com/authorize"
|
|
state {:current-team-id team-id}
|
|
event (dcm/handle-change-team-organization
|
|
{:team {:id team-id :organization organization}
|
|
:notification nil})]
|
|
(mock/with-mocks
|
|
{cf/flags (conj cf/flags :admin-console)
|
|
rp/cmd! (mock/stub
|
|
(fn [cmd params]
|
|
(if (= [:check-nitrate-sso
|
|
{:team-id team-id :url current-url}]
|
|
[cmd params])
|
|
(rx/of {:authorized false :redirect-uri redirect-url})
|
|
(rx/throw (ex-info "unexpected RPC" {:cmd cmd :params params})))))
|
|
rt/get-current-href (mock/stub (constantly current-url))}
|
|
(fn [done']
|
|
(->> (ptk/watch event state nil)
|
|
(rx/reduce conj [])
|
|
(rx/subs!
|
|
(fn [events]
|
|
(t/is (= [::rt/nav-raw] (mapv ptk/type events))))
|
|
(fn [error]
|
|
(t/is false (str "unexpected error: " error))
|
|
(done'))
|
|
(fn []
|
|
(done')))))
|
|
done))))
|
|
|
|
(t/deftest organization-sso-activation-redirects-current-team
|
|
(t/async done
|
|
(let [team-id (uuid/next)
|
|
organization-id (uuid/next)
|
|
current-url (str "https://penpot.example.com/#/workspace?team-id=" team-id)
|
|
redirect-url "https://idp.example.com/authorize"
|
|
state {:current-team-id team-id
|
|
:teams {team-id {:id team-id
|
|
:organization {:id organization-id}}}}
|
|
event (dcm/handle-organization-change-sso
|
|
{:organization-id organization-id})]
|
|
(mock/with-mocks
|
|
{cf/flags (conj cf/flags :admin-console)
|
|
rp/cmd! (mock/stub
|
|
(fn [cmd params]
|
|
(if (= [:check-nitrate-sso
|
|
{:team-id team-id :url current-url}]
|
|
[cmd params])
|
|
(rx/of {:authorized false :redirect-uri redirect-url})
|
|
(rx/throw (ex-info "unexpected RPC" {:cmd cmd :params params})))))
|
|
rt/get-current-href (mock/stub (constantly current-url))}
|
|
(fn [done']
|
|
(->> (ptk/watch event state nil)
|
|
(rx/reduce conj [])
|
|
(rx/subs!
|
|
(fn [events]
|
|
(t/is (= [::rt/nav-raw] (mapv ptk/type events))))
|
|
(fn [error]
|
|
(t/is false (str "unexpected error: " error))
|
|
(done'))
|
|
(fn []
|
|
(done')))))
|
|
done))))
|
|
|
|
(t/deftest dashboard-initializes-with-team-and-organization-subscriptions
|
|
(t/async done
|
|
(let [team-id (uuid/next)
|
|
org-id (uuid/next)
|
|
state {:profile-id (uuid/next)
|
|
:current-team-id team-id
|
|
:teams {team-id {:id team-id :organization {:id org-id}}}}
|
|
events (atom [])
|
|
event (dd/initialize team-id)]
|
|
(mock/with-mocks
|
|
{dws/send (mock/stub (fn [msg] (swap! events conj msg)))}
|
|
(fn [done']
|
|
(->> (ptk/watch event state (rx/empty))
|
|
(rx/reduce conj [])
|
|
(rx/subs!
|
|
(fn [_])
|
|
(fn [error] (t/is false (str error)) (done'))
|
|
(fn []
|
|
(t/is (some #(= :subscribe-team (:type %)) @events))
|
|
(t/is (some #(and (= :subscribe-organization (:type %))
|
|
(= org-id (:organization-id %))) @events))
|
|
(done')))))
|
|
done))))
|
|
|
|
(t/deftest dashboard-without-organization-only-subscribes-to-team
|
|
(t/async done
|
|
(let [team-id (uuid/next)
|
|
state {:profile-id (uuid/next)
|
|
:current-team-id team-id
|
|
:teams {team-id {:id team-id}}}
|
|
events (atom [])
|
|
event (dd/initialize team-id)]
|
|
(mock/with-mocks
|
|
{dws/send (mock/stub (fn [msg] (swap! events conj msg)))}
|
|
(fn [done']
|
|
(->> (ptk/watch event state (rx/empty))
|
|
(rx/reduce conj [])
|
|
(rx/subs!
|
|
(fn [_])
|
|
(fn [error] (t/is false (str error)) (done'))
|
|
(fn []
|
|
(t/is (some #(= :subscribe-team (:type %)) @events))
|
|
(t/is (not (some #(= :subscribe-organization (:type %))) @events))
|
|
(done')))))
|
|
done))))
|