extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2025-08-13 09:47:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

share detail, environment detail, overview, org overview all output 'envZId' now (#998)

Browse Source
This commit is contained in:
Michael Quigley
2025-07-02 12:28:22 -04:00
parent 8aa2ff9006
commit 3f3638b189
4 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
controller/environmentDetail.go
View File

@ -70,6 +70,7 @@ func (h *environmentDetailHandler) Handle(params metadata.GetEnvironmentDetailPa
es.Shares = append(es.Shares, &rest_model_zrok.Share{ es.Shares = append(es.Shares, &rest_model_zrok.Share{
ShareToken: shr.Token, ShareToken: shr.Token,
ZID: shr.ZId, ZID: shr.ZId,
EnvZID: senv.ZId,
ShareMode: shr.ShareMode, ShareMode: shr.ShareMode,
BackendMode: shr.BackendMode, BackendMode: shr.BackendMode,
FrontendSelection: feSelection, FrontendSelection: feSelection,

1
controller/orgAccountOverview.go
View File

@ -101,6 +101,7 @@ func (h *orgAccountOverviewHandler) Handle(params metadata.OrgAccountOverviewPar
envShr := &rest_model_zrok.Share{ envShr := &rest_model_zrok.Share{
ShareToken: shr.Token, ShareToken: shr.Token,
ZID: shr.ZId, ZID: shr.ZId,
EnvZID: env.ZId,
ShareMode: shr.ShareMode, ShareMode: shr.ShareMode,
BackendMode: shr.BackendMode, BackendMode: shr.BackendMode,
FrontendSelection: feSelection, FrontendSelection: feSelection,

1
controller/overview.go
View File

@ -76,6 +76,7 @@ func (h *overviewHandler) Handle(_ metadata.OverviewParams, principal *rest_mode
envShr := &rest_model_zrok.Share{ envShr := &rest_model_zrok.Share{
ShareToken: shr.Token, ShareToken: shr.Token,
ZID: shr.ZId, ZID: shr.ZId,
EnvZID: env.ZId,
ShareMode: shr.ShareMode, ShareMode: shr.ShareMode,
BackendMode: shr.BackendMode, BackendMode: shr.BackendMode,
FrontendSelection: feSelection, FrontendSelection: feSelection,

3
controller/shareDetail.go
View File

@ -32,8 +32,10 @@ func (h *shareDetailHandler) Handle(params metadata.GetShareDetailParams, princi
return metadata.NewGetShareDetailInternalServerError() return metadata.NewGetShareDetailInternalServerError()
} }
found := false found := false
var shrEnv *store.Environment
for _, env := range envs { for _, env := range envs {
if shr.EnvironmentId == env.Id { if shr.EnvironmentId == env.Id {
shrEnv = env
found = true found = true
break break
} }
@ -71,6 +73,7 @@ func (h *shareDetailHandler) Handle(params metadata.GetShareDetailParams, princi
return metadata.NewGetShareDetailOK().WithPayload(&rest_model_zrok.Share{ return metadata.NewGetShareDetailOK().WithPayload(&rest_model_zrok.Share{
ShareToken: shr.Token, ShareToken: shr.Token,
ZID: shr.ZId, ZID: shr.ZId,
EnvZID: shrEnv.ZId,
ShareMode: shr.ShareMode, ShareMode: shr.ShareMode,
BackendMode: shr.BackendMode, BackendMode: shr.BackendMode,
FrontendSelection: feSelection, FrontendSelection: feSelection,