starred/zrok
1
0
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2026-09-27 17:55:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

return share tokens along with namespaces/names when listing (#726)

Browse Source
This commit is contained in:
Michael Quigley
2025-09-08 16:59:29 -04:00
parent fa5dbbb2ec
commit 9b5cb36038
4 changed files with 47 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controller/listAllNames.go
+7 -4
View File
@@ -31,7 +31,7 @@ func (h *ListAllNamesHandler) Handle(params share.ListAllNamesParams, principal
// collect allocated names from all accessible namespaces
var out []*rest_model_zrok.Name
for _, ns := range namespaces {
names, err := str.FindNamesForAccountAndNamespace(int(principal.ID), ns.Id, trx)
names, err := str.FindNamesWithShareTokensForAccountAndNamespace(int(principal.ID), ns.Id, trx)
if err != nil {
logrus.Errorf("error finding allocated names for namespace '%v': %v", ns.Token, err)
return share.NewListAllNamesInternalServerError()
@@ -41,9 +41,12 @@ func (h *ListAllNamesHandler) Handle(params share.ListAllNamesParams, principal
nameObj := &rest_model_zrok.Name{
NamespaceToken: ns.Token,
NamespaceName: ns.Name,
Name: an.Name,
Reserved: an.Reserved,
CreatedAt: an.CreatedAt.Unix(),
Name: an.Name.Name,
Reserved: an.Name.Reserved,
CreatedAt: an.Name.CreatedAt.Unix(),
}
if an.ShareToken != nil {
nameObj.ShareToken = *an.ShareToken
}
out = append(out, nameObj)
}