From 881c2631321dbb344b30449974229f76a1988c28 Mon Sep 17 00:00:00 2001 From: Michael Quigley Date: Mon, 26 Jun 2023 16:47:09 -0400 Subject: [PATCH] fix for frontend detail handler --- controller/frontendDetail.go | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/controller/frontendDetail.go b/controller/frontendDetail.go index aca79322..b8a7f28b 100644 --- a/controller/frontendDetail.go +++ b/controller/frontendDetail.go @@ -45,16 +45,19 @@ func (h *getFrontendDetailHandler) Handle(params metadata.GetFrontendDetailParam logrus.Errorf("environment not matched for frontend '%d' for account '%v'", fe.Id, principal.Email) return metadata.NewGetFrontendDetailNotFound() } - shr, err := str.GetShare(fe.Id, trx) - if err != nil { - logrus.Errorf("error getting share for frontend '%d': %v", fe.Id, err) - return metadata.NewGetFrontendDetailInternalServerError() - } - return metadata.NewGetFrontendDetailOK().WithPayload(&rest_model_zrok.Frontend{ + payload := &rest_model_zrok.Frontend{ ID: int64(fe.Id), - ShrToken: shr.Token, ZID: fe.ZId, CreatedAt: fe.CreatedAt.UnixMilli(), UpdatedAt: fe.UpdatedAt.UnixMilli(), - }) + } + if fe.PrivateShareId != nil { + shr, err := str.GetShare(*fe.PrivateShareId, trx) + if err != nil { + logrus.Errorf("error getting share for frontend '%d': %v", fe.Id, err) + return metadata.NewGetFrontendDetailInternalServerError() + } + payload.ShrToken = shr.Token + } + return metadata.NewGetFrontendDetailOK().WithPayload(payload) }