♻️ Refactor loggers/audit, auth/oidc, and http/clent modules

backend/src/app/rpc/commands/auth.clj

@@ -15,7 +15,6 @@
    [app.emails :as eml]
    [app.http.session :as session]
    [app.loggers.audit :as audit]
-   [app.rpc :as-alias rpc]
    [app.rpc.climit :as climit]
    [app.rpc.doc :as-alias doc]
    [app.rpc.helpers :as rph]
@@ -138,8 +137,8 @@
 
         (-> response
             (rph/with-transform (session/create-fn session (:id profile)))
-            (vary-meta merge {::audit/props (audit/profile->props profile)
-                              ::audit/profile-id (:id profile)}))))))
+            (rph/with-meta {::audit/props (audit/profile->props profile)
+                            ::audit/profile-id (:id profile)}))))))
 
 (s/def ::login-with-password
   (s/keys :req-un [::email ::password]
@@ -163,8 +162,7 @@
   {:auth false
    ::doc/added "1.15"}
   [{:keys [session] :as cfg} _]
-  (with-meta {}
-    {::rpc/transform-response (session/delete-fn session)}))
+  (rph/with-transform {} (session/delete-fn session)))
 
 ;; ---- COMMAND: Recover Profile
 
@@ -378,8 +376,6 @@
                           (create-profile conn)
                           (create-profile-relations conn)
                           (profile/decode-profile-row)))
-        audit-fn   (:audit cfg)
-
         invitation (when-let [token (:invitation-token params)]
                      (tokens/verify sprops {:token token :iss :team-invitation}))]
 
@@ -388,10 +384,11 @@
     ;; accordingly.
     (when-let [id (:profile-id claims)]
       (db/update! conn :profile {:modified-at (dt/now)} {:id id})
-      (audit-fn :cmd :submit
-                :type "fact"
-                :name "register-profile-retry"
-                :profile-id id))
+      (when-let [collector (::audit/collector cfg)]
+        (audit/submit! collector
+                       {:type "fact"
+                        :name "register-profile-retry"
+                        :profile-id id})))
 
     (cond
       ;; If invitation token comes in params, this is because the
@@ -404,33 +401,33 @@
       (let [claims (assoc invitation :member-id  (:id profile))
             token  (tokens/generate sprops claims)
             resp   {:invitation-token token}]
-        (with-meta resp
-          {::rpc/transform-response (session/create-fn session (:id profile))
-           ::audit/replace-props (audit/profile->props profile)
-           ::audit/profile-id (:id profile)}))
+        (-> resp
+            (rph/with-transform (session/create-fn session (:id profile)))
+            (rph/with-meta {::audit/replace-props (audit/profile->props profile)
+                            ::audit/profile-id (:id profile)})))
 
       ;; If auth backend is different from "penpot" means user is
       ;; registering using third party auth mechanism; in this case
       ;; we need to mark this session as logged.
       (not= "penpot" (:auth-backend profile))
-      (with-meta (profile/strip-private-attrs profile)
-        {::rpc/transform-response (session/create-fn session (:id profile))
-         ::audit/replace-props (audit/profile->props profile)
-         ::audit/profile-id (:id profile)})
+      (-> (profile/strip-private-attrs profile)
+          (rph/with-transform (session/create-fn session (:id profile)))
+          (rph/with-meta {::audit/replace-props (audit/profile->props profile)
+                          ::audit/profile-id (:id profile)}))
 
       ;; If the `:enable-insecure-register` flag is set, we proceed
       ;; to sign in the user directly, without email verification.
       (true? is-active)
-      (with-meta (profile/strip-private-attrs profile)
-        {::rpc/transform-response (session/create-fn session (:id profile))
-         ::audit/replace-props (audit/profile->props profile)
-         ::audit/profile-id (:id profile)})
+      (-> (profile/strip-private-attrs profile)
+          (rph/with-transform (session/create-fn session (:id profile)))
+          (rph/with-meta {::audit/replace-props (audit/profile->props profile)
+                          ::audit/profile-id (:id profile)}))
 
       ;; In all other cases, send a verification email.
       :else
       (do
         (send-email-verification! conn sprops profile)
-        (with-meta profile
+        (rph/with-meta profile
           {::audit/replace-props (audit/profile->props profile)
            ::audit/profile-id (:id profile)})))))
 

backend/src/app/rpc/commands/ldap.clj

@@ -12,9 +12,9 @@
    [app.db :as db]
    [app.http.session :as session]
    [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.helpers :as rph]
    [app.rpc.queries.profile :as profile]
    [app.util.services :as sv]
    [clojure.spec.alpha :as s]))
@@ -63,15 +63,16 @@
                             :member-id  (:id profile)
                             :member-email (:email profile))
               token  (tokens :generate claims)]
-          (with-meta {:invitation-token token}
-            {::rpc/transform-response (session/create-fn session (:id profile))
-             ::audit/props (:props profile)
-             ::audit/profile-id (:id profile)}))
 
-        (with-meta profile
-          {::rpc/transform-response (session/create-fn session (:id profile))
-           ::audit/props (:props profile)
-           ::audit/profile-id (:id profile)})))))
+          (-> {:invitation-token token}
+              (rph/with-transform (session/create-fn session (:id profile)))
+              (rph/with-meta {::audit/props (:props profile)
+                              ::audit/profile-id (:id profile)})))
+
+        (-> profile
+            (rph/with-transform (session/create-fn session (:id profile)))
+            (rph/with-meta {::audit/props (:props profile)
+                            ::audit/profile-id (:id profile)}))))))
 
 (defn- login-or-register
   [{:keys [pool] :as cfg} info]

backend/src/app/rpc/commands/verify_token.clj

@@ -11,8 +11,8 @@
    [app.db :as db]
    [app.http.session :as session]
    [app.loggers.audit :as audit]
-   [app.rpc :as-alias rpc]
    [app.rpc.doc :as-alias doc]
+   [app.rpc.helpers :as rph]
    [app.rpc.mutations.teams :as teams]
    [app.rpc.queries.profile :as profile]
    [app.tokens :as tokens]
@@ -48,7 +48,7 @@
               {:email email}
               {:id profile-id})
 
-  (with-meta claims
+  (rph/with-meta claims
     {::audit/name "update-profile-email"
      ::audit/props {:email email}
      ::audit/profile-id profile-id}))
@@ -68,11 +68,11 @@
                   {:is-active true}
                   {:id (:id profile)}))
 
-    (with-meta claims
-      {::rpc/transform-response (session/create-fn session profile-id)
-       ::audit/name "verify-profile-email"
-       ::audit/props (audit/profile->props profile)
-       ::audit/profile-id (:id profile)})))
+    (-> claims
+        (rph/with-transform (session/create-fn session profile-id))
+        (rph/with-meta {::audit/name "verify-profile-email"
+                        ::audit/props (audit/profile->props profile)
+                        ::audit/profile-id (:id profile)}))))
 
 (defmethod process-token :auth
   [{:keys [conn] :as cfg} _params {:keys [profile-id] :as claims}]
@@ -148,14 +148,13 @@
         ;; proceed with accepting the invitation and joining the
         ;; current profile to the invited team.
         (let [profile (accept-invitation cfg claims invitation profile)]
-          (with-meta
-            (assoc claims :state :created)
-            {::audit/name "accept-team-invitation"
-             ::audit/props (merge
-                            (audit/profile->props profile)
-                            {:team-id (:team-id claims)
-                             :role (:role claims)})
-             ::audit/profile-id profile-id}))
+          (-> (assoc claims :state :created)
+              (rph/with-meta {::audit/name "accept-team-invitation"
+                              ::audit/props (merge
+                                             (audit/profile->props profile)
+                                             {:team-id (:team-id claims)
+                                              :role (:role claims)})
+                              ::audit/profile-id profile-id})))
 
         (ex/raise :type :validation
                   :code :invalid-token
@@ -171,15 +170,14 @@
                                  {:email member-email})
                                {:columns [:id :email]})]
         (let [profile (accept-invitation cfg claims invitation member)]
-          (with-meta
-            (assoc claims :state :created)
-            {::rpc/transform-response (session/create-fn session (:id profile))
-             ::audit/name "accept-team-invitation"
-             ::audit/props (merge
-                            (audit/profile->props profile)
-                            {:team-id (:team-id claims)
-                             :role (:role claims)})
-             ::audit/profile-id member-id}))
+          (-> (assoc claims :state :created)
+              (rph/with-transform (session/create-fn session (:id profile)))
+              (rph/with-meta {::audit/name "accept-team-invitation"
+                              ::audit/props (merge
+                                             (audit/profile->props profile)
+                                             {:team-id (:team-id claims)
+                                              :role (:role claims)})
+                              ::audit/profile-id member-id})))
 
         {:invitation-token token
          :iss :team-invitation