3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-13 15:06:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

✨ Improve implementation of rpc handler for profile deletion.

Browse source
This commit is contained in:
Andrey Antukh 2021-01-29 15:47:57 +01:00 • committed by Andrés Moya
parent afedd397a7
commit 1dcd7dc806
1 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

26
backend/src/app/rpc/mutations/profile.clj
View file

@ -437,7 +437,7 @@
;; --- Mutation: Delete Profile ;; --- Mutation: Delete Profile
(declare check-teams-ownership!) (declare check-can-delete-profile!)
(declare mark-profile-as-deleted!) (declare mark-profile-as-deleted!)
(s/def ::delete-profile (s/def ::delete-profile
@ -446,7 +446,7 @@
(sv/defmethod ::delete-profile (sv/defmethod ::delete-profile
[{:keys [pool session] :as cfg} {:keys [profile-id] :as params}] [{:keys [pool session] :as cfg} {:keys [profile-id] :as params}]
(db/with-atomic [conn pool] (db/with-atomic [conn pool]
(check-teams-ownership! conn profile-id) (check-can-delete-profile! conn profile-id)
;; Schedule a complete deletion of profile ;; Schedule a complete deletion of profile
(tasks/submit! conn {:name "delete-profile" (tasks/submit! conn {:name "delete-profile"
@ -464,24 +464,26 @@
(assoc response (assoc response
:cookies (session/cookies session {:value "" :max-age -1})))}))) :cookies (session/cookies session {:value "" :max-age -1})))})))
(def ^:private sql:teams-ownership-check (def sql:owned-teams
"with teams as ( "with owner_teams as (
select tpr.team_id as id select tpr.team_id as id
from team_profile_rel as tpr from team_profile_rel as tpr
where tpr.profile_id = ? where tpr.is_owner is true
and tpr.is_owner is true and tpr.profile_id = ?
) )
select tpr.team_id, select tpr.team_id,
count(tpr.profile_id) as num_profiles count(tpr.profile_id) as num_profiles
from team_profile_rel as tpr from team_profile_rel as tpr
where tpr.team_id in (select id from teams) where tpr.team_id in (select id from owner_teams)
group by tpr.team_id group by 1")
having count(tpr.profile_id) > 1")
(defn- check-teams-ownership! (defn- check-can-delete-profile!
[conn profile-id] [conn profile-id]
(let [rows (db/exec! conn [sql:teams-ownership-check profile-id])] (let [rows (db/exec! conn [sql:owned-teams profile-id])]
(when-not (empty? rows) ;; If we found owned teams with more than one profile we don't
;; allow delete profile until the user properly transfer ownership
;; or explictly removes all participants from the team.
(when (some #(> (:num-profiles %) 1) rows)
(ex/raise :type :validation (ex/raise :type :validation
:code :owner-teams-with-people :code :owner-teams-with-people
:hint "The user need to transfer ownership of owned teams." :hint "The user need to transfer ownership of owned teams."