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

✨ Minor improvement on internal RPC metadata api

Browse source
This commit is contained in:
Andrey Antukh 2022-10-11 15:21:39 +02:00 • committed by Andrés Moya
parent 8e6b93e2a7
commit e50137d186
8 changed files with 31 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

11
backend/src/app/rpc/commands/auth.clj
View file

@ -14,6 +14,7 @@
[app.db :as db]
[app.emails :as eml]
[app.loggers.audit :as audit]
[app.rpc :as-alias rpc]
[app.rpc.doc :as-alias doc]
[app.rpc.mutations.teams :as teams]
[app.rpc.queries.profile :as profile]
@ -134,7 +135,7 @@
profile)]
(with-meta response
{:transform-response ((:create session) (:id profile))
{::rpc/transform-response ((:create session) (:id profile))
::audit/props (audit/profile->props profile)
::audit/profile-id (:id profile)})))))
@ -161,7 +162,7 @@
::doc/added "1.15"}
[{:keys [session] :as cfg} _]
(with-meta {}
{:transform-response (:delete session)}))
{::rpc/transform-response (:delete session)}))
;; ---- COMMAND: Recover Profile
@ -401,7 +402,7 @@
token (tokens/generate sprops claims)
resp {:invitation-token token}]
(with-meta resp
{:transform-response ((:create session) (:id profile))
{::rpc/transform-response ((:create session) (:id profile))
::audit/replace-props (audit/profile->props profile)
::audit/profile-id (:id profile)}))
@ -410,7 +411,7 @@
;; we need to mark this session as logged.
(not= "penpot" (:auth-backend profile))
(with-meta (profile/strip-private-attrs profile)
{:transform-response ((:create session) (:id profile))
{::rpc/transform-response ((:create session) (:id profile))
::audit/replace-props (audit/profile->props profile)
::audit/profile-id (:id profile)})
@ -418,7 +419,7 @@
;; to sign in the user directly, without email verification.
(true? is-active)
(with-meta (profile/strip-private-attrs profile)
{:transform-response ((:create session) (:id profile))
{::rpc/transform-response ((:create session) (:id profile))
::audit/replace-props (audit/profile->props profile)
::audit/profile-id (:id profile)})

10
backend/src/app/rpc/commands/binfile.clj
View file

@ -16,6 +16,7 @@
[app.config :as cf]
[app.db :as db]
[app.media :as media]
[app.rpc :as-alias rpc]
[app.rpc.doc :as-alias doc]
[app.rpc.queries.files :as files]
[app.rpc.queries.projects :as projects]
@ -879,10 +880,11 @@
(export! output-stream))))]
(with-meta (sv/wrap nil)
{:transform-response (fn [_ response]
(-> response
(assoc :body resp)
(assoc :headers {"content-type" "application/octet-stream"})))})))
{::rpc/transform-response
(fn [_ response]
(-> response
(assoc :body resp)
(assoc :headers {"content-type" "application/octet-stream"})))})))
(s/def ::file ::media/upload)
(s/def ::import-binfile

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

@ -11,6 +11,7 @@
[app.common.spec :as us]
[app.db :as db]
[app.loggers.audit :as-alias audit]
[app.rpc :as-alias rpc]
[app.rpc.commands.auth :as cmd.auth]
[app.rpc.doc :as-alias doc]
[app.rpc.queries.profile :as profile]
@ -62,12 +63,12 @@
:member-email (:email profile))
token (tokens :generate claims)]
(with-meta {:invitation-token token}
{:transform-response ((:create session) (:id profile))
{::rpc/transform-response ((:create session) (:id profile))
::audit/props (:props profile)
::audit/profile-id (:id profile)}))
(with-meta profile
{:transform-response ((:create session) (:id profile))
{::rpc/transform-response ((:create session) (:id profile))
::audit/props (:props profile)
::audit/profile-id (:id profile)})))))

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

@ -10,6 +10,7 @@
[app.common.spec :as us]
[app.db :as db]
[app.loggers.audit :as audit]
[app.rpc :as-alias rpc]
[app.rpc.doc :as-alias doc]
[app.rpc.mutations.teams :as teams]
[app.rpc.queries.profile :as profile]
@ -67,7 +68,7 @@
{:id (:id profile)}))
(with-meta claims
{:transform-response ((:create session) profile-id)
{::rpc/transform-response ((:create session) profile-id)
::audit/name "verify-profile-email"
::audit/props (audit/profile->props profile)
::audit/profile-id (:id profile)})))
@ -171,7 +172,7 @@
(let [profile (accept-invitation cfg claims invitation member)]
(with-meta
(assoc claims :state :created)
{:transform-response ((:create session) (:id profile))
{::rpc/transform-response ((:create session) (:id profile))
::audit/name "accept-team-invitation"
::audit/props (merge
(audit/profile->props profile)