Merge branch 'feature/ephemeral-expose'
This commit is contained in:
commit
a9a0372d25
7 files changed
+705
No files matched your search
@@ -112,6 +112,9 @@ func (s *Server) withOrg(needAdmin bool, fn func(http.ResponseWriter, *http.Requ
|
||||
return
|
||||
}
|
||||
id := r.PathValue("org")
|
||||
if id == "-" && p.Key != nil {
|
||||
id = p.Key.OrgID // an API key belongs to one organization, so "-" can stand for it
|
||||
}
|
||||
s.mu.Lock()
|
||||
org := s.findOrg(id)
|
||||
c := &orgCtx{User: p.User, Key: p.Key}
|
||||
|
||||
Reference in new issue
Block a user