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

Merge pull request #6210 from penpot/niwinz-staging-bugfixes

Browse source 
🐛 Several bugfixes
This commit is contained in:
Andrey Antukh 2025-04-02 09:19:57 +02:00 • committed by GitHub
commit ea031a2161
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
backend/src/app/http.clj
View file

@ -156,9 +156,9 @@
[mw/params] [mw/params]
[mw/format-response] [mw/format-response]
[mw/parse-request] [mw/parse-request]
[mw/errors errors/handle]
[session/soft-auth cfg] [session/soft-auth cfg]
[actoken/soft-auth cfg] [actoken/soft-auth cfg]
[mw/errors errors/handle]
[mw/restrict-methods]]} [mw/restrict-methods]]}
(::mtx/routes cfg) (::mtx/routes cfg)

7
backend/src/app/http/errors.clj
View file

@ -62,7 +62,8 @@
::yres/body data} ::yres/body data}
(binding [l/*context* (request->context request)] (binding [l/*context* (request->context request)]
(l/err :hint "restriction error" :data data) (l/err :hint "restriction error"
:cause err)
{::yres/status 400 {::yres/status 400
::yres/body data})))) ::yres/body data}))))
@ -102,7 +103,7 @@
(= code :invalid-image) (= code :invalid-image)
(binding [l/*context* (request->context request)] (binding [l/*context* (request->context request)]
(let [cause (or parent-cause err)] (let [cause (or parent-cause err)]
(l/warn :hint "unexpected error on processing image" :cause cause) (l/warn :hint "image process error" :cause cause)
{::yres/status 400 ::yres/body data})) {::yres/status 400 ::yres/body data}))
:else :else
@ -177,7 +178,7 @@
(let [state (.getSQLState ^java.sql.SQLException error) (let [state (.getSQLState ^java.sql.SQLException error)
cause (or parent-cause error)] cause (or parent-cause error)]
(binding [l/*context* (request->context request)] (binding [l/*context* (request->context request)]
(l/error :hint "PSQL error" (l/error :hint "postgresql error"
:cause cause) :cause cause)
(cond (cond
(= state "57014") (= state "57014")

7
backend/src/app/loggers/database.clj
View file

@ -53,11 +53,16 @@
(assoc :logger/name logger) (assoc :logger/name logger)
(assoc :logger/level level) (assoc :logger/level level)
(dissoc :request/params :value :params :data))] (dissoc :request/params :value :params :data))]
(merge (merge
{:context (-> (into (sorted-map) ctx) {:context (-> (into (sorted-map) ctx)
(pp/pprint-str :length 50)) (pp/pprint-str :length 50))
:props (pp/pprint-str props :length 50) :props (pp/pprint-str props :length 50)
:hint (or (ex-message cause) @message) :hint (or (when-let [message (ex-message cause)]
(if-let [props-hint (:hint props)]
(str props-hint ": " message)
message))
@message)
:trace (or (::trace record) :trace (or (::trace record)
(some-> cause (ex/format-throwable :data? false :explain? false :header? false :summary? false)))} (some-> cause (ex/format-throwable :data? false :explain? false :header? false :summary? false)))}

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

@ -38,7 +38,6 @@
(def ^:private (def ^:private
schema:export-binfile schema:export-binfile
[:map {:title "export-binfile"} [:map {:title "export-binfile"}
[:name [:string {:max 250}]]
[:file-id ::sm/uuid] [:file-id ::sm/uuid]
[:version {:optional true} ::sm/int] [:version {:optional true} ::sm/int]
[:include-libraries ::sm/boolean] [:include-libraries ::sm/boolean]
@ -78,7 +77,7 @@
"Export a penpot file in a binary format." "Export a penpot file in a binary format."
{::doc/added "1.15" {::doc/added "1.15"
::webhooks/event? true ::webhooks/event? true
::sm/result schema:export-binfile} ::sm/params schema:export-binfile}
[{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id version file-id] :as params}] [{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id version file-id] :as params}]
(files/check-read-permissions! pool profile-id file-id) (files/check-read-permissions! pool profile-id file-id)
(fn [_] (fn [_]