github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-10-29 05:50:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Preserve admin console URL path segments (#12196)

Browse Source
This commit is contained in:
Marina López 2026-10-08 11:38:13 +02:00 committed by GitHub
parent cb1118f904
commit 28c576e1e6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
backend/src/app/nitrate.clj
View File

@ -265,7 +265,7 @@
(request-to-nitrate cfg :get
(generate-nitrate-uri
"api/organizations/"
organization-id
(str organization-id "/")
"members/"
profile-id)
schema:profile-organization params))
@ -285,7 +285,7 @@
(request-to-nitrate cfg :get
(generate-nitrate-uri
"api/organizations/"
organization-id
(str organization-id "/")
"summary")
schema:organization-summary params))
@ -294,7 +294,7 @@
(request-to-nitrate cfg :get
(generate-nitrate-uri
"api/users/"
profile-id
(str profile-id "/")
"owned-organizations")
[:vector schema:organization-summary]
params))
@ -314,7 +314,7 @@
(let [organizations (request-to-nitrate cfg :get
(generate-nitrate-uri
"api/users/"
profile-id
(str profile-id "/")
"owned-organizations-summary")
[:vector schema:organization-summary-counts]
params)]
@ -329,7 +329,7 @@
(request-to-nitrate cfg :post
(generate-nitrate-uri
"api/users/"
profile-id
(str profile-id "/")
"cleanup-after-deletion")
nil params))
@ -340,7 +340,7 @@
team (request-to-nitrate cfg :post
(generate-nitrate-uri
"api/organizations/"
organization-id
(str organization-id "/")
"add-team")
cto/schema:team-with-organization params)
custom-photo (when-let [logo-id (dm/get-in team [:organization :logo-id])]
@ -357,7 +357,7 @@
(request-to-nitrate cfg :post
(generate-nitrate-uri
"api/organizations/"
organization-id
(str organization-id "/")
"add-user")
schema:profile-organization params)))
@ -372,7 +372,7 @@
(request-to-nitrate cfg :post
(generate-nitrate-uri
"api/organizations/"
organization-id
(str organization-id "/")
"remove-user")
nil params)))
@ -382,7 +382,7 @@
(request-to-nitrate cfg :post
(generate-nitrate-uri
"api/organizations/"
organization-id
(str organization-id "/")
"remove-team")
nil params)))
@ -439,7 +439,7 @@
(request-to-nitrate cfg :get
(generate-nitrate-uri
"api/organizations/"
organization-id
(str organization-id "/")
"permissions")
[:map
[:organization-id ::sm/uuid]
@ -453,7 +453,7 @@
(request-to-nitrate cfg :get
(generate-nitrate-uri
"api/organizations/"
organization-id
(str organization-id "/")
"sso")
schema:nitrate-sso
params))
@ -461,7 +461,7 @@
(defn- get-organization-sso-by-team-api
[cfg {:keys [team-id] :as params}]
(request-to-nitrate cfg :get
(generate-nitrate-uri "api/teams/" team-id "sso")
(generate-nitrate-uri "api/teams/" (str team-id "/") "sso")
schema:nitrate-sso
params))
@ -470,7 +470,7 @@
(request-to-nitrate cfg :get
(generate-nitrate-uri
"api/organizations/"
organization-id
(str organization-id "/")
"members-list")
[:vector ::sm/uuid]
params))

11
backend/test/backend_tests/nitrate_test.clj
View File

@ -29,6 +29,15 @@
"http://ac.example/admin-console/api/teams/team-id/users/profile-id"]
["nested organization membership path"
["api/organizations/" "organization-id/" "members/" "profile-id"]
"http://ac.example/admin-console/api/organizations/organization-id/members/profile-id"]]]
"http://ac.example/admin-console/api/organizations/organization-id/members/profile-id"]
["organization action path"
["api/organizations/" "organization-id/" "add-team"]
"http://ac.example/admin-console/api/organizations/organization-id/add-team"]
["user action path"
["api/users/" "profile-id/" "cleanup-after-deletion"]
"http://ac.example/admin-console/api/users/profile-id/cleanup-after-deletion"]
["team action path"
["api/teams/" "team-id/" "sso"]
"http://ac.example/admin-console/api/teams/team-id/sso"]]]
(t/testing label
(t/is (= expected (apply generate-nitrate-uri segments)))))))