github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-09-07 12:40:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix wrap nitrate sso when there is no profile (#10592)

Browse Source
This commit is contained in:
Pablo Alba 2026-07-08 14:21:34 +02:00 committed by GitHub
parent 0de8bce895
commit cc454de9ce
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/src/app/rpc.clj
View File

@ -246,7 +246,8 @@
(::nitrate/sso mdata true)) (::nitrate/sso mdata true))
(fn [cfg params] (fn [cfg params]
;; Resolve team/project/file from explicit keys or from :id via metadata ;; Resolve team/project/file from explicit keys or from :id via metadata
(let [organization-id (uuid/coerce (:organization-id params)) (let [profile-id (::profile-id params)
organization-id (uuid/coerce (:organization-id params))
id-type (::id-type mdata) id-type (::id-type mdata)
id (uuid/coerce (:id params)) id (uuid/coerce (:id params))
team-id (or (uuid/coerce (:team-id params)) team-id (or (uuid/coerce (:team-id params))
@ -255,9 +256,10 @@
(when (= id-type :project) id)) (when (= id-type :project) id))
file-id (or (uuid/coerce (:file-id params)) file-id (or (uuid/coerce (:file-id params))
(when (= id-type :file) id))] (when (= id-type :file) id))]
(if (or organization-id team-id project-id file-id) (if (and profile-id
(or organization-id team-id project-id file-id))
(let [cache-ref (or organization-id team-id project-id file-id) (let [cache-ref (or organization-id team-id project-id file-id)
profile-id (::profile-id params)
cache-key [profile-id cache-ref] cache-key [profile-id cache-ref]
cached (cache/get org-sso-auth-cache cache-key) cached (cache/get org-sso-auth-cache cache-key)
result (if (some? cached) result (if (some? cached)