johanels/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-12-12 06:24:17 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge pull request #7494 from penpot/niwinz-staging-hotfix-3

Browse Source 
✨ Use system clock for check invitation expiration
This commit is contained in:
Alejandro Alonso
2025-10-15 10:23:48 +02:00
committed by GitHub
parent fad148e6a6 f7b3913c71
commit 1d14644250
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
backend/src/app/rpc/commands/teams.clj
View File

@@ -443,13 +443,18 @@
[:team-id ::sm/uuid]]) [:team-id ::sm/uuid]])
(def sql:team-invitations (def sql:team-invitations
"select email_to as email, role, (valid_until < now()) as expired "SELECT email_to AS email,
from team_invitation where team_id = ? order by valid_until desc, created_at desc") role,
(valid_until < ?::timestamptz) AS expired
FROM team_invitation
WHERE team_id = ?
ORDER BY valid_until DESC, created_at DESC")
(defn get-team-invitations (defn get-team-invitations
[conn team-id] [conn team-id]
(->> (db/exec! conn [sql:team-invitations team-id]) (let [now (ct/now)]
(mapv #(update % :role keyword)))) (->> (db/exec! conn [sql:team-invitations now team-id])
(mapv #(update % :role keyword)))))
(sv/defmethod ::get-team-invitations (sv/defmethod ::get-team-invitations
{::doc/added "1.17" {::doc/added "1.17"