mirror of
https://github.com/penpot/penpot.git
synced 2026-11-06 01:50:39 +00:00
✨ Render email templates inside the mail job (#12448)
* ✨ Render email templates inside the mail job The web process rendered each email to full subject and HTML body before submitting it, so every queued job carried a huge params payload. The queue now stores only the template id plus the raw template data, and the new :send-templated-mail job renders and sends the email inside the worker. The old :sendmail job stays in place to drain jobs submitted in the previous format; the quota notice and the REPL test mail keep using it. All templated callers (auth, profile, feedback, invitations, comments, Nitrate) submit recipes through eml/send-template. Closes #12445 AI-assisted-by: muse-spark-1.3-contributor * ♻️ Unify templated mail on template id strings The ::eml/template value was a namespaced keyword whose name had to match the registry key, with one live mismatch (user-feedback vs feedback). Callers now pass the registry id string itself, so keys stay ::eml/-namespaced and values stay plain data, and the single templates set rejects unsendable mail both at submit and in the worker. Closes #12445 AI-assisted-by: muse-spark-1.3-contributor * 🐛 Encode templated mail data with the template schema The job params column is plain JSON, so the URIs of an organization (:logo, :avatar-bg-url) were stored as record maps and the template check rejected them in the worker. Invites for organization teams, organization invites and renewal notices failed without a retry. Each registry entry now carries the JSON encoder and decoder of its template schema: send-template encodes the data before submit and the worker decodes it before rendering. The job schema keeps only the mail envelope, as the template schemas own the typed data. Closes #12445 AI-assisted-by: claude-opus-5-5 ---------
This commit is contained in:
Andrey Antukh
GitHub
parent
02223a67fa
commit
9234e829d9
@ -305,7 +305,14 @@
|
||||
second `params` provides the email data and optionally `::factory`
|
||||
and `::reuse-conn`. When `::reuse-conn` is true the submission
|
||||
reuses the caller's existing `::db/conn` (from cfg) instead of
|
||||
acquiring a fresh one from the pool."
|
||||
acquiring a fresh one from the pool.
|
||||
|
||||
NOTE: this renders the email before submitting, so the full subject
|
||||
and body are stored as job params. Prefer `send-template` for
|
||||
templated emails: it stores only the template id plus the raw data
|
||||
and renders inside the worker. `send` is kept for raw (non
|
||||
templated) emails and for draining jobs submitted in the old
|
||||
format."
|
||||
[cfg {:keys [::reuse-conn ::factory] :as params}]
|
||||
(when (and reuse-conn (nil? (::db/conn cfg)))
|
||||
(ex/raise :type :validation
|
||||
@ -394,7 +401,7 @@
|
||||
[:feedback-subject ::sm/text]
|
||||
[:feedback-type ::sm/text]
|
||||
[:feedback-content ::sm/text]
|
||||
[:profile :map]])
|
||||
[:profile [:map [:id ::sm/uuid]]]])
|
||||
|
||||
(def user-feedback
|
||||
"A profile feedback email."
|
||||
@ -593,6 +600,125 @@
|
||||
:id ::comment-notification
|
||||
:schema schema:comment-notification))
|
||||
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
;; TEMPLATED SEND (render inside the worker)
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
(defn- template-entry
|
||||
"Registry entry for a templated email: the factory that renders it and
|
||||
the JSON encoder/decoder of its data schema. The job `params` column
|
||||
is plain JSON, so values without a JSON form (e.g. the URIs of an
|
||||
organization) are encoded to strings before submit and decoded back
|
||||
to their types before the factory validates and renders them."
|
||||
[factory schema]
|
||||
{::factory factory
|
||||
::encode (sm/encoder schema sm/json-transformer)
|
||||
::decode (sm/decoder schema sm/json-transformer)})
|
||||
|
||||
;; Registry of template id to entry. This map is the single source of
|
||||
;; truth for templated mail: `send-template` validates membership and
|
||||
;; encodes the data here before submitting (so a job that could never
|
||||
;; be rendered is rejected up front), and the worker decodes the data
|
||||
;; and renders it with the entry factory. Callers pass the id string
|
||||
;; itself (e.g. `"invite-to-team"`); keys stay `::eml/`-namespaced and
|
||||
;; values stay plain data, following the params convention.
|
||||
(def templates
|
||||
{"feedback" (template-entry user-feedback schema:feedback)
|
||||
"register" (template-entry register schema:register)
|
||||
"password-recovery" (template-entry password-recovery schema:password-recovery)
|
||||
"password-changed" (template-entry password-changed schema:password-changed)
|
||||
"change-email" (template-entry change-email schema:change-email)
|
||||
"invite-to-team" (template-entry invite-to-team schema:invite-to-team)
|
||||
"invite-to-organization" (template-entry invite-to-organization schema:invite-to-organization)
|
||||
"organization-setup-sso" (template-entry organization-setup-sso schema:organization-setup-sso)
|
||||
"renewal-notice" (template-entry renewal-notice schema:renewal-notice)
|
||||
"join-team" (template-entry join-team schema:join-team)
|
||||
"request-file-access" (template-entry request-file-access schema:request-file-access)
|
||||
"request-file-access-yourpenpot" (template-entry request-file-access-yourpenpot schema:request-file-access)
|
||||
"request-file-access-yourpenpot-view" (template-entry request-file-access-yourpenpot-view schema:request-file-access)
|
||||
"request-team-access" (template-entry request-team-access schema:request-team-access)
|
||||
"comment-mention" (template-entry comment-mention schema:comment-mention)
|
||||
"comment-thread" (template-entry comment-thread schema:comment-thread)
|
||||
"comment-notification" (template-entry comment-notification schema:comment-notification)})
|
||||
|
||||
(defn render-template
|
||||
"Render the templated email `template-id` from its JSON-decoded data,
|
||||
as the worker does before sending it."
|
||||
[template-id params]
|
||||
(let [{:keys [::factory ::decode]} (get templates template-id)]
|
||||
(factory (decode params))))
|
||||
|
||||
;; Envelope of the job params only: the template data travels encoded
|
||||
;; by the template schema and is decoded by `render-template`.
|
||||
(def ^:private schema:templated-params
|
||||
[:map {:title "Templated Email Params"}
|
||||
[:template (into [:enum] (sort (keys templates)))]
|
||||
[:to [:or ::sm/email [::sm/vec ::sm/email]]]
|
||||
[:reply-to {:optional true} ::sm/email]
|
||||
[:from {:optional true} ::sm/email]
|
||||
[:lang {:optional true} ::sm/text]
|
||||
[:priority {:optional true} [:enum :high :low]]
|
||||
[:extra-data {:optional true} ::sm/text]
|
||||
[:attachments {:optional true}
|
||||
[:map-of :string :string]]])
|
||||
|
||||
(defn send-template
|
||||
"Schedule a templated email to be sent asynchronously using the
|
||||
unified jobs machinery. Unlike `send`, this does NOT render the
|
||||
email: it stores only the template id plus the raw template data as
|
||||
`:send-templated-mail` job params, and the worker renders and sends
|
||||
the email. The `::template` param is the template id string (one of
|
||||
the keys of `templates`, e.g. `invite-to-team`);
|
||||
`::reuse-conn` behaves like in `send`."
|
||||
[cfg {:keys [::template ::reuse-conn] :as params}]
|
||||
(when (and reuse-conn (nil? (::db/conn cfg)))
|
||||
(ex/raise :type :validation
|
||||
:code :missing-connection
|
||||
:hint "reuse-conn requires the caller cfg to carry ::db/conn (call inside a transaction)"))
|
||||
(when (nil? template)
|
||||
(ex/raise :type :validation
|
||||
:code :missing-template
|
||||
:hint "template is mandatory for templated emails"))
|
||||
(when-not (contains? templates template)
|
||||
(ex/raise :type :validation
|
||||
:code :unknown-email-template
|
||||
:hint (str/ffmt "unknown email template: %", template)))
|
||||
(let [encode (get-in templates [template ::encode])
|
||||
recipe (-> params
|
||||
(dissoc ::reuse-conn ::template)
|
||||
;; Present-but-nil extras (e.g. `:file-id` when there is
|
||||
;; no file) would fail the job schema, while the old
|
||||
;; inline render simply ignored them.
|
||||
(d/without-nils)
|
||||
(encode))]
|
||||
(jobs/submit (cond-> (dissoc cfg ::db/conn)
|
||||
reuse-conn (assoc ::db/conn (::db/conn cfg)))
|
||||
{::jobs/name :send-templated-mail
|
||||
::jobs/delay 0
|
||||
::jobs/max-retries 4
|
||||
::jobs/priority 200
|
||||
::jobs/params (cond-> (assoc recipe :template template)
|
||||
;; `:public-uri` arrives as a URI record
|
||||
;; from config, which plain JSON cannot
|
||||
;; roundtrip; the templates only need its
|
||||
;; string form.
|
||||
(some? (:public-uri recipe))
|
||||
(update :public-uri str))})))
|
||||
|
||||
(defmethod ig/init-key ::templated-job-def
|
||||
[_ {sendmail ::sendmail}]
|
||||
{::jobs/name :send-templated-mail
|
||||
::jobs/schema schema:templated-params
|
||||
::jobs/handler (fn [context params]
|
||||
(let [template-id (:template params)]
|
||||
(when-not (contains? templates template-id)
|
||||
(ex/raise :type :internal
|
||||
:code :unknown-email-template
|
||||
:template-id template-id))
|
||||
(sendmail context (render-template template-id (dissoc params :template)))))
|
||||
::jobs/decoder (sm/decoder schema:templated-params sm/json-transformer)
|
||||
::jobs/validator (sm/validator schema:templated-params)})
|
||||
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
;; BOUNCE/COMPLAINS HELPERS
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
@ -656,24 +656,25 @@
|
||||
::setup/shared-keys (ig/ref ::setup/shared-keys)}
|
||||
|
||||
::jobs/defs
|
||||
{:sendmail (ig/ref ::email/job-def)
|
||||
:delete-object (ig/ref :app.tasks.delete-object/job-def)
|
||||
:demo-purge (ig/ref :app.tasks.demo-purge/job-def)
|
||||
:run-webhook (ig/ref ::webhooks/run-webhook-job-def)
|
||||
:process-webhook-event (ig/ref ::webhooks/process-webhook-event-job-def)
|
||||
:file-gc (ig/ref :app.tasks.file-gc/job-def)
|
||||
:offload-file-data (ig/ref :app.tasks.offload-file-data/job-def)
|
||||
:objects-gc (ig/ref :app.tasks.objects-gc/job-def)
|
||||
:export-binfile (ig/ref :app.tasks.export-binfile/job-def)
|
||||
:import-binfile (ig/ref :app.tasks.import-binfile/job-def)
|
||||
:storage-gc-deleted (ig/ref ::sto.gc-deleted/job-def)
|
||||
:storage-gc-touched (ig/ref ::sto.gc-touched/job-def)
|
||||
:storage-pending-gc (ig/ref ::sto.pending-gc/job-def)
|
||||
:jobs-gc (ig/ref :app.jobs.gc/job-def)
|
||||
:telemetry (ig/ref :app.tasks.telemetry/job-def)
|
||||
:session-gc (ig/ref ::session/job-def)
|
||||
:file-gc-scheduler (ig/ref :app.tasks.file-gc-scheduler/job-def)
|
||||
:audit-log-consumer-nexus (ig/ref :app.loggers.audit.consumer-task/nexus-job-def)
|
||||
{:sendmail (ig/ref ::email/job-def)
|
||||
:send-templated-mail (ig/ref ::email/templated-job-def)
|
||||
:delete-object (ig/ref :app.tasks.delete-object/job-def)
|
||||
:demo-purge (ig/ref :app.tasks.demo-purge/job-def)
|
||||
:run-webhook (ig/ref ::webhooks/run-webhook-job-def)
|
||||
:process-webhook-event (ig/ref ::webhooks/process-webhook-event-job-def)
|
||||
:file-gc (ig/ref :app.tasks.file-gc/job-def)
|
||||
:offload-file-data (ig/ref :app.tasks.offload-file-data/job-def)
|
||||
:objects-gc (ig/ref :app.tasks.objects-gc/job-def)
|
||||
:export-binfile (ig/ref :app.tasks.export-binfile/job-def)
|
||||
:import-binfile (ig/ref :app.tasks.import-binfile/job-def)
|
||||
:storage-gc-deleted (ig/ref ::sto.gc-deleted/job-def)
|
||||
:storage-gc-touched (ig/ref ::sto.gc-touched/job-def)
|
||||
:storage-pending-gc (ig/ref ::sto.pending-gc/job-def)
|
||||
:jobs-gc (ig/ref :app.jobs.gc/job-def)
|
||||
:telemetry (ig/ref :app.tasks.telemetry/job-def)
|
||||
:session-gc (ig/ref ::session/job-def)
|
||||
:file-gc-scheduler (ig/ref :app.tasks.file-gc-scheduler/job-def)
|
||||
:audit-log-consumer-nexus (ig/ref :app.loggers.audit.consumer-task/nexus-job-def)
|
||||
:audit-log-consumer-admin-console (ig/ref :app.loggers.audit.consumer-task/admin-console-job-def)}
|
||||
|
||||
::jobs/request-pool
|
||||
@ -684,6 +685,10 @@
|
||||
{::email/sendmail (ig/ref ::email/sendmail)
|
||||
::mtx/metrics (ig/ref ::mtx/metrics)}
|
||||
|
||||
:app.email/templated-job-def
|
||||
{::email/sendmail (ig/ref ::email/sendmail)
|
||||
::mtx/metrics (ig/ref ::mtx/metrics)}
|
||||
|
||||
:app.tasks.delete-object/job-def
|
||||
{::db/pool (ig/ref ::db/pool)
|
||||
::sto/storage (ig/ref ::sto/storage)
|
||||
|
||||
@ -202,11 +202,11 @@
|
||||
(update-password conn))]
|
||||
(when profile
|
||||
(login-lockout/clear-attempts! cfg (:id profile))
|
||||
(eml/send cfg {::eml/reuse-conn true
|
||||
::eml/factory eml/password-changed
|
||||
:public-uri (cf/get :public-uri)
|
||||
:to (:email profile)
|
||||
:name (:fullname profile)})))
|
||||
(eml/send-template cfg {::eml/reuse-conn true
|
||||
::eml/template "password-changed"
|
||||
:public-uri (cf/get :public-uri)
|
||||
:to (:email profile)
|
||||
:name (:fullname profile)})))
|
||||
|
||||
nil))
|
||||
|
||||
@ -485,13 +485,13 @@
|
||||
{:iss :profile-identity
|
||||
:profile-id (:id profile)
|
||||
:exp (ct/in-future {:days 30})})]
|
||||
(eml/send cfg {::eml/reuse-conn true
|
||||
::eml/factory eml/register
|
||||
:public-uri (cf/get :public-uri)
|
||||
:to (:email profile)
|
||||
:name (:fullname profile)
|
||||
:token vtoken
|
||||
:extra-data ptoken}))))
|
||||
(eml/send-template cfg {::eml/reuse-conn true
|
||||
::eml/template "register"
|
||||
:public-uri (cf/get :public-uri)
|
||||
:to (:email profile)
|
||||
:name (:fullname profile)
|
||||
:token vtoken
|
||||
:extra-data ptoken}))))
|
||||
|
||||
(defn register-profile
|
||||
[{:keys [::db/conn] :as cfg} {:keys [token] :as params}]
|
||||
@ -654,13 +654,13 @@
|
||||
{:iss :profile-identity
|
||||
:profile-id (:id profile)
|
||||
:exp (ct/in-future {:days 30})})]
|
||||
(eml/send cfg {::eml/reuse-conn true
|
||||
::eml/factory eml/password-recovery
|
||||
:public-uri (cf/get :public-uri)
|
||||
:to (:email profile)
|
||||
:token (:token profile)
|
||||
:name (:fullname profile)
|
||||
:extra-data ptoken})
|
||||
(eml/send-template cfg {::eml/reuse-conn true
|
||||
::eml/template "password-recovery"
|
||||
:public-uri (cf/get :public-uri)
|
||||
:to (:email profile)
|
||||
:token (:token profile)
|
||||
:name (:fullname profile)
|
||||
:extra-data ptoken})
|
||||
nil))]
|
||||
|
||||
(let [profile (->> (profile/clean-email email)
|
||||
|
||||
@ -112,10 +112,10 @@
|
||||
(doseq [mention comment-mentions]
|
||||
(let [{:keys [fullname email props]} (get team-users mention)]
|
||||
(when (mention-email? props)
|
||||
(eml/send
|
||||
(eml/send-template
|
||||
cfg
|
||||
{::eml/reuse-conn true
|
||||
::eml/factory eml/comment-mention
|
||||
::eml/template "comment-mention"
|
||||
:public-uri (cf/get :public-uri)
|
||||
:to email
|
||||
:name fullname
|
||||
@ -128,10 +128,10 @@
|
||||
(doseq [mention thread-mentions]
|
||||
(let [{:keys [fullname email props]} (get team-users mention)]
|
||||
(when (mention-email? props)
|
||||
(eml/send
|
||||
(eml/send-template
|
||||
cfg
|
||||
{::eml/reuse-conn true
|
||||
::eml/factory eml/comment-thread
|
||||
::eml/template "comment-thread"
|
||||
:public-uri (cf/get :public-uri)
|
||||
:to email
|
||||
:name fullname
|
||||
@ -144,10 +144,10 @@
|
||||
(doseq [user-id notificate-users-ids]
|
||||
(let [{:keys [id fullname email props]} (get team-users user-id)]
|
||||
(when (notification-email? id (:owner-id thread) props)
|
||||
(eml/send
|
||||
(eml/send-template
|
||||
cfg
|
||||
{::eml/reuse-conn true
|
||||
::eml/factory eml/comment-notification
|
||||
::eml/template "comment-notification"
|
||||
:public-uri (cf/get :public-uri)
|
||||
:to email
|
||||
:name fullname
|
||||
|
||||
@ -103,16 +103,16 @@
|
||||
(d/without-nils
|
||||
{"error-report.txt" (:error-report params)})]
|
||||
|
||||
(eml/send cfg {::eml/reuse-conn true
|
||||
::eml/factory eml/user-feedback
|
||||
:to destination
|
||||
:reply-to (:email profile)
|
||||
:email (:email profile)
|
||||
:attachments attachments
|
||||
(eml/send-template cfg {::eml/reuse-conn true
|
||||
::eml/template "feedback"
|
||||
:to destination
|
||||
:reply-to (:email profile)
|
||||
:email (:email profile)
|
||||
:attachments attachments
|
||||
|
||||
:feedback-subject (:subject params)
|
||||
:feedback-type (:type params "not-specified")
|
||||
:feedback-content (:content params)
|
||||
:feedback-error-href (:error-href params)
|
||||
:profile profile})
|
||||
:feedback-subject (:subject params)
|
||||
:feedback-type (:type params "not-specified")
|
||||
:feedback-content (:content params)
|
||||
:feedback-error-href (:error-href params)
|
||||
:profile (select-keys profile [:id :fullname :email])})
|
||||
nil))
|
||||
|
||||
@ -225,11 +225,11 @@
|
||||
|
||||
(update-profile-password! cfg (assoc profile :password password))
|
||||
|
||||
(eml/send cfg {::eml/reuse-conn true
|
||||
::eml/factory eml/password-changed
|
||||
:public-uri (cf/get :public-uri)
|
||||
:to (:email profile)
|
||||
:name (:fullname profile)})
|
||||
(eml/send-template cfg {::eml/reuse-conn true
|
||||
::eml/template "password-changed"
|
||||
:public-uri (cf/get :public-uri)
|
||||
:to (:email profile)
|
||||
:name (:fullname profile)})
|
||||
|
||||
(->> (rph/get-request params)
|
||||
(session/get-session)
|
||||
@ -463,14 +463,14 @@
|
||||
:email (:email profile)
|
||||
:hint "looks like the email has spam complaint reports"))
|
||||
|
||||
(eml/send cfg {::eml/reuse-conn true
|
||||
::eml/factory eml/change-email
|
||||
:public-uri (cf/get :public-uri)
|
||||
:to (:email profile)
|
||||
:name (:fullname profile)
|
||||
:pending-email email
|
||||
:token token
|
||||
:extra-data ptoken})
|
||||
(eml/send-template cfg {::eml/reuse-conn true
|
||||
::eml/template "change-email"
|
||||
:public-uri (cf/get :public-uri)
|
||||
:to (:email profile)
|
||||
:name (:fullname profile)
|
||||
:pending-email email
|
||||
:token token
|
||||
:extra-data ptoken})
|
||||
nil))
|
||||
|
||||
;; --- MUTATION: Update Profile Props
|
||||
|
||||
@ -291,24 +291,24 @@
|
||||
(not recent?))
|
||||
(if organization
|
||||
(when (contains? cf/flags :admin-console)
|
||||
(eml/send cfg {::eml/reuse-conn true
|
||||
::eml/factory eml/invite-to-organization
|
||||
:public-uri (cf/get :public-uri)
|
||||
:to email
|
||||
:invited-by (:fullname profile)
|
||||
:user-name (:fullname member)
|
||||
:organization organization
|
||||
:token itoken
|
||||
:extra-data ptoken}))
|
||||
(eml/send cfg {::eml/reuse-conn true
|
||||
::eml/factory eml/invite-to-team
|
||||
:public-uri (cf/get :public-uri)
|
||||
:to email
|
||||
:invited-by (:fullname profile)
|
||||
:team (:name team)
|
||||
:organization (:organization team)
|
||||
:token itoken
|
||||
:extra-data ptoken})))
|
||||
(eml/send-template cfg {::eml/reuse-conn true
|
||||
::eml/template "invite-to-organization"
|
||||
:public-uri (cf/get :public-uri)
|
||||
:to email
|
||||
:invited-by (:fullname profile)
|
||||
:user-name (:fullname member)
|
||||
:organization organization
|
||||
:token itoken
|
||||
:extra-data ptoken}))
|
||||
(eml/send-template cfg {::eml/reuse-conn true
|
||||
::eml/template "invite-to-team"
|
||||
:public-uri (cf/get :public-uri)
|
||||
:to email
|
||||
:invited-by (:fullname profile)
|
||||
:team (:name team)
|
||||
:organization (:organization team)
|
||||
:token itoken
|
||||
:extra-data ptoken})))
|
||||
|
||||
itoken)))))
|
||||
|
||||
@ -355,13 +355,13 @@
|
||||
(db/delete! conn :team-invitation
|
||||
{:team-id team-id :email-to (:email member)})
|
||||
|
||||
(eml/send cfg {::eml/reuse-conn true
|
||||
::eml/factory eml/join-team
|
||||
:public-uri (cf/get :public-uri)
|
||||
:to (:email member)
|
||||
:invited-by (:fullname profile)
|
||||
:team (:name team)
|
||||
:team-id (:id team)})))
|
||||
(eml/send-template cfg {::eml/reuse-conn true
|
||||
::eml/template "join-team"
|
||||
:public-uri (cf/get :public-uri)
|
||||
:to (:email member)
|
||||
:invited-by (:fullname profile)
|
||||
:team (:name team)
|
||||
:team-id (:id team)})))
|
||||
|
||||
(def ^:private sql:valid-access-request-profiles
|
||||
"SELECT p.id, p.email, p.is_blocked
|
||||
@ -809,30 +809,30 @@
|
||||
(teams/check-email-spam conn (:email team-owner) true)
|
||||
|
||||
(let [request (upsert-team-access-request cfg team-id profile-id)
|
||||
factory (cond
|
||||
(and (some? file) (:is-default team) is-viewer)
|
||||
eml/request-file-access-yourpenpot-view
|
||||
template (cond
|
||||
(and (some? file) (:is-default team) is-viewer)
|
||||
"request-file-access-yourpenpot-view"
|
||||
|
||||
(and (some? file) (:is-default team))
|
||||
eml/request-file-access-yourpenpot
|
||||
(and (some? file) (:is-default team))
|
||||
"request-file-access-yourpenpot"
|
||||
|
||||
(some? file)
|
||||
eml/request-file-access
|
||||
(some? file)
|
||||
"request-file-access"
|
||||
|
||||
:else
|
||||
eml/request-team-access)]
|
||||
:else
|
||||
"request-team-access")]
|
||||
|
||||
(eml/send cfg {::eml/reuse-conn true
|
||||
::eml/factory factory
|
||||
:public-uri (cf/get :public-uri)
|
||||
:to (:email team-owner)
|
||||
:requested-by (:fullname requester)
|
||||
:requested-by-email (:email requester)
|
||||
:team-name (:name team)
|
||||
:team-id team-id
|
||||
:file-name (:name file)
|
||||
:file-id file-id
|
||||
:page-id (:page-id file)})
|
||||
(eml/send-template cfg {::eml/reuse-conn true
|
||||
::eml/template template
|
||||
:public-uri (cf/get :public-uri)
|
||||
:to (:email team-owner)
|
||||
:requested-by (:fullname requester)
|
||||
:requested-by-email (:email requester)
|
||||
:team-name (:name team)
|
||||
:team-id team-id
|
||||
:file-name (:name file)
|
||||
:file-id file-id
|
||||
:page-id (:page-id file)})
|
||||
|
||||
(with-meta {:request request}
|
||||
{::audit/props {:request 1}}))))
|
||||
|
||||
@ -905,14 +905,14 @@ RETURNING id, deleted_at;")
|
||||
(:fullname (profile/get-profile cfg profile-id))
|
||||
(str/trim user-name))]
|
||||
(db/tx-run! cfg (fn [tx-cfg]
|
||||
(eml/send tx-cfg {::eml/reuse-conn true
|
||||
::eml/factory eml/renewal-notice
|
||||
:public-uri (cf/get :public-uri)
|
||||
:to user-email
|
||||
:user-name user-name
|
||||
:renewal-date renewal-date
|
||||
:estimated-amount amount-str
|
||||
:organizations organizations}))))
|
||||
(eml/send-template tx-cfg {::eml/reuse-conn true
|
||||
::eml/template "renewal-notice"
|
||||
:public-uri (cf/get :public-uri)
|
||||
:to user-email
|
||||
:user-name user-name
|
||||
:renewal-date renewal-date
|
||||
:estimated-amount amount-str
|
||||
:organizations organizations}))))
|
||||
nil)
|
||||
|
||||
;; API: exists-organization-team-invitations-for-non-members /
|
||||
|
||||
@ -55,11 +55,11 @@
|
||||
[{:keys [::db/conn] :as cfg} organization-name {:keys [email profile]}]
|
||||
(when (or (nil? profile)
|
||||
(eml/allow-send-emails? conn profile))
|
||||
(eml/send cfg {::eml/reuse-conn true
|
||||
::eml/factory eml/organization-setup-sso
|
||||
:public-uri (cf/get :public-uri)
|
||||
:to email
|
||||
:organization-name organization-name})))
|
||||
(eml/send-template cfg {::eml/reuse-conn true
|
||||
::eml/template "organization-setup-sso"
|
||||
:public-uri (cf/get :public-uri)
|
||||
:to email
|
||||
:organization-name organization-name})))
|
||||
|
||||
(defn- get-organization-sso-notify-recipients
|
||||
"Unique organization members and pending organization/team invitees for SSO activation emails."
|
||||
|
||||
@ -15,6 +15,7 @@
|
||||
[clojure.test :as t]
|
||||
[cuerdas.core :as str]
|
||||
[integrant.core :as ig]
|
||||
[lambdaisland.uri :as u]
|
||||
[promesa.core :as p]))
|
||||
|
||||
(t/use-fixtures :once th/state-init)
|
||||
@ -142,3 +143,169 @@
|
||||
(assoc email ::emails/reuse-conn true))))]
|
||||
(t/testing "the email job is submitted through the caller conn"
|
||||
(t/is (= "sendmail" (:name (th/db-get :job {:id job-id})))))))
|
||||
|
||||
(defn- templated-job-def
|
||||
[sendmail]
|
||||
(ig/init-key ::emails/templated-job-def
|
||||
{::emails/sendmail sendmail}))
|
||||
|
||||
(defn- submit-templated
|
||||
[job-def params]
|
||||
(db/tx-run! {::db/pool th/*pool*}
|
||||
(fn [cfg]
|
||||
(emails/send-template (assoc cfg
|
||||
::jobs/defs {:send-templated-mail job-def}
|
||||
::mtx/metrics (get th/*system* :app.metrics/metrics))
|
||||
(assoc params ::emails/reuse-conn true)))))
|
||||
|
||||
(def ^:private invite-to-team-recipe
|
||||
{:to "invitee@example.com"
|
||||
:public-uri (cf/get :public-uri)
|
||||
:invited-by "Owner User"
|
||||
:team "Design Team"
|
||||
:token "test-token"
|
||||
:organization {:name "Acme Inc"
|
||||
:sso-active false}})
|
||||
|
||||
(t/deftest templated-registry-covers-all-factories
|
||||
(t/is (= #{"feedback" "register" "password-recovery" "password-changed"
|
||||
"change-email" "invite-to-team" "invite-to-organization"
|
||||
"organization-setup-sso" "renewal-notice" "join-team"
|
||||
"request-file-access" "request-file-access-yourpenpot"
|
||||
"request-file-access-yourpenpot-view" "request-team-access"
|
||||
"comment-mention" "comment-thread" "comment-notification"}
|
||||
(set (keys emails/templates)))))
|
||||
|
||||
(t/deftest send-template-validation
|
||||
(t/testing "missing template fails fast"
|
||||
(t/is (thrown-with-msg? clojure.lang.ExceptionInfo #"template"
|
||||
(emails/send-template {} {:to "a@example.com"}))))
|
||||
(t/testing "unknown template fails fast"
|
||||
(t/is (thrown-with-msg? clojure.lang.ExceptionInfo #"unknown email template"
|
||||
(emails/send-template {} {:to "a@example.com"
|
||||
::emails/template "nope"}))))
|
||||
(t/testing "template ids are strings, never keywords"
|
||||
(t/is (thrown-with-msg? clojure.lang.ExceptionInfo #"unknown email template"
|
||||
(emails/send-template {} {:to "a@example.com"
|
||||
::emails/template :app.email/register}))))
|
||||
(t/testing "reuse-conn without a caller connection fails fast"
|
||||
(t/is (thrown-with-msg? clojure.lang.ExceptionInfo #"reuse-conn"
|
||||
(emails/send-template {} {:to "a@example.com"
|
||||
::emails/reuse-conn true
|
||||
::emails/template "register"})))))
|
||||
|
||||
(t/deftest send-template-stores-recipe-not-rendered-mail
|
||||
(let [job-def (templated-job-def (fn [_] nil))
|
||||
job-id (submit-templated job-def (assoc invite-to-team-recipe
|
||||
::emails/template "invite-to-team"))
|
||||
row (th/db-get :job {:id job-id})
|
||||
params (jobs/decode-params job-def (:params row))
|
||||
rendered (emails/render emails/invite-to-team invite-to-team-recipe)]
|
||||
(t/testing "the job lands on the new queue"
|
||||
(t/is (= "send-templated-mail" (:name row))))
|
||||
(t/testing "stored params carry the template id and no rendered content"
|
||||
(t/is (= "invite-to-team" (:template params)))
|
||||
(t/is (not (contains? params :subject)))
|
||||
(t/is (not (contains? params :body))))
|
||||
(t/testing "stored params are smaller than the rendered html alone"
|
||||
(let [stored-size (count (str (:params row)))
|
||||
rendered-html (count (get-in rendered [:body "text/html"]))]
|
||||
(t/is (< stored-size rendered-html))))
|
||||
(t/testing "the worker renders the same mail from the stored recipe"
|
||||
(t/is (= rendered (emails/render-template (:template params)
|
||||
(dissoc params :template)))))))
|
||||
|
||||
(defn- decode-template-data
|
||||
[params]
|
||||
(let [decode (get-in emails/templates [(:template params) ::emails/decode])]
|
||||
(decode (dissoc params :template))))
|
||||
|
||||
(t/deftest send-template-roundtrips-uuids-and-profile
|
||||
(let [sent (atom nil)
|
||||
job-def (templated-job-def (fn [_ email] (reset! sent email)))
|
||||
team-id (random-uuid)
|
||||
recipe {:to "member@example.com"
|
||||
:public-uri (cf/get :public-uri)
|
||||
:invited-by "Owner User"
|
||||
:team "Design Team"
|
||||
:team-id team-id}
|
||||
job-id (submit-templated job-def (assoc recipe
|
||||
::emails/template "join-team"))
|
||||
params (jobs/decode-params job-def (:params (th/db-get :job {:id job-id})))]
|
||||
(t/testing "uuids survive the plain-JSON queue roundtrip typed"
|
||||
(let [data (decode-template-data params)]
|
||||
(t/is (uuid? (:team-id data)))
|
||||
(t/is (= team-id (:team-id data)))))
|
||||
(t/testing "the handler renders and delivers the mail"
|
||||
((::jobs/handler job-def) nil params)
|
||||
(t/is (= (:subject (emails/render emails/join-team recipe))
|
||||
(:subject @sent)))
|
||||
(t/is (= "member@example.com" (:to @sent)))))
|
||||
(let [sent (atom nil)
|
||||
job-def (templated-job-def (fn [_ email] (reset! sent email)))
|
||||
recipe {:to "dest@example.com"
|
||||
:reply-to "user@example.com"
|
||||
:email "user@example.com"
|
||||
:attachments {"error-report.txt" "trace"}
|
||||
:feedback-subject "subj"
|
||||
:feedback-type "bug"
|
||||
:feedback-content "content"
|
||||
:profile {:id (random-uuid) :fullname "User" :email "user@example.com"}}
|
||||
job-id (submit-templated job-def (assoc recipe
|
||||
::emails/template "feedback"))
|
||||
params (jobs/decode-params job-def (:params (th/db-get :job {:id job-id})))]
|
||||
(t/testing "nested profile id survives the roundtrip typed"
|
||||
(t/is (uuid? (get-in (decode-template-data params) [:profile :id]))))
|
||||
(t/testing "the handler renders the feedback mail"
|
||||
((::jobs/handler job-def) nil params)
|
||||
(t/is (= (:subject (emails/render emails/user-feedback recipe))
|
||||
(:subject @sent))))))
|
||||
|
||||
(def ^:private organization-with-uris
|
||||
{:id (random-uuid)
|
||||
:name "Acme Inc"
|
||||
:initials "AI"
|
||||
:logo (u/uri "https://example.com/assets/by-id/logo")
|
||||
:avatar-bg-url (u/uri "https://example.com/images/avatar-bg.jpg")
|
||||
:sso-active false})
|
||||
|
||||
(t/deftest send-template-roundtrips-organization-uris
|
||||
(doseq [[template factory recipe]
|
||||
[["invite-to-team" emails/invite-to-team
|
||||
{:to "invitee@example.com"
|
||||
:public-uri (cf/get :public-uri)
|
||||
:invited-by "Owner User"
|
||||
:team "Design Team"
|
||||
:organization organization-with-uris
|
||||
:token "test-token"}]
|
||||
["invite-to-organization" emails/invite-to-organization
|
||||
{:to "invitee@example.com"
|
||||
:public-uri (cf/get :public-uri)
|
||||
:invited-by "Owner User"
|
||||
:user-name "Invitee"
|
||||
:organization organization-with-uris
|
||||
:token "test-token"}]
|
||||
["renewal-notice" emails/renewal-notice
|
||||
{:to "billing@example.com"
|
||||
:public-uri (cf/get :public-uri)
|
||||
:user-name "Billing"
|
||||
:renewal-date "2026-12-01"
|
||||
:estimated-amount "$10.00"
|
||||
:organizations [organization-with-uris]}]]]
|
||||
(t/testing template
|
||||
(let [sent (atom nil)
|
||||
job-def (templated-job-def (fn [_ email] (reset! sent email)))
|
||||
job-id (submit-templated job-def (assoc recipe ::emails/template template))
|
||||
params (jobs/decode-params job-def (:params (th/db-get :job {:id job-id})))]
|
||||
((::jobs/handler job-def) nil params)
|
||||
(t/is (= (emails/render factory recipe) @sent))))))
|
||||
|
||||
(t/deftest send-templated-mail-handler-rejects-unknown-template
|
||||
(let [job-def (templated-job-def (fn [_] nil))
|
||||
code (try
|
||||
((::jobs/handler job-def) nil {:template "nope"
|
||||
:to "a@example.com"})
|
||||
nil
|
||||
(catch clojure.lang.ExceptionInfo e
|
||||
(-> e ex-data :code)))]
|
||||
(t/is (= :unknown-email-template code))))
|
||||
|
||||
@ -51,9 +51,9 @@
|
||||
cf/config (assoc cf/config :user-feedback-destination "fb@example.com")]
|
||||
(let [profile (th/create-profile* 1 {})
|
||||
captured (atom nil)]
|
||||
(with-redefs [eml/send (fn [cfg params]
|
||||
(reset! captured {:cfg cfg :params params})
|
||||
nil)]
|
||||
(with-redefs [eml/send-template (fn [cfg params]
|
||||
(reset! captured {:cfg cfg :params params})
|
||||
nil)]
|
||||
(let [{:keys [error]} (th/command! {::th/type :send-user-feedback
|
||||
::rpc/profile-id (:id profile)
|
||||
:subject "s"
|
||||
|
||||
@ -61,7 +61,7 @@
|
||||
|
||||
(t/deftest create-and-update-organization-invitations-audit-props
|
||||
(let [owner-id-ref (atom nil)]
|
||||
(with-mocks [email-mock {:target 'app.email/send :return nil}
|
||||
(with-mocks [email-mock {:target 'app.email/send-template :return nil}
|
||||
audit-mock {:target 'app.loggers.audit/submit :return nil}
|
||||
nitrate-mock {:target 'app.nitrate/call
|
||||
:return (fn [_cfg method params]
|
||||
@ -110,7 +110,7 @@
|
||||
|
||||
(t/deftest invite-to-organization-rejects-non-owner
|
||||
(let [organization-summary-ref (atom nil)]
|
||||
(with-mocks [email-mock {:target 'app.email/send :return nil}
|
||||
(with-mocks [email-mock {:target 'app.email/send-template :return nil}
|
||||
nitrate-mock {:target 'app.nitrate/call
|
||||
:return (fn [_cfg method _params]
|
||||
(when (= method :get-organization-summary)
|
||||
@ -138,7 +138,7 @@
|
||||
(t/is (not (:called? @email-mock)))))))
|
||||
|
||||
(t/deftest invite-to-organization-rejects-unknown-organization
|
||||
(with-mocks [email-mock {:target 'app.email/send :return nil}
|
||||
(with-mocks [email-mock {:target 'app.email/send-template :return nil}
|
||||
nitrate-mock {:target 'app.nitrate/call :return nil}]
|
||||
(let [profile (th/create-profile* 105 {:is-active true})
|
||||
organization-id (uuid/random)
|
||||
@ -157,7 +157,7 @@
|
||||
|
||||
(t/deftest invite-to-organization-uses-authoritative-branding
|
||||
(let [organization-summary-ref (atom nil)]
|
||||
(with-mocks [email-mock {:target 'app.email/send :return nil}
|
||||
(with-mocks [email-mock {:target 'app.email/send-template :return nil}
|
||||
nitrate-mock {:target 'app.nitrate/call
|
||||
:return (fn [_cfg method _params]
|
||||
(when (= method :get-organization-summary)
|
||||
@ -1945,7 +1945,7 @@
|
||||
nil))
|
||||
nil))}
|
||||
;; --- Email mock: capture sent emails ---
|
||||
email-mock {:target 'app.email/send
|
||||
email-mock {:target 'app.email/send-template
|
||||
:return (fn [_cfg params] (swap! sent conj params) nil)}]
|
||||
|
||||
;; --- Setup: create profiles, team, organization-summary ---
|
||||
@ -2015,7 +2015,7 @@
|
||||
emails))
|
||||
(doseq [email-params @sent]
|
||||
(t/is (= organization-name (:organization-name email-params)))
|
||||
(t/is (= eml/organization-setup-sso (::eml/factory email-params)))))))))
|
||||
(t/is (= "organization-setup-sso" (::eml/template email-params)))))))))
|
||||
|
||||
(t/deftest notify-organization-sso-change-skips-email-when-not-active
|
||||
(let [sent (atom [])
|
||||
@ -2023,7 +2023,7 @@
|
||||
:organization-id (uuid/random)
|
||||
:updated-props false
|
||||
:announce-activation false}]
|
||||
(with-redefs [eml/send (fn [_cfg params] (swap! sent conj params))]
|
||||
(with-redefs [eml/send-template (fn [_cfg params] (swap! sent conj params))]
|
||||
(th/management-command! params))
|
||||
(t/is (empty? @sent))))
|
||||
|
||||
@ -2225,7 +2225,7 @@
|
||||
(t/deftest send-renewal-email-falls-back-to-profile-fullname-when-name-is-nil
|
||||
;; `nil` user-name means "no override": the RPC must look up the
|
||||
;; account owner's real name instead of sending a blank greeting.
|
||||
(with-mocks [email-mock {:target 'app.email/send :return nil}
|
||||
(with-mocks [email-mock {:target 'app.email/send-template :return nil}
|
||||
nitrate-mock {:target 'app.nitrate/call :return nil}]
|
||||
(let [profile (th/create-profile* 1 {:is-active true :fullname "Nitrate User"})
|
||||
out (th/management-command! (send-renewal-email-params profile nil))]
|
||||
@ -2236,7 +2236,7 @@
|
||||
(t/deftest send-renewal-email-keeps-explicit-empty-name
|
||||
;; An explicit "" means the caller deliberately wants no name shown
|
||||
;; and must not be replaced by the profile's fullname.
|
||||
(with-mocks [email-mock {:target 'app.email/send :return nil}
|
||||
(with-mocks [email-mock {:target 'app.email/send-template :return nil}
|
||||
nitrate-mock {:target 'app.nitrate/call :return nil}]
|
||||
(let [profile (th/create-profile* 1 {:is-active true :fullname "Nitrate User"})
|
||||
out (th/management-command! (send-renewal-email-params profile ""))]
|
||||
@ -2247,7 +2247,7 @@
|
||||
(t/deftest send-renewal-email-treats-blank-name-as-empty
|
||||
;; A blank name is trimmed and follows the same path as "": no name
|
||||
;; is shown and the profile's fullname is not used.
|
||||
(with-mocks [email-mock {:target 'app.email/send :return nil}
|
||||
(with-mocks [email-mock {:target 'app.email/send-template :return nil}
|
||||
nitrate-mock {:target 'app.nitrate/call :return nil}]
|
||||
(let [profile (th/create-profile* 1 {:is-active true :fullname "Nitrate User"})
|
||||
out (th/management-command! (send-renewal-email-params profile " "))]
|
||||
|
||||
@ -1197,7 +1197,7 @@
|
||||
:sso-active? true
|
||||
:set-team-params set-team-params})
|
||||
teams/initialize-user-in-organization (fn [& _] nil)
|
||||
eml/send (fn [_cfg params] (swap! sent conj params))]
|
||||
eml/send-template (fn [_cfg params] (swap! sent conj params))]
|
||||
(let [out (th/command! {::th/type :add-team-to-organization
|
||||
::rpc/profile-id (:id owner)
|
||||
:team-id (:id team)
|
||||
@ -1214,7 +1214,7 @@
|
||||
(t/is (= #{"member302@example.com"} emails))
|
||||
(doseq [email-params @sent]
|
||||
(t/is (= organization-name (:organization-name email-params)))
|
||||
(t/is (= eml/organization-setup-sso (::eml/factory email-params)))))))
|
||||
(t/is (= "organization-setup-sso" (::eml/template email-params)))))))
|
||||
|
||||
(t/deftest add-team-to-organization-deletes-external-invitations-for-unregistered-users
|
||||
(let [owner (th/create-profile* 305 {:is-active true
|
||||
@ -1328,7 +1328,7 @@
|
||||
:team-id (:id team)
|
||||
:sso-active? false})
|
||||
teams/initialize-user-in-organization (fn [& _] nil)
|
||||
eml/send (fn [_cfg params] (swap! sent conj params))]
|
||||
eml/send-template (fn [_cfg params] (swap! sent conj params))]
|
||||
(let [out (th/command! {::th/type :add-team-to-organization
|
||||
::rpc/profile-id (:id owner)
|
||||
:team-id (:id team)
|
||||
|
||||
@ -509,7 +509,7 @@
|
||||
(t/is (= "mtma" (:penpot/mtm-campaign props)))))))
|
||||
|
||||
(t/deftest prepare-register-and-register-profile-2
|
||||
(with-mocks [mock {:target 'app.email/send :return nil}]
|
||||
(with-mocks [mock {:target 'app.email/send-template :return nil}]
|
||||
(let [current-token (atom nil)]
|
||||
;; PREPARE REGISTER
|
||||
(let [data {::th/type :prepare-register-profile
|
||||
@ -563,7 +563,7 @@
|
||||
(t/is (= 1 (:call-count @mock))))))))
|
||||
|
||||
(t/deftest prepare-register-and-register-profile-3
|
||||
(with-mocks [mock {:target 'app.email/send :return nil}]
|
||||
(with-mocks [mock {:target 'app.email/send-template :return nil}]
|
||||
(let [current-token (atom nil)]
|
||||
;; PREPARE REGISTER
|
||||
(let [data {::th/type :prepare-register-profile
|
||||
@ -611,7 +611,7 @@
|
||||
;; When disable-email-verification is set and the profile is inactive
|
||||
;; (e.g. created before the flag was set), re-registering should be
|
||||
;; rejected with :email-already-exists.
|
||||
(with-mocks [mock {:target 'app.email/send :return nil}]
|
||||
(with-mocks [mock {:target 'app.email/send-template :return nil}]
|
||||
(with-redefs [app.config/flags #{:registration :login-with-password}]
|
||||
(let [current-token (atom nil)]
|
||||
;; PREPARE REGISTER: first attempt (no profile exists yet)
|
||||
@ -699,7 +699,7 @@
|
||||
|
||||
(t/deftest prepare-register-with-invitation-and-disabled-registration
|
||||
(with-redefs [app.config/flags #{:login-with-password :email-verification}]
|
||||
(with-mocks [mock {:target 'app.email/send :return nil}]
|
||||
(with-mocks [mock {:target 'app.email/send-template :return nil}]
|
||||
(let [email "invited@example.com"
|
||||
fixture (create-invitation-fixture email (ct/in-future "48h"))
|
||||
itoken (create-test-invitation-token fixture email)
|
||||
@ -840,7 +840,7 @@
|
||||
;; verify-email mail with the invitation token EMBEDDED into the
|
||||
;; verify-email JWE (so the team-invitation flow can resume after
|
||||
;; the user clicks the email link).
|
||||
(with-mocks [mock {:target 'app.email/send :return nil}]
|
||||
(with-mocks [mock {:target 'app.email/send-template :return nil}]
|
||||
(let [itoken (tokens/generate th/*system*
|
||||
{:iss :team-invitation
|
||||
:exp (ct/in-future "48h")
|
||||
@ -1181,7 +1181,7 @@
|
||||
"prepare-register must not embed existing profile id of an anonymous caller"))))
|
||||
|
||||
(t/deftest register-profile-with-invitation-must-not-take-over-existing-account
|
||||
(with-mocks [_mock {:target 'app.email/send :return nil}]
|
||||
(with-mocks [_mock {:target 'app.email/send-template :return nil}]
|
||||
(let [;; Victim profile exists but is not yet active (e.g. registered
|
||||
;; but has not clicked the verification link). This is the
|
||||
;; remaining attack surface after fix 1b: `prepare-register`
|
||||
@ -1287,7 +1287,7 @@
|
||||
(t/is (true? (:is-active reloaded))))))
|
||||
|
||||
(t/deftest email-change-request
|
||||
(with-mocks [mock {:target 'app.email/send :return nil}]
|
||||
(with-mocks [mock {:target 'app.email/send-template :return nil}]
|
||||
(let [profile (th/create-profile* 1)
|
||||
pool (:app.db/pool th/*system*)
|
||||
data {::th/type :request-email-change
|
||||
@ -1327,7 +1327,7 @@
|
||||
|
||||
|
||||
(t/deftest email-change-request-without-smtp
|
||||
(with-mocks [mock {:target 'app.email/send :return nil}]
|
||||
(with-mocks [mock {:target 'app.email/send-template :return nil}]
|
||||
(with-redefs [app.config/flags #{}]
|
||||
(let [profile (th/create-profile* 1)
|
||||
pool (:app.db/pool th/*system*)
|
||||
@ -1343,7 +1343,7 @@
|
||||
|
||||
|
||||
(t/deftest request-profile-recovery
|
||||
(with-mocks [mock {:target 'app.email/send :return nil}]
|
||||
(with-mocks [mock {:target 'app.email/send-template :return nil}]
|
||||
(let [profile1 (th/create-profile* 1 {:is-active false})
|
||||
profile2 (th/create-profile* 2 {:is-active true})
|
||||
pool (:app.db/pool th/*system*)
|
||||
@ -1401,7 +1401,7 @@
|
||||
|
||||
|
||||
(t/deftest update-profile-password
|
||||
(with-mocks [_ {:target 'app.email/send :return nil}]
|
||||
(with-mocks [_ {:target 'app.email/send-template :return nil}]
|
||||
(let [profile (th/create-profile* 1)
|
||||
data {::th/type :update-profile-password
|
||||
::rpc/profile-id (:id profile)
|
||||
@ -1413,7 +1413,7 @@
|
||||
|
||||
|
||||
(t/deftest update-profile-password-bad-old-password
|
||||
(with-mocks [mock {:target 'app.email/send :return nil}]
|
||||
(with-mocks [mock {:target 'app.email/send-template :return nil}]
|
||||
(let [profile (th/create-profile* 1)
|
||||
data {::th/type :update-profile-password
|
||||
::rpc/profile-id (:id profile)
|
||||
@ -1700,7 +1700,7 @@
|
||||
(t/is (th/ex-of-code? (:error out) :weak-password))))
|
||||
|
||||
(t/deftest update-profile-password-sends-notification
|
||||
(with-mocks [mock {:target 'app.email/send :return nil}]
|
||||
(with-mocks [mock {:target 'app.email/send-template :return nil}]
|
||||
(let [profile (th/create-profile* 1)
|
||||
data {::th/type :update-profile-password
|
||||
::rpc/profile-id (:id profile)
|
||||
@ -1710,14 +1710,14 @@
|
||||
(t/is (nil? (:error out)))
|
||||
(t/is (nil? (:result out)))
|
||||
(t/is (= 1 (:call-count @mock)))
|
||||
(let [[_cfg {:keys [::eml/factory :to :name]}] (first (:call-args-list @mock))]
|
||||
(t/is (= eml/password-changed factory))
|
||||
(let [[_cfg {:keys [::eml/template :to :name]}] (first (:call-args-list @mock))]
|
||||
(t/is (= "password-changed" template))
|
||||
(t/is (= (:email profile) to))
|
||||
(t/is (= (:fullname profile) name))))))
|
||||
|
||||
|
||||
(t/deftest update-profile-password-sends-notification-for-first-password
|
||||
(with-mocks [mock {:target 'app.email/send :return nil}]
|
||||
(with-mocks [mock {:target 'app.email/send-template :return nil}]
|
||||
(let [profile (th/create-profile* 1 {:password "!"})
|
||||
data {::th/type :update-profile-password
|
||||
::rpc/profile-id (:id profile)
|
||||
@ -1726,14 +1726,14 @@
|
||||
(t/is (nil? (:error out)))
|
||||
(t/is (nil? (:result out)))
|
||||
(t/is (= 1 (:call-count @mock)))
|
||||
(let [[_cfg {:keys [::eml/factory :to :name]}] (first (:call-args-list @mock))]
|
||||
(t/is (= eml/password-changed factory))
|
||||
(let [[_cfg {:keys [::eml/template :to :name]}] (first (:call-args-list @mock))]
|
||||
(t/is (= "password-changed" template))
|
||||
(t/is (= (:email profile) to))
|
||||
(t/is (= (:fullname profile) name))))))
|
||||
|
||||
|
||||
(t/deftest recover-profile-sends-notification
|
||||
(with-mocks [mock {:target 'app.email/send :return nil}]
|
||||
(with-mocks [mock {:target 'app.email/send-template :return nil}]
|
||||
(let [profile (th/create-profile* 1)
|
||||
token (tokens/generate th/*system*
|
||||
{:iss :password-recovery
|
||||
@ -1745,8 +1745,8 @@
|
||||
out (th/command! data)]
|
||||
(t/is (nil? (:error out)))
|
||||
(t/is (= 1 (:call-count @mock)))
|
||||
(let [[_cfg {:keys [::eml/factory :to :name]}] (first (:call-args-list @mock))]
|
||||
(t/is (= eml/password-changed factory))
|
||||
(let [[_cfg {:keys [::eml/template :to :name]}] (first (:call-args-list @mock))]
|
||||
(t/is (= "password-changed" template))
|
||||
(t/is (= (:email profile) to))
|
||||
(t/is (= (:fullname profile) name))))))
|
||||
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
(t/use-fixtures :each th/database-reset)
|
||||
|
||||
(t/deftest create-team-invitations
|
||||
(with-mocks [mock {:target 'app.email/send :return nil}]
|
||||
(with-mocks [mock {:target 'app.email/send-template :return nil}]
|
||||
(let [profile1 (th/create-profile* 1 {:is-active true})
|
||||
profile2 (th/create-profile* 2 {:is-active true})
|
||||
profile3 (th/create-profile* 3 {:is-active true :is-muted true})
|
||||
@ -110,7 +110,7 @@
|
||||
(t/is (= :member-is-muted (:code edata))))))))
|
||||
|
||||
(t/deftest create-and-update-team-invitations-include-organization-props
|
||||
(with-mocks [email-mock {:target 'app.email/send :return nil}
|
||||
(with-mocks [email-mock {:target 'app.email/send-template :return nil}
|
||||
audit-mock {:target 'app.loggers.audit/submit :return nil}]
|
||||
(let [owner (th/create-profile* 101 {:is-active true})
|
||||
invitee (th/create-profile* 102 {:is-active true})
|
||||
@ -171,7 +171,7 @@
|
||||
(t/is (false? (get-in create-plain [:props :invitee-already-organization-member])))))))
|
||||
|
||||
(t/deftest create-team-invitations-blacklisted-domain
|
||||
(with-mocks [mock {:target 'app.email/send :return nil}]
|
||||
(with-mocks [mock {:target 'app.email/send-template :return nil}]
|
||||
(let [profile1 (th/create-profile* 1 {:is-active true})
|
||||
team (th/create-team* 1 {:profile-id (:id profile1)})
|
||||
data {::th/type :create-team-invitations
|
||||
@ -211,7 +211,7 @@
|
||||
(t/is (= 1 (:call-count @mock))))))))
|
||||
|
||||
(t/deftest create-team-invitations-with-request-access
|
||||
(with-mocks [mock {:target 'app.email/send :return nil}]
|
||||
(with-mocks [mock {:target 'app.email/send-template :return nil}]
|
||||
(let [profile1 (th/create-profile* 1 {:is-active true})
|
||||
requester (th/create-profile* 2 {:is-active true :email "requester@example.com"})
|
||||
|
||||
@ -248,7 +248,7 @@
|
||||
|
||||
|
||||
(t/deftest create-team-invitations-with-request-access-2
|
||||
(with-mocks [mock {:target 'app.email/send :return nil}]
|
||||
(with-mocks [mock {:target 'app.email/send-template :return nil}]
|
||||
(let [profile1 (th/create-profile* 1 {:is-active true})
|
||||
requester (th/create-profile* 2 {:is-active true
|
||||
:email "requester@example.com"})
|
||||
@ -311,7 +311,7 @@
|
||||
|
||||
|
||||
(t/deftest invitation-tokens
|
||||
(with-mocks [mock {:target 'app.email/send :return nil}]
|
||||
(with-mocks [mock {:target 'app.email/send-template :return nil}]
|
||||
(let [profile1 (th/create-profile* 1 {:is-active true})
|
||||
profile2 (th/create-profile* 2 {:is-active true})
|
||||
|
||||
@ -656,7 +656,7 @@
|
||||
(t/is (not-any? #(= "accept-organization-invitation" (:name %)) events))))))
|
||||
|
||||
(t/deftest create-team-invitations-with-email-verification-disabled
|
||||
(with-mocks [mock {:target 'app.email/send :return nil}]
|
||||
(with-mocks [mock {:target 'app.email/send-template :return nil}]
|
||||
(let [profile1 (th/create-profile* 1 {:is-active true})
|
||||
profile2 (th/create-profile* 2 {:is-active true})
|
||||
profile3 (th/create-profile* 3 {:is-active true :is-muted true})
|
||||
@ -998,7 +998,7 @@
|
||||
(t/is (= (:name team) (:team-name props)))))))
|
||||
|
||||
(t/deftest create-team-access-request
|
||||
(with-mocks [mock {:target 'app.email/send :return nil}]
|
||||
(with-mocks [mock {:target 'app.email/send-template :return nil}]
|
||||
(let [owner (th/create-profile* 1 {:is-active true :email "owner@bar.com"})
|
||||
requester (th/create-profile* 3 {:is-active true :email "requester@bar.com"})
|
||||
team (th/create-team* 1 {:profile-id (:id owner)})
|
||||
@ -1045,7 +1045,7 @@
|
||||
|
||||
|
||||
(t/deftest create-team-access-request-owner-muted
|
||||
(with-mocks [mock {:target 'app.email/send :return nil}]
|
||||
(with-mocks [mock {:target 'app.email/send-template :return nil}]
|
||||
(let [owner (th/create-profile* 1 {:is-active true :is-muted true :email "owner@bar.com"})
|
||||
requester (th/create-profile* 2 {:is-active true :email "requester@bar.com"})
|
||||
team (th/create-team* 1 {:profile-id (:id owner)})
|
||||
@ -1064,7 +1064,7 @@
|
||||
|
||||
|
||||
(t/deftest create-team-access-request-requester-muted
|
||||
(with-mocks [mock {:target 'app.email/send :return nil}]
|
||||
(with-mocks [mock {:target 'app.email/send-template :return nil}]
|
||||
(let [owner (th/create-profile* 1 {:is-active true :email "owner@bar.com"})
|
||||
requester (th/create-profile* 2 {:is-active true :is-muted true :email "requester@bar.com"})
|
||||
team (th/create-team* 1 {:profile-id (:id owner)})
|
||||
@ -1090,7 +1090,7 @@
|
||||
|
||||
|
||||
(t/deftest create-team-access-request-owner-bounce
|
||||
(with-mocks [mock {:target 'app.email/send :return nil}]
|
||||
(with-mocks [mock {:target 'app.email/send-template :return nil}]
|
||||
(let [owner (th/create-profile* 1 {:is-active true :email "owner@bar.com"})
|
||||
requester (th/create-profile* 2 {:is-active true :email "requester@bar.com"})
|
||||
team (th/create-team* 1 {:profile-id (:id owner)})
|
||||
@ -1118,7 +1118,7 @@
|
||||
(t/is (= "private" (:email edata)))))))
|
||||
|
||||
(t/deftest create-team-access-request-requester-bounce
|
||||
(with-mocks [mock {:target 'app.email/send :return nil}]
|
||||
(with-mocks [mock {:target 'app.email/send-template :return nil}]
|
||||
(let [owner (th/create-profile* 1 {:is-active true :email "owner@bar.com"})
|
||||
requester (th/create-profile* 2 {:is-active true :email "requester@bar.com"})
|
||||
team (th/create-team* 1 {:profile-id (:id owner)})
|
||||
@ -1175,7 +1175,7 @@
|
||||
(t/is (th/success? out)))))
|
||||
|
||||
(t/deftest create-team-invitations-email-cooldown
|
||||
(with-mocks [mock {:target 'app.email/send :return nil}]
|
||||
(with-mocks [mock {:target 'app.email/send-template :return nil}]
|
||||
(let [profile1 (th/create-profile* 1 {:is-active true})
|
||||
team (th/create-team* 1 {:profile-id (:id profile1)})
|
||||
|
||||
@ -1309,7 +1309,7 @@
|
||||
;; --- T7-F-01: Role ceiling in team invitations ---
|
||||
|
||||
(t/deftest admin-cannot-create-invitation-with-owner-role
|
||||
(with-mocks [mock {:target 'app.email/send :return nil}]
|
||||
(with-mocks [mock {:target 'app.email/send-template :return nil}]
|
||||
(let [owner (th/create-profile* 1 {:is-active true})
|
||||
admin (th/create-profile* 2 {:is-active true})
|
||||
team (th/create-team* 1 {:profile-id (:id owner)})]
|
||||
@ -1333,7 +1333,7 @@
|
||||
(t/is (= 0 (:call-count @mock)))))))
|
||||
|
||||
(t/deftest admin-cannot-create-invitation-with-owner-role-invitations-format
|
||||
(with-mocks [mock {:target 'app.email/send :return nil}]
|
||||
(with-mocks [mock {:target 'app.email/send-template :return nil}]
|
||||
(let [owner (th/create-profile* 1 {:is-active true})
|
||||
admin (th/create-profile* 2 {:is-active true})
|
||||
team (th/create-team* 1 {:profile-id (:id owner)})]
|
||||
@ -1356,7 +1356,7 @@
|
||||
(t/is (= 0 (:call-count @mock)))))))
|
||||
|
||||
(t/deftest admin-cannot-update-invitation-role-to-owner
|
||||
(with-mocks [mock {:target 'app.email/send :return nil}]
|
||||
(with-mocks [mock {:target 'app.email/send-template :return nil}]
|
||||
(let [owner (th/create-profile* 1 {:is-active true})
|
||||
admin (th/create-profile* 2 {:is-active true})
|
||||
team (th/create-team* 1 {:profile-id (:id owner)})]
|
||||
@ -1390,7 +1390,7 @@
|
||||
(t/is (th/ex-of-code? (:error out) :cant-promote-to-owner))))))
|
||||
|
||||
(t/deftest owner-can-create-invitation-with-owner-role
|
||||
(with-mocks [mock {:target 'app.email/send :return nil}]
|
||||
(with-mocks [mock {:target 'app.email/send-template :return nil}]
|
||||
(let [owner (th/create-profile* 1 {:is-active true})
|
||||
team (th/create-team* 1 {:profile-id (:id owner)})]
|
||||
|
||||
@ -1987,7 +1987,7 @@
|
||||
;; The team is created by an internal call, so both the command event and
|
||||
;; the manual event must carry its id for a projection to key it.
|
||||
(with-mocks [audit-mock {:target 'app.loggers.audit/submit :return nil}
|
||||
email-mock {:target 'app.email/send :return nil}]
|
||||
email-mock {:target 'app.email/send-template :return nil}]
|
||||
(with-redefs [cf/flags (conj cf/flags :audit-log)]
|
||||
(let [profile (th/create-profile* 1 {:is-active true})
|
||||
out (th/command-raw! {::th/type :create-team-with-invitations
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user