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

✨ Add created-by to invitations, and an event related

Browse source
This commit is contained in:
Pablo Alba 2024-11-11 16:47:22 +01:00
parent e1e13bcfb1
commit cbc92e9f1e
4 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
backend/src/app/migrations.clj
View file

@ -424,7 +424,10 @@
:fn (mg/resource "app/migrations/sql/0133-mod-file-table.sql")} :fn (mg/resource "app/migrations/sql/0133-mod-file-table.sql")}
{:name "0134-mod-file-change-table" {:name "0134-mod-file-change-table"
:fn (mg/resource "app/migrations/sql/0134-mod-file-change-table.sql")}]) :fn (mg/resource "app/migrations/sql/0134-mod-file-change-table.sql")}
{:name "0135-mod-team-invitation-table.sql"
:fn (mg/resource "app/migrations/sql/0135-mod-team-invitation-table.sql")}])
(defn apply-migrations! (defn apply-migrations!
[pool name migrations] [pool name migrations]

2
backend/src/app/migrations/sql/0135-mod-team-invitation-table.sql Normal file
View file

@ -0,0 +1,2 @@
ALTER TABLE team_invitation
ADD COLUMN created_by uuid NULL REFERENCES profile(id) ON DELETE SET NULL;

5
backend/src/app/rpc/commands/teams.clj
View file

@ -759,8 +759,8 @@
;; --- Mutation: Create Team Invitation ;; --- Mutation: Create Team Invitation
(def sql:upsert-team-invitation (def sql:upsert-team-invitation
"insert into team_invitation(id, team_id, email_to, role, valid_until) "insert into team_invitation(id, team_id, email_to, role, valid_until, created_by)
values (?, ?, ?, ?, ?) values (?, ?, ?, ?, ?, ?)
on conflict(team_id, email_to) do on conflict(team_id, email_to) do
update set role = ?, valid_until = ?, updated_at = now() update set role = ?, valid_until = ?, updated_at = now()
returning *") returning *")
@ -853,6 +853,7 @@
invitation (db/exec-one! conn [sql:upsert-team-invitation id invitation (db/exec-one! conn [sql:upsert-team-invitation id
(:id team) (str/lower email) (:id team) (str/lower email)
(name role) expire (name role) expire
(:id profile)
(name role) expire]) (name role) expire])
updated? (not= id (:id invitation)) updated? (not= id (:id invitation))
profile-id (:id profile) profile-id (:id profile)

8
backend/src/app/rpc/commands/verify_token.clj
View file

@ -169,10 +169,16 @@
:invitation-id (:id invitation)} :invitation-id (:id invitation)}
event (-> (audit/event-from-rpc-params params) event (-> (audit/event-from-rpc-params params)
(assoc ::audit/name "accept-team-invitation") (assoc ::audit/name "accept-team-invitation")
(assoc ::audit/props props))] (assoc ::audit/props props))
ev-invitation-from (-> (audit/event-from-rpc-params params)
(assoc ::audit/profile-id (:created-by invitation))
(assoc ::audit/name "accept-team-invitation-from")
(assoc ::audit/props (assoc props :profile-id (:id profile)
:email (:email profile))))]
(accept-invitation cfg claims invitation profile) (accept-invitation cfg claims invitation profile)
(audit/submit! cfg event) (audit/submit! cfg event)
(audit/submit! cfg ev-invitation-from)
(assoc claims :state :created)) (assoc claims :state :created))
(ex/raise :type :validation (ex/raise :type :validation