diff --git a/cmd/zrok/accessPrivate.go b/cmd/zrok/accessPrivate.go index 0b3eaaf9..d5534b81 100644 --- a/cmd/zrok/accessPrivate.go +++ b/cmd/zrok/accessPrivate.go @@ -118,7 +118,7 @@ func (cmd *accessPrivateCommand) accessLocal(args []string, root env_core.Root) auth := httptransport.APIKeyAuth("X-TOKEN", "header", root.Environment().Token) req := share.NewAccessParams() - req.Body.ShrToken = shrToken + req.Body.ShareToken = shrToken req.Body.EnvZID = root.Environment().ZitiIdentity accessResp, err := zrok.Share.Access(req, auth) @@ -321,7 +321,7 @@ func (cmd *accessPrivateCommand) shutdown(frontendName, envZId, shrToken string, logrus.Infof("shutting down '%v'", shrToken) req := share.NewUnaccessParams() req.Body.FrontendToken = frontendName - req.Body.ShrToken = shrToken + req.Body.ShareToken = shrToken req.Body.EnvZID = envZId if _, err := zrok.Share.Unaccess(req, auth); err == nil { logrus.Debugf("shutdown complete") diff --git a/cmd/zrok/invite.go b/cmd/zrok/invite.go index ab4a8553..9a545bcf 100644 --- a/cmd/zrok/invite.go +++ b/cmd/zrok/invite.go @@ -79,7 +79,7 @@ func (cmd *inviteCommand) run(_ *cobra.Command, _ []string) { req := account.NewInviteParams() req.Body.Email = email - req.Body.InvToken = invToken + req.Body.InviteToken = invToken _, err = zrok.Account.Invite(req) if err != nil { cmd.endpointError(env.ApiEndpoint()) diff --git a/cmd/zrok/modifyShare.go b/cmd/zrok/modifyShare.go index 9b384838..db62d219 100644 --- a/cmd/zrok/modifyShare.go +++ b/cmd/zrok/modifyShare.go @@ -58,7 +58,7 @@ func (cmd *modifyShareCommand) run(_ *cobra.Command, args []string) { if len(cmd.addAccessGrants) > 0 || len(cmd.removeAccessGrants) > 0 { req := share.NewUpdateShareParams() - req.Body.ShrToken = shrToken + req.Body.ShareToken = shrToken req.Body.AddAccessGrants = cmd.addAccessGrants req.Body.RemoveAccessGrants = cmd.removeAccessGrants if _, err := zrok.Share.UpdateShare(req, auth); err != nil { diff --git a/cmd/zrok/release.go b/cmd/zrok/release.go index ce9949c8..238ec468 100644 --- a/cmd/zrok/release.go +++ b/cmd/zrok/release.go @@ -53,7 +53,7 @@ func (cmd *releaseCommand) run(_ *cobra.Command, args []string) { auth := httptransport.APIKeyAuth("X-TOKEN", "header", env.Environment().Token) req := share.NewUnshareParams() req.Body.EnvZID = env.Environment().ZitiIdentity - req.Body.ShrToken = shrToken + req.Body.ShareToken = shrToken req.Body.Reserved = true if _, err := zrok.Share.Unshare(req, auth); err != nil { if !panicInstead { diff --git a/cmd/zrok/shareReserved.go b/cmd/zrok/shareReserved.go index 9f1f2235..b02641cd 100644 --- a/cmd/zrok/shareReserved.go +++ b/cmd/zrok/shareReserved.go @@ -107,7 +107,7 @@ func (cmd *shareReservedCommand) shareLocal(args []string, root env_core.Root) { } auth := httptransport.APIKeyAuth("X-TOKEN", "header", root.Environment().Token) req := metadata.NewGetShareDetailParams() - req.ShrToken = shrToken + req.ShareToken = shrToken resp, err := zrok.Metadata.GetShareDetail(req, auth) if err != nil { cmd.error("unable to retrieve reserved share", err) @@ -132,7 +132,7 @@ func (cmd *shareReservedCommand) shareLocal(args []string, root env_core.Root) { if resp.Payload.BackendProxyEndpoint != target { upReq := share.NewUpdateShareParams() - upReq.Body.ShrToken = shrToken + upReq.Body.ShareToken = shrToken upReq.Body.BackendProxyEndpoint = target if _, err := zrok.Share.UpdateShare(upReq, auth); err != nil { cmd.error("unable to update backend target", err) @@ -320,7 +320,7 @@ func (cmd *shareReservedCommand) shareLocal(args []string, root env_core.Root) { if cmd.subordinate { data := make(map[string]interface{}) data[subordinate.MessageKey] = subordinate.BootMessage - data["token"] = resp.Payload.Token + data["token"] = resp.Payload.ShareToken data["backend_mode"] = resp.Payload.BackendMode data["share_mode"] = resp.Payload.ShareMode if resp.Payload.FrontendEndpoint != "" { diff --git a/cmd/zrok/testLoopPublic.go b/cmd/zrok/testLoopPublic.go index ec947030..2688c964 100644 --- a/cmd/zrok/testLoopPublic.go +++ b/cmd/zrok/testLoopPublic.go @@ -216,7 +216,7 @@ func (l *looper) startup() { if err != nil { panic(err) } - l.shrToken = tunnelResp.Payload.ShrToken + l.shrToken = tunnelResp.Payload.ShareToken l.proxyEndpoint = tunnelResp.Payload.FrontendProxyEndpoints[0] } @@ -283,7 +283,7 @@ func (l *looper) shutdown() { req := share.NewUnshareParams() req.Body.EnvZID = l.env.ZitiIdentity - req.Body.ShrToken = l.shrToken + req.Body.ShareToken = l.shrToken if _, err := l.zrok.Share.Unshare(req, l.auth); err != nil { logrus.Errorf("error shutting down looper #%d: %v", l.id, err) } diff --git a/controller/access.go b/controller/access.go index 85c6f9b1..15ad155c 100644 --- a/controller/access.go +++ b/controller/access.go @@ -46,7 +46,7 @@ func (h *accessHandler) Handle(params share.AccessParams, principal *rest_model_ return share.NewAccessNotFound() } - shrToken := params.Body.ShrToken + shrToken := params.Body.ShareToken shr, err := str.FindShareWithToken(shrToken, trx) if err != nil { logrus.Errorf("error finding share with token '%v': %v", shrToken, err) diff --git a/controller/environmentDetail.go b/controller/environmentDetail.go index 5f401ad2..f6e52270 100644 --- a/controller/environmentDetail.go +++ b/controller/environmentDetail.go @@ -68,7 +68,7 @@ func (h *environmentDetailHandler) Handle(params metadata.GetEnvironmentDetailPa sparkData = append(sparkData, &rest_model_zrok.SparkDataSample{Rx: float64(sparkRx[shr.Token][i]), Tx: float64(sparkTx[shr.Token][i])}) } es.Shares = append(es.Shares, &rest_model_zrok.Share{ - Token: shr.Token, + ShareToken: shr.Token, ZID: shr.ZId, ShareMode: shr.ShareMode, BackendMode: shr.BackendMode, diff --git a/controller/frontendDetail.go b/controller/frontendDetail.go index ac5308e4..3e0f5e37 100644 --- a/controller/frontendDetail.go +++ b/controller/frontendDetail.go @@ -58,7 +58,7 @@ func (h *getFrontendDetailHandler) Handle(params metadata.GetFrontendDetailParam logrus.Errorf("error getting share for frontend '%d': %v", fe.Id, err) return metadata.NewGetFrontendDetailInternalServerError() } - payload.ShrToken = shr.Token + payload.ShareToken = shr.Token } return metadata.NewGetFrontendDetailOK().WithPayload(payload) } diff --git a/controller/invite.go b/controller/invite.go index 0e062abc..bc4b229a 100644 --- a/controller/invite.go +++ b/controller/invite.go @@ -43,9 +43,9 @@ func (h *inviteHandler) Handle(params account.InviteParams) middleware.Responder defer func() { _ = tx.Rollback() }() if h.cfg.Invites != nil && h.cfg.Invites.TokenStrategy == "store" { - inviteToken, err := str.FindInviteTokenByToken(params.Body.InvToken, tx) + inviteToken, err := str.FindInviteTokenByToken(params.Body.InviteToken, tx) if err != nil { - logrus.Errorf("cannot get invite token '%v' for '%v': %v", params.Body.InvToken, params.Body.Email, err) + logrus.Errorf("cannot get invite token '%v' for '%v': %v", params.Body.InviteToken, params.Body.Email, err) return account.NewInviteBadRequest().WithPayload("missing invite token") } if err := str.DeleteInviteToken(inviteToken.Id, tx); err != nil { diff --git a/controller/metrics.go b/controller/metrics.go index f31f4657..d251f2f6 100644 --- a/controller/metrics.go +++ b/controller/metrics.go @@ -165,9 +165,9 @@ func (h *getShareMetricsHandler) Handle(params metadata.GetShareMetricsParams, p return metadata.NewGetEnvironmentMetricsInternalServerError() } defer func() { _ = trx.Rollback() }() - shr, err := str.FindShareWithToken(params.ShrToken, trx) + shr, err := str.FindShareWithToken(params.ShareToken, trx) if err != nil { - logrus.Errorf("error finding share '%v' for '%v': %v", params.ShrToken, principal.Email, err) + logrus.Errorf("error finding share '%v' for '%v': %v", params.ShareToken, principal.Email, err) return metadata.NewGetShareMetricsUnauthorized() } env, err := str.GetEnvironment(shr.EnvironmentId, trx) @@ -176,7 +176,7 @@ func (h *getShareMetricsHandler) Handle(params metadata.GetShareMetricsParams, p return metadata.NewGetShareMetricsUnauthorized() } if env.AccountId != nil && int64(*env.AccountId) != principal.ID { - logrus.Errorf("user '%v' does not own share '%v'", principal.Email, params.ShrToken) + logrus.Errorf("user '%v' does not own share '%v'", principal.Email, params.ShareToken) return metadata.NewGetShareMetricsUnauthorized() } diff --git a/controller/orgAccountOverview.go b/controller/orgAccountOverview.go index 7306f532..fb837105 100644 --- a/controller/orgAccountOverview.go +++ b/controller/orgAccountOverview.go @@ -99,7 +99,7 @@ func (h *orgAccountOverviewHandler) Handle(params metadata.OrgAccountOverviewPar beProxyEndpoint = *shr.BackendProxyEndpoint } envShr := &rest_model_zrok.Share{ - Token: shr.Token, + ShareToken: shr.Token, ZID: shr.ZId, ShareMode: shr.ShareMode, BackendMode: shr.BackendMode, @@ -132,7 +132,7 @@ func (h *orgAccountOverviewHandler) Handle(params metadata.OrgAccountOverviewPar logrus.Errorf("error getting share for frontend '%v': %v", fe.ZId, err) return metadata.NewOverviewInternalServerError() } - envFe.ShrToken = feShr.Token + envFe.ShareToken = feShr.Token } ear.Frontends = append(ear.Frontends, envFe) } diff --git a/controller/overview.go b/controller/overview.go index bfde1d8d..39644a79 100644 --- a/controller/overview.go +++ b/controller/overview.go @@ -66,7 +66,7 @@ func (h *overviewHandler) Handle(_ metadata.OverviewParams, principal *rest_mode beProxyEndpoint = *shr.BackendProxyEndpoint } envShr := &rest_model_zrok.Share{ - Token: shr.Token, + ShareToken: shr.Token, ZID: shr.ZId, ShareMode: shr.ShareMode, BackendMode: shr.BackendMode, @@ -98,7 +98,7 @@ func (h *overviewHandler) Handle(_ metadata.OverviewParams, principal *rest_mode logrus.Errorf("error getting share for frontend '%v': %v", fe.ZId, err) return metadata.NewOverviewInternalServerError() } - envFe.ShrToken = feShr.Token + envFe.ShareToken = feShr.Token } ear.Frontends = append(ear.Frontends, envFe) } diff --git a/controller/register.go b/controller/register.go index 39c52f76..aff33120 100644 --- a/controller/register.go +++ b/controller/register.go @@ -19,39 +19,39 @@ func newRegisterHandler(cfg *config.Config) *registerHandler { } } func (h *registerHandler) Handle(params account.RegisterParams) middleware.Responder { - if params.Body.RegToken == "" || params.Body.Password == "" { + if params.Body.RegisterToken == "" || params.Body.Password == "" { logrus.Error("missing token or password") return account.NewRegisterNotFound() } - logrus.Infof("received register request for registration token '%v'", params.Body.RegToken) + logrus.Infof("received register request for registration token '%v'", params.Body.RegisterToken) tx, err := str.Begin() if err != nil { - logrus.Errorf("error starting transaction for registration token '%v': %v", params.Body.RegToken, err) + logrus.Errorf("error starting transaction for registration token '%v': %v", params.Body.RegisterToken, err) return account.NewRegisterInternalServerError() } defer func() { _ = tx.Rollback() }() - ar, err := str.FindAccountRequestWithToken(params.Body.RegToken, tx) + ar, err := str.FindAccountRequestWithToken(params.Body.RegisterToken, tx) if err != nil { - logrus.Errorf("error finding account request with registration token '%v': %v", params.Body.RegToken, err) + logrus.Errorf("error finding account request with registration token '%v': %v", params.Body.RegisterToken, err) return account.NewRegisterNotFound() } accountToken, err := CreateToken() if err != nil { - logrus.Errorf("error creating account token for request '%v' (%v): %v", params.Body.RegToken, ar.Email, err) + logrus.Errorf("error creating account token for request '%v' (%v): %v", params.Body.RegisterToken, ar.Email, err) return account.NewRegisterInternalServerError() } if err := validatePassword(h.cfg, params.Body.Password); err != nil { - logrus.Errorf("password not valid for request '%v', (%v): %v", params.Body.RegToken, ar.Email, err) + logrus.Errorf("password not valid for request '%v', (%v): %v", params.Body.RegisterToken, ar.Email, err) return account.NewRegisterUnprocessableEntity().WithPayload(rest_model_zrok.ErrorMessage(err.Error())) } hpwd, err := HashPassword(params.Body.Password) if err != nil { - logrus.Errorf("error hashing password for request '%v' (%v): %v", params.Body.RegToken, ar.Email, err) + logrus.Errorf("error hashing password for request '%v' (%v): %v", params.Body.RegisterToken, ar.Email, err) return account.NewRegisterInternalServerError() } a := &store.Account{ @@ -61,17 +61,17 @@ func (h *registerHandler) Handle(params account.RegisterParams) middleware.Respo Token: accountToken, } if _, err := str.CreateAccount(a, tx); err != nil { - logrus.Errorf("error creating account for request '%v' (%v): %v", params.Body.RegToken, ar.Email, err) + logrus.Errorf("error creating account for request '%v' (%v): %v", params.Body.RegisterToken, ar.Email, err) return account.NewRegisterInternalServerError() } if err := str.DeleteAccountRequest(ar.Id, tx); err != nil { - logrus.Errorf("error deleteing account request '%v' (%v): %v", params.Body.RegToken, ar.Email, err) + logrus.Errorf("error deleteing account request '%v' (%v): %v", params.Body.RegisterToken, ar.Email, err) return account.NewRegisterInternalServerError() } if err := tx.Commit(); err != nil { - logrus.Errorf("error committing '%v' (%v): %v", params.Body.RegToken, ar.Email, err) + logrus.Errorf("error committing '%v' (%v): %v", params.Body.RegisterToken, ar.Email, err) return account.NewRegisterInternalServerError() } diff --git a/controller/share.go b/controller/share.go index b43088d1..6e2eed3c 100644 --- a/controller/share.go +++ b/controller/share.go @@ -209,7 +209,7 @@ func (h *shareHandler) Handle(params share.ShareParams, principal *rest_model_zr return share.NewShareCreated().WithPayload(&rest_model_zrok.ShareResponse{ FrontendProxyEndpoints: frontendEndpoints, - ShrToken: shrToken, + ShareToken: shrToken, }) } diff --git a/controller/shareDetail.go b/controller/shareDetail.go index 096f67f3..94fde868 100644 --- a/controller/shareDetail.go +++ b/controller/shareDetail.go @@ -21,9 +21,9 @@ func (h *shareDetailHandler) Handle(params metadata.GetShareDetailParams, princi return metadata.NewGetShareDetailInternalServerError() } defer func() { _ = tx.Rollback() }() - shr, err := str.FindShareWithToken(params.ShrToken, tx) + shr, err := str.FindShareWithToken(params.ShareToken, tx) if err != nil { - logrus.Errorf("error finding share '%v': %v", params.ShrToken, err) + logrus.Errorf("error finding share '%v': %v", params.ShareToken, err) return metadata.NewGetShareDetailNotFound() } envs, err := str.FindEnvironmentsForAccount(int(principal.ID), tx) @@ -39,7 +39,7 @@ func (h *shareDetailHandler) Handle(params metadata.GetShareDetailParams, princi } } if !found { - logrus.Errorf("environment not matched for share '%v' for account '%v'", params.ShrToken, principal.Email) + logrus.Errorf("environment not matched for share '%v' for account '%v'", params.ShareToken, principal.Email) return metadata.NewGetShareDetailNotFound() } sparkRx := make(map[string][]int64) @@ -69,7 +69,7 @@ func (h *shareDetailHandler) Handle(params metadata.GetShareDetailParams, princi sparkData = append(sparkData, &rest_model_zrok.SparkDataSample{Rx: float64(sparkRx[shr.Token][i]), Tx: float64(sparkTx[shr.Token][i])}) } return metadata.NewGetShareDetailOK().WithPayload(&rest_model_zrok.Share{ - Token: shr.Token, + ShareToken: shr.Token, ZID: shr.ZId, ShareMode: shr.ShareMode, BackendMode: shr.BackendMode, diff --git a/controller/unaccess.go b/controller/unaccess.go index 197c1b7e..a7dec06a 100644 --- a/controller/unaccess.go +++ b/controller/unaccess.go @@ -18,7 +18,7 @@ func newUnaccessHandler() *unaccessHandler { func (h *unaccessHandler) Handle(params share.UnaccessParams, principal *rest_model_zrok.Principal) middleware.Responder { feToken := params.Body.FrontendToken - shrToken := params.Body.ShrToken + shrToken := params.Body.ShareToken envZId := params.Body.EnvZID logrus.Infof("processing unaccess request for frontend '%v' (share '%v', environment '%v')", feToken, shrToken, envZId) diff --git a/controller/unshare.go b/controller/unshare.go index cbadcfcc..a2633437 100644 --- a/controller/unshare.go +++ b/controller/unshare.go @@ -34,7 +34,7 @@ func (h *unshareHandler) Handle(params share.UnshareParams, principal *rest_mode logrus.Errorf("error getting edge client for '%v': %v", principal.Email, err) return share.NewUnshareInternalServerError() } - shrToken := params.Body.ShrToken + shrToken := params.Body.ShareToken shrZId, err := h.findShareZId(shrToken, edge) if err != nil { logrus.Errorf("error finding share identity for '%v' (%v): %v", shrToken, principal.Email, err) diff --git a/controller/updateShare.go b/controller/updateShare.go index 0eccffed..1a7e0574 100644 --- a/controller/updateShare.go +++ b/controller/updateShare.go @@ -14,7 +14,7 @@ func newUpdateShareHandler() *updateShareHandler { } func (h *updateShareHandler) Handle(params share.UpdateShareParams, principal *rest_model_zrok.Principal) middleware.Responder { - shrToken := params.Body.ShrToken + shrToken := params.Body.ShareToken backendProxyEndpoint := params.Body.BackendProxyEndpoint tx, err := str.Begin() diff --git a/controller/verify.go b/controller/verify.go index 26c4572e..66758518 100644 --- a/controller/verify.go +++ b/controller/verify.go @@ -13,8 +13,8 @@ func newVerifyHandler() *verifyHandler { } func (h *verifyHandler) Handle(params account.VerifyParams) middleware.Responder { - if params.Body.RegistrationToken != "" { - logrus.Debugf("received verify request for registration token '%v'", params.Body.RegistrationToken) + if params.Body.RegisterToken != "" { + logrus.Debugf("received verify request for registration token '%v'", params.Body.RegisterToken) tx, err := str.Begin() if err != nil { logrus.Errorf("error starting transaction: %v", err) @@ -22,9 +22,9 @@ func (h *verifyHandler) Handle(params account.VerifyParams) middleware.Responder } defer func() { _ = tx.Rollback() }() - ar, err := str.FindAccountRequestWithToken(params.Body.RegistrationToken, tx) + ar, err := str.FindAccountRequestWithToken(params.Body.RegisterToken, tx) if err != nil { - logrus.Errorf("error finding account request with registration token '%v': %v", params.Body.RegistrationToken, err) + logrus.Errorf("error finding account request with registration token '%v': %v", params.Body.RegisterToken, err) return account.NewVerifyNotFound() } diff --git a/rest_client_zrok/account/invite_responses.go b/rest_client_zrok/account/invite_responses.go index 25de3ae8..c009cc6d 100644 --- a/rest_client_zrok/account/invite_responses.go +++ b/rest_client_zrok/account/invite_responses.go @@ -297,8 +297,8 @@ type InviteBody struct { // email Email string `json:"email,omitempty"` - // inv token - InvToken string `json:"invToken,omitempty"` + // invite token + InviteToken string `json:"inviteToken,omitempty"` } // Validate validates this invite body diff --git a/rest_client_zrok/account/register_responses.go b/rest_client_zrok/account/register_responses.go index 14620fc0..e283669f 100644 --- a/rest_client_zrok/account/register_responses.go +++ b/rest_client_zrok/account/register_responses.go @@ -309,8 +309,8 @@ type RegisterBody struct { // password Password string `json:"password,omitempty"` - // reg token - RegToken string `json:"regToken,omitempty"` + // register token + RegisterToken string `json:"registerToken,omitempty"` } // Validate validates this register body diff --git a/rest_client_zrok/account/verify_responses.go b/rest_client_zrok/account/verify_responses.go index e1773982..13051959 100644 --- a/rest_client_zrok/account/verify_responses.go +++ b/rest_client_zrok/account/verify_responses.go @@ -232,8 +232,8 @@ swagger:model VerifyBody */ type VerifyBody struct { - // registration token - RegistrationToken string `json:"registrationToken,omitempty"` + // register token + RegisterToken string `json:"registerToken,omitempty"` } // Validate validates this verify body diff --git a/rest_client_zrok/metadata/get_share_detail_parameters.go b/rest_client_zrok/metadata/get_share_detail_parameters.go index 6920c02d..8d23e72a 100644 --- a/rest_client_zrok/metadata/get_share_detail_parameters.go +++ b/rest_client_zrok/metadata/get_share_detail_parameters.go @@ -61,8 +61,8 @@ GetShareDetailParams contains all the parameters to send to the API endpoint */ type GetShareDetailParams struct { - // ShrToken. - ShrToken string + // ShareToken. + ShareToken string timeout time.Duration Context context.Context @@ -117,15 +117,15 @@ func (o *GetShareDetailParams) SetHTTPClient(client *http.Client) { o.HTTPClient = client } -// WithShrToken adds the shrToken to the get share detail params -func (o *GetShareDetailParams) WithShrToken(shrToken string) *GetShareDetailParams { - o.SetShrToken(shrToken) +// WithShareToken adds the shareToken to the get share detail params +func (o *GetShareDetailParams) WithShareToken(shareToken string) *GetShareDetailParams { + o.SetShareToken(shareToken) return o } -// SetShrToken adds the shrToken to the get share detail params -func (o *GetShareDetailParams) SetShrToken(shrToken string) { - o.ShrToken = shrToken +// SetShareToken adds the shareToken to the get share detail params +func (o *GetShareDetailParams) SetShareToken(shareToken string) { + o.ShareToken = shareToken } // WriteToRequest writes these params to a swagger request @@ -136,8 +136,8 @@ func (o *GetShareDetailParams) WriteToRequest(r runtime.ClientRequest, reg strfm } var res []error - // path param shrToken - if err := r.SetPathParam("shrToken", o.ShrToken); err != nil { + // path param shareToken + if err := r.SetPathParam("shareToken", o.ShareToken); err != nil { return err } diff --git a/rest_client_zrok/metadata/get_share_detail_responses.go b/rest_client_zrok/metadata/get_share_detail_responses.go index 420efde5..f319df42 100644 --- a/rest_client_zrok/metadata/get_share_detail_responses.go +++ b/rest_client_zrok/metadata/get_share_detail_responses.go @@ -48,7 +48,7 @@ func (o *GetShareDetailReader) ReadResponse(response runtime.ClientResponse, con } return nil, result default: - return nil, runtime.NewAPIError("[GET /detail/share/{shrToken}] getShareDetail", response, response.Code()) + return nil, runtime.NewAPIError("[GET /detail/share/{shareToken}] getShareDetail", response, response.Code()) } } @@ -97,11 +97,11 @@ func (o *GetShareDetailOK) Code() int { } func (o *GetShareDetailOK) Error() string { - return fmt.Sprintf("[GET /detail/share/{shrToken}][%d] getShareDetailOK %+v", 200, o.Payload) + return fmt.Sprintf("[GET /detail/share/{shareToken}][%d] getShareDetailOK %+v", 200, o.Payload) } func (o *GetShareDetailOK) String() string { - return fmt.Sprintf("[GET /detail/share/{shrToken}][%d] getShareDetailOK %+v", 200, o.Payload) + return fmt.Sprintf("[GET /detail/share/{shareToken}][%d] getShareDetailOK %+v", 200, o.Payload) } func (o *GetShareDetailOK) GetPayload() *rest_model_zrok.Share { @@ -164,11 +164,11 @@ func (o *GetShareDetailUnauthorized) Code() int { } func (o *GetShareDetailUnauthorized) Error() string { - return fmt.Sprintf("[GET /detail/share/{shrToken}][%d] getShareDetailUnauthorized ", 401) + return fmt.Sprintf("[GET /detail/share/{shareToken}][%d] getShareDetailUnauthorized ", 401) } func (o *GetShareDetailUnauthorized) String() string { - return fmt.Sprintf("[GET /detail/share/{shrToken}][%d] getShareDetailUnauthorized ", 401) + return fmt.Sprintf("[GET /detail/share/{shareToken}][%d] getShareDetailUnauthorized ", 401) } func (o *GetShareDetailUnauthorized) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { @@ -220,11 +220,11 @@ func (o *GetShareDetailNotFound) Code() int { } func (o *GetShareDetailNotFound) Error() string { - return fmt.Sprintf("[GET /detail/share/{shrToken}][%d] getShareDetailNotFound ", 404) + return fmt.Sprintf("[GET /detail/share/{shareToken}][%d] getShareDetailNotFound ", 404) } func (o *GetShareDetailNotFound) String() string { - return fmt.Sprintf("[GET /detail/share/{shrToken}][%d] getShareDetailNotFound ", 404) + return fmt.Sprintf("[GET /detail/share/{shareToken}][%d] getShareDetailNotFound ", 404) } func (o *GetShareDetailNotFound) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { @@ -276,11 +276,11 @@ func (o *GetShareDetailInternalServerError) Code() int { } func (o *GetShareDetailInternalServerError) Error() string { - return fmt.Sprintf("[GET /detail/share/{shrToken}][%d] getShareDetailInternalServerError ", 500) + return fmt.Sprintf("[GET /detail/share/{shareToken}][%d] getShareDetailInternalServerError ", 500) } func (o *GetShareDetailInternalServerError) String() string { - return fmt.Sprintf("[GET /detail/share/{shrToken}][%d] getShareDetailInternalServerError ", 500) + return fmt.Sprintf("[GET /detail/share/{shareToken}][%d] getShareDetailInternalServerError ", 500) } func (o *GetShareDetailInternalServerError) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { diff --git a/rest_client_zrok/metadata/get_share_metrics_parameters.go b/rest_client_zrok/metadata/get_share_metrics_parameters.go index 96f5ac62..23526af1 100644 --- a/rest_client_zrok/metadata/get_share_metrics_parameters.go +++ b/rest_client_zrok/metadata/get_share_metrics_parameters.go @@ -64,8 +64,8 @@ type GetShareMetricsParams struct { // Duration. Duration *string - // ShrToken. - ShrToken string + // ShareToken. + ShareToken string timeout time.Duration Context context.Context @@ -131,15 +131,15 @@ func (o *GetShareMetricsParams) SetDuration(duration *string) { o.Duration = duration } -// WithShrToken adds the shrToken to the get share metrics params -func (o *GetShareMetricsParams) WithShrToken(shrToken string) *GetShareMetricsParams { - o.SetShrToken(shrToken) +// WithShareToken adds the shareToken to the get share metrics params +func (o *GetShareMetricsParams) WithShareToken(shareToken string) *GetShareMetricsParams { + o.SetShareToken(shareToken) return o } -// SetShrToken adds the shrToken to the get share metrics params -func (o *GetShareMetricsParams) SetShrToken(shrToken string) { - o.ShrToken = shrToken +// SetShareToken adds the shareToken to the get share metrics params +func (o *GetShareMetricsParams) SetShareToken(shareToken string) { + o.ShareToken = shareToken } // WriteToRequest writes these params to a swagger request @@ -167,8 +167,8 @@ func (o *GetShareMetricsParams) WriteToRequest(r runtime.ClientRequest, reg strf } } - // path param shrToken - if err := r.SetPathParam("shrToken", o.ShrToken); err != nil { + // path param shareToken + if err := r.SetPathParam("shareToken", o.ShareToken); err != nil { return err } diff --git a/rest_client_zrok/metadata/get_share_metrics_responses.go b/rest_client_zrok/metadata/get_share_metrics_responses.go index 1a189a63..242760ef 100644 --- a/rest_client_zrok/metadata/get_share_metrics_responses.go +++ b/rest_client_zrok/metadata/get_share_metrics_responses.go @@ -48,7 +48,7 @@ func (o *GetShareMetricsReader) ReadResponse(response runtime.ClientResponse, co } return nil, result default: - return nil, runtime.NewAPIError("[GET /metrics/share/{shrToken}] getShareMetrics", response, response.Code()) + return nil, runtime.NewAPIError("[GET /metrics/share/{shareToken}] getShareMetrics", response, response.Code()) } } @@ -97,11 +97,11 @@ func (o *GetShareMetricsOK) Code() int { } func (o *GetShareMetricsOK) Error() string { - return fmt.Sprintf("[GET /metrics/share/{shrToken}][%d] getShareMetricsOK %+v", 200, o.Payload) + return fmt.Sprintf("[GET /metrics/share/{shareToken}][%d] getShareMetricsOK %+v", 200, o.Payload) } func (o *GetShareMetricsOK) String() string { - return fmt.Sprintf("[GET /metrics/share/{shrToken}][%d] getShareMetricsOK %+v", 200, o.Payload) + return fmt.Sprintf("[GET /metrics/share/{shareToken}][%d] getShareMetricsOK %+v", 200, o.Payload) } func (o *GetShareMetricsOK) GetPayload() *rest_model_zrok.Metrics { @@ -164,11 +164,11 @@ func (o *GetShareMetricsBadRequest) Code() int { } func (o *GetShareMetricsBadRequest) Error() string { - return fmt.Sprintf("[GET /metrics/share/{shrToken}][%d] getShareMetricsBadRequest ", 400) + return fmt.Sprintf("[GET /metrics/share/{shareToken}][%d] getShareMetricsBadRequest ", 400) } func (o *GetShareMetricsBadRequest) String() string { - return fmt.Sprintf("[GET /metrics/share/{shrToken}][%d] getShareMetricsBadRequest ", 400) + return fmt.Sprintf("[GET /metrics/share/{shareToken}][%d] getShareMetricsBadRequest ", 400) } func (o *GetShareMetricsBadRequest) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { @@ -220,11 +220,11 @@ func (o *GetShareMetricsUnauthorized) Code() int { } func (o *GetShareMetricsUnauthorized) Error() string { - return fmt.Sprintf("[GET /metrics/share/{shrToken}][%d] getShareMetricsUnauthorized ", 401) + return fmt.Sprintf("[GET /metrics/share/{shareToken}][%d] getShareMetricsUnauthorized ", 401) } func (o *GetShareMetricsUnauthorized) String() string { - return fmt.Sprintf("[GET /metrics/share/{shrToken}][%d] getShareMetricsUnauthorized ", 401) + return fmt.Sprintf("[GET /metrics/share/{shareToken}][%d] getShareMetricsUnauthorized ", 401) } func (o *GetShareMetricsUnauthorized) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { @@ -276,11 +276,11 @@ func (o *GetShareMetricsInternalServerError) Code() int { } func (o *GetShareMetricsInternalServerError) Error() string { - return fmt.Sprintf("[GET /metrics/share/{shrToken}][%d] getShareMetricsInternalServerError ", 500) + return fmt.Sprintf("[GET /metrics/share/{shareToken}][%d] getShareMetricsInternalServerError ", 500) } func (o *GetShareMetricsInternalServerError) String() string { - return fmt.Sprintf("[GET /metrics/share/{shrToken}][%d] getShareMetricsInternalServerError ", 500) + return fmt.Sprintf("[GET /metrics/share/{shareToken}][%d] getShareMetricsInternalServerError ", 500) } func (o *GetShareMetricsInternalServerError) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { diff --git a/rest_client_zrok/metadata/metadata_client.go b/rest_client_zrok/metadata/metadata_client.go index 1b7da2f5..452b93c3 100644 --- a/rest_client_zrok/metadata/metadata_client.go +++ b/rest_client_zrok/metadata/metadata_client.go @@ -305,7 +305,7 @@ func (a *Client) GetShareDetail(params *GetShareDetailParams, authInfo runtime.C op := &runtime.ClientOperation{ ID: "getShareDetail", Method: "GET", - PathPattern: "/detail/share/{shrToken}", + PathPattern: "/detail/share/{shareToken}", ProducesMediaTypes: []string{"application/zrok.v1+json"}, ConsumesMediaTypes: []string{"application/zrok.v1+json"}, Schemes: []string{"http"}, @@ -344,7 +344,7 @@ func (a *Client) GetShareMetrics(params *GetShareMetricsParams, authInfo runtime op := &runtime.ClientOperation{ ID: "getShareMetrics", Method: "GET", - PathPattern: "/metrics/share/{shrToken}", + PathPattern: "/metrics/share/{shareToken}", ProducesMediaTypes: []string{"application/zrok.v1+json"}, ConsumesMediaTypes: []string{"application/zrok.v1+json"}, Schemes: []string{"http"}, diff --git a/rest_client_zrok/share/access_responses.go b/rest_client_zrok/share/access_responses.go index 36d5e93f..f12c6189 100644 --- a/rest_client_zrok/share/access_responses.go +++ b/rest_client_zrok/share/access_responses.go @@ -297,8 +297,8 @@ type AccessBody struct { // env z Id EnvZID string `json:"envZId,omitempty"` - // shr token - ShrToken string `json:"shrToken,omitempty"` + // share token + ShareToken string `json:"shareToken,omitempty"` } // Validate validates this access body diff --git a/rest_client_zrok/share/unaccess_responses.go b/rest_client_zrok/share/unaccess_responses.go index 1ac752ee..2f5579bf 100644 --- a/rest_client_zrok/share/unaccess_responses.go +++ b/rest_client_zrok/share/unaccess_responses.go @@ -287,8 +287,8 @@ type UnaccessBody struct { // frontend token FrontendToken string `json:"frontendToken,omitempty"` - // shr token - ShrToken string `json:"shrToken,omitempty"` + // share token + ShareToken string `json:"shareToken,omitempty"` } // Validate validates this unaccess body diff --git a/rest_client_zrok/share/unshare_responses.go b/rest_client_zrok/share/unshare_responses.go index beed049b..7e1d1d62 100644 --- a/rest_client_zrok/share/unshare_responses.go +++ b/rest_client_zrok/share/unshare_responses.go @@ -300,8 +300,8 @@ type UnshareBody struct { // reserved Reserved bool `json:"reserved,omitempty"` - // shr token - ShrToken string `json:"shrToken,omitempty"` + // share token + ShareToken string `json:"shareToken,omitempty"` } // Validate validates this unshare body diff --git a/rest_client_zrok/share/update_share_responses.go b/rest_client_zrok/share/update_share_responses.go index 2edfa8c9..0478efa8 100644 --- a/rest_client_zrok/share/update_share_responses.go +++ b/rest_client_zrok/share/update_share_responses.go @@ -352,8 +352,8 @@ type UpdateShareBody struct { // remove access grants RemoveAccessGrants []string `json:"removeAccessGrants"` - // shr token - ShrToken string `json:"shrToken,omitempty"` + // share token + ShareToken string `json:"shareToken,omitempty"` } // Validate validates this update share body diff --git a/rest_model_zrok/frontend.go b/rest_model_zrok/frontend.go index acc99a15..9dc845de 100644 --- a/rest_model_zrok/frontend.go +++ b/rest_model_zrok/frontend.go @@ -26,8 +26,8 @@ type Frontend struct { // id ID int64 `json:"id,omitempty"` - // shr token - ShrToken string `json:"shrToken,omitempty"` + // share token + ShareToken string `json:"shareToken,omitempty"` // updated at UpdatedAt int64 `json:"updatedAt,omitempty"` diff --git a/rest_model_zrok/share.go b/rest_model_zrok/share.go index 998744b4..1c1bda87 100644 --- a/rest_model_zrok/share.go +++ b/rest_model_zrok/share.go @@ -45,8 +45,8 @@ type Share struct { // share mode ShareMode string `json:"shareMode,omitempty"` - // token - Token string `json:"token,omitempty"` + // share token + ShareToken string `json:"shareToken,omitempty"` // updated at UpdatedAt int64 `json:"updatedAt,omitempty"` diff --git a/rest_model_zrok/share_response.go b/rest_model_zrok/share_response.go index 9db6213a..82a632a7 100644 --- a/rest_model_zrok/share_response.go +++ b/rest_model_zrok/share_response.go @@ -20,8 +20,8 @@ type ShareResponse struct { // frontend proxy endpoints FrontendProxyEndpoints []string `json:"frontendProxyEndpoints"` - // shr token - ShrToken string `json:"shrToken,omitempty"` + // share token + ShareToken string `json:"shareToken,omitempty"` } // Validate validates this share response diff --git a/rest_server_zrok/embedded_spec.go b/rest_server_zrok/embedded_spec.go index e57ce0c4..24fba8dd 100644 --- a/rest_server_zrok/embedded_spec.go +++ b/rest_server_zrok/embedded_spec.go @@ -55,7 +55,7 @@ func init() { "envZId": { "type": "string" }, - "shrToken": { + "shareToken": { "type": "string" } } @@ -303,7 +303,7 @@ func init() { } } }, - "/detail/share/{shrToken}": { + "/detail/share/{shareToken}": { "get": { "security": [ { @@ -317,7 +317,7 @@ func init() { "parameters": [ { "type": "string", - "name": "shrToken", + "name": "shareToken", "in": "path", "required": true } @@ -732,7 +732,7 @@ func init() { "email": { "type": "string" }, - "invToken": { + "inviteToken": { "type": "string" } } @@ -1003,7 +1003,7 @@ func init() { } } }, - "/metrics/share/{shrToken}": { + "/metrics/share/{shareToken}": { "get": { "security": [ { @@ -1017,7 +1017,7 @@ func init() { "parameters": [ { "type": "string", - "name": "shrToken", + "name": "shareToken", "in": "path", "required": true }, @@ -1442,7 +1442,7 @@ func init() { "password": { "type": "string" }, - "regToken": { + "registerToken": { "type": "string" } } @@ -1626,7 +1626,7 @@ func init() { "type": "string" } }, - "shrToken": { + "shareToken": { "type": "string" } } @@ -1734,7 +1734,7 @@ func init() { "frontendToken": { "type": "string" }, - "shrToken": { + "shareToken": { "type": "string" } } @@ -1780,7 +1780,7 @@ func init() { "reserved": { "type": "boolean" }, - "shrToken": { + "shareToken": { "type": "string" } } @@ -1818,7 +1818,7 @@ func init() { "in": "body", "schema": { "properties": { - "registrationToken": { + "registerToken": { "type": "string" } } @@ -1958,7 +1958,7 @@ func init() { "id": { "type": "integer" }, - "shrToken": { + "shareToken": { "type": "string" }, "updatedAt": { @@ -2073,7 +2073,7 @@ func init() { "shareMode": { "type": "string" }, - "token": { + "shareToken": { "type": "string" }, "updatedAt": { @@ -2174,7 +2174,7 @@ func init() { "type": "string" } }, - "shrToken": { + "shareToken": { "type": "string" } } @@ -2252,7 +2252,7 @@ func init() { "envZId": { "type": "string" }, - "shrToken": { + "shareToken": { "type": "string" } } @@ -2500,7 +2500,7 @@ func init() { } } }, - "/detail/share/{shrToken}": { + "/detail/share/{shareToken}": { "get": { "security": [ { @@ -2514,7 +2514,7 @@ func init() { "parameters": [ { "type": "string", - "name": "shrToken", + "name": "shareToken", "in": "path", "required": true } @@ -2909,7 +2909,7 @@ func init() { "email": { "type": "string" }, - "invToken": { + "inviteToken": { "type": "string" } } @@ -3163,7 +3163,7 @@ func init() { } } }, - "/metrics/share/{shrToken}": { + "/metrics/share/{shareToken}": { "get": { "security": [ { @@ -3177,7 +3177,7 @@ func init() { "parameters": [ { "type": "string", - "name": "shrToken", + "name": "shareToken", "in": "path", "required": true }, @@ -3588,7 +3588,7 @@ func init() { "password": { "type": "string" }, - "regToken": { + "registerToken": { "type": "string" } } @@ -3772,7 +3772,7 @@ func init() { "type": "string" } }, - "shrToken": { + "shareToken": { "type": "string" } } @@ -3880,7 +3880,7 @@ func init() { "frontendToken": { "type": "string" }, - "shrToken": { + "shareToken": { "type": "string" } } @@ -3926,7 +3926,7 @@ func init() { "reserved": { "type": "boolean" }, - "shrToken": { + "shareToken": { "type": "string" } } @@ -3964,7 +3964,7 @@ func init() { "in": "body", "schema": { "properties": { - "registrationToken": { + "registerToken": { "type": "string" } } @@ -4160,7 +4160,7 @@ func init() { "id": { "type": "integer" }, - "shrToken": { + "shareToken": { "type": "string" }, "updatedAt": { @@ -4275,7 +4275,7 @@ func init() { "shareMode": { "type": "string" }, - "token": { + "shareToken": { "type": "string" }, "updatedAt": { @@ -4376,7 +4376,7 @@ func init() { "type": "string" } }, - "shrToken": { + "shareToken": { "type": "string" } } diff --git a/rest_server_zrok/operations/account/invite.go b/rest_server_zrok/operations/account/invite.go index ed8aaeca..04246f81 100644 --- a/rest_server_zrok/operations/account/invite.go +++ b/rest_server_zrok/operations/account/invite.go @@ -66,8 +66,8 @@ type InviteBody struct { // email Email string `json:"email,omitempty"` - // inv token - InvToken string `json:"invToken,omitempty"` + // invite token + InviteToken string `json:"inviteToken,omitempty"` } // Validate validates this invite body diff --git a/rest_server_zrok/operations/account/register.go b/rest_server_zrok/operations/account/register.go index aed75ed2..7262f413 100644 --- a/rest_server_zrok/operations/account/register.go +++ b/rest_server_zrok/operations/account/register.go @@ -66,8 +66,8 @@ type RegisterBody struct { // password Password string `json:"password,omitempty"` - // reg token - RegToken string `json:"regToken,omitempty"` + // register token + RegisterToken string `json:"registerToken,omitempty"` } // Validate validates this register body diff --git a/rest_server_zrok/operations/account/verify.go b/rest_server_zrok/operations/account/verify.go index 11696c85..45f63921 100644 --- a/rest_server_zrok/operations/account/verify.go +++ b/rest_server_zrok/operations/account/verify.go @@ -63,8 +63,8 @@ func (o *Verify) ServeHTTP(rw http.ResponseWriter, r *http.Request) { // swagger:model VerifyBody type VerifyBody struct { - // registration token - RegistrationToken string `json:"registrationToken,omitempty"` + // register token + RegisterToken string `json:"registerToken,omitempty"` } // Validate validates this verify body diff --git a/rest_server_zrok/operations/metadata/get_share_detail.go b/rest_server_zrok/operations/metadata/get_share_detail.go index f47d1979..57eaa1c8 100644 --- a/rest_server_zrok/operations/metadata/get_share_detail.go +++ b/rest_server_zrok/operations/metadata/get_share_detail.go @@ -32,7 +32,7 @@ func NewGetShareDetail(ctx *middleware.Context, handler GetShareDetailHandler) * } /* - GetShareDetail swagger:route GET /detail/share/{shrToken} metadata getShareDetail + GetShareDetail swagger:route GET /detail/share/{shareToken} metadata getShareDetail GetShareDetail get share detail API */ diff --git a/rest_server_zrok/operations/metadata/get_share_detail_parameters.go b/rest_server_zrok/operations/metadata/get_share_detail_parameters.go index 2d3f419f..8087b6c7 100644 --- a/rest_server_zrok/operations/metadata/get_share_detail_parameters.go +++ b/rest_server_zrok/operations/metadata/get_share_detail_parameters.go @@ -34,7 +34,7 @@ type GetShareDetailParams struct { Required: true In: path */ - ShrToken string + ShareToken string } // BindRequest both binds and validates a request, it assumes that complex things implement a Validatable(strfmt.Registry) error interface @@ -46,8 +46,8 @@ func (o *GetShareDetailParams) BindRequest(r *http.Request, route *middleware.Ma o.HTTPRequest = r - rShrToken, rhkShrToken, _ := route.Params.GetOK("shrToken") - if err := o.bindShrToken(rShrToken, rhkShrToken, route.Formats); err != nil { + rShareToken, rhkShareToken, _ := route.Params.GetOK("shareToken") + if err := o.bindShareToken(rShareToken, rhkShareToken, route.Formats); err != nil { res = append(res, err) } if len(res) > 0 { @@ -56,8 +56,8 @@ func (o *GetShareDetailParams) BindRequest(r *http.Request, route *middleware.Ma return nil } -// bindShrToken binds and validates parameter ShrToken from path. -func (o *GetShareDetailParams) bindShrToken(rawData []string, hasKey bool, formats strfmt.Registry) error { +// bindShareToken binds and validates parameter ShareToken from path. +func (o *GetShareDetailParams) bindShareToken(rawData []string, hasKey bool, formats strfmt.Registry) error { var raw string if len(rawData) > 0 { raw = rawData[len(rawData)-1] @@ -65,7 +65,7 @@ func (o *GetShareDetailParams) bindShrToken(rawData []string, hasKey bool, forma // Required: true // Parameter is provided by construction from the route - o.ShrToken = raw + o.ShareToken = raw return nil } diff --git a/rest_server_zrok/operations/metadata/get_share_detail_urlbuilder.go b/rest_server_zrok/operations/metadata/get_share_detail_urlbuilder.go index be3b1e5c..df81e744 100644 --- a/rest_server_zrok/operations/metadata/get_share_detail_urlbuilder.go +++ b/rest_server_zrok/operations/metadata/get_share_detail_urlbuilder.go @@ -14,7 +14,7 @@ import ( // GetShareDetailURL generates an URL for the get share detail operation type GetShareDetailURL struct { - ShrToken string + ShareToken string _basePath string // avoid unkeyed usage @@ -40,13 +40,13 @@ func (o *GetShareDetailURL) SetBasePath(bp string) { func (o *GetShareDetailURL) Build() (*url.URL, error) { var _result url.URL - var _path = "/detail/share/{shrToken}" + var _path = "/detail/share/{shareToken}" - shrToken := o.ShrToken - if shrToken != "" { - _path = strings.Replace(_path, "{shrToken}", shrToken, -1) + shareToken := o.ShareToken + if shareToken != "" { + _path = strings.Replace(_path, "{shareToken}", shareToken, -1) } else { - return nil, errors.New("shrToken is required on GetShareDetailURL") + return nil, errors.New("shareToken is required on GetShareDetailURL") } _basePath := o._basePath diff --git a/rest_server_zrok/operations/metadata/get_share_metrics.go b/rest_server_zrok/operations/metadata/get_share_metrics.go index db0b2055..c2f836a2 100644 --- a/rest_server_zrok/operations/metadata/get_share_metrics.go +++ b/rest_server_zrok/operations/metadata/get_share_metrics.go @@ -32,7 +32,7 @@ func NewGetShareMetrics(ctx *middleware.Context, handler GetShareMetricsHandler) } /* - GetShareMetrics swagger:route GET /metrics/share/{shrToken} metadata getShareMetrics + GetShareMetrics swagger:route GET /metrics/share/{shareToken} metadata getShareMetrics GetShareMetrics get share metrics API */ diff --git a/rest_server_zrok/operations/metadata/get_share_metrics_parameters.go b/rest_server_zrok/operations/metadata/get_share_metrics_parameters.go index f945c949..f6df1e71 100644 --- a/rest_server_zrok/operations/metadata/get_share_metrics_parameters.go +++ b/rest_server_zrok/operations/metadata/get_share_metrics_parameters.go @@ -39,7 +39,7 @@ type GetShareMetricsParams struct { Required: true In: path */ - ShrToken string + ShareToken string } // BindRequest both binds and validates a request, it assumes that complex things implement a Validatable(strfmt.Registry) error interface @@ -58,8 +58,8 @@ func (o *GetShareMetricsParams) BindRequest(r *http.Request, route *middleware.M res = append(res, err) } - rShrToken, rhkShrToken, _ := route.Params.GetOK("shrToken") - if err := o.bindShrToken(rShrToken, rhkShrToken, route.Formats); err != nil { + rShareToken, rhkShareToken, _ := route.Params.GetOK("shareToken") + if err := o.bindShareToken(rShareToken, rhkShareToken, route.Formats); err != nil { res = append(res, err) } if len(res) > 0 { @@ -86,8 +86,8 @@ func (o *GetShareMetricsParams) bindDuration(rawData []string, hasKey bool, form return nil } -// bindShrToken binds and validates parameter ShrToken from path. -func (o *GetShareMetricsParams) bindShrToken(rawData []string, hasKey bool, formats strfmt.Registry) error { +// bindShareToken binds and validates parameter ShareToken from path. +func (o *GetShareMetricsParams) bindShareToken(rawData []string, hasKey bool, formats strfmt.Registry) error { var raw string if len(rawData) > 0 { raw = rawData[len(rawData)-1] @@ -95,7 +95,7 @@ func (o *GetShareMetricsParams) bindShrToken(rawData []string, hasKey bool, form // Required: true // Parameter is provided by construction from the route - o.ShrToken = raw + o.ShareToken = raw return nil } diff --git a/rest_server_zrok/operations/metadata/get_share_metrics_urlbuilder.go b/rest_server_zrok/operations/metadata/get_share_metrics_urlbuilder.go index 74258138..a393c2b6 100644 --- a/rest_server_zrok/operations/metadata/get_share_metrics_urlbuilder.go +++ b/rest_server_zrok/operations/metadata/get_share_metrics_urlbuilder.go @@ -14,7 +14,7 @@ import ( // GetShareMetricsURL generates an URL for the get share metrics operation type GetShareMetricsURL struct { - ShrToken string + ShareToken string Duration *string @@ -42,13 +42,13 @@ func (o *GetShareMetricsURL) SetBasePath(bp string) { func (o *GetShareMetricsURL) Build() (*url.URL, error) { var _result url.URL - var _path = "/metrics/share/{shrToken}" + var _path = "/metrics/share/{shareToken}" - shrToken := o.ShrToken - if shrToken != "" { - _path = strings.Replace(_path, "{shrToken}", shrToken, -1) + shareToken := o.ShareToken + if shareToken != "" { + _path = strings.Replace(_path, "{shareToken}", shareToken, -1) } else { - return nil, errors.New("shrToken is required on GetShareMetricsURL") + return nil, errors.New("shareToken is required on GetShareMetricsURL") } _basePath := o._basePath diff --git a/rest_server_zrok/operations/share/access.go b/rest_server_zrok/operations/share/access.go index 43bd9fe1..be5e343d 100644 --- a/rest_server_zrok/operations/share/access.go +++ b/rest_server_zrok/operations/share/access.go @@ -81,8 +81,8 @@ type AccessBody struct { // env z Id EnvZID string `json:"envZId,omitempty"` - // shr token - ShrToken string `json:"shrToken,omitempty"` + // share token + ShareToken string `json:"shareToken,omitempty"` } // Validate validates this access body diff --git a/rest_server_zrok/operations/share/unaccess.go b/rest_server_zrok/operations/share/unaccess.go index 329ac32f..f7c677f4 100644 --- a/rest_server_zrok/operations/share/unaccess.go +++ b/rest_server_zrok/operations/share/unaccess.go @@ -84,8 +84,8 @@ type UnaccessBody struct { // frontend token FrontendToken string `json:"frontendToken,omitempty"` - // shr token - ShrToken string `json:"shrToken,omitempty"` + // share token + ShareToken string `json:"shareToken,omitempty"` } // Validate validates this unaccess body diff --git a/rest_server_zrok/operations/share/unshare.go b/rest_server_zrok/operations/share/unshare.go index 292dcf3c..5d0a3667 100644 --- a/rest_server_zrok/operations/share/unshare.go +++ b/rest_server_zrok/operations/share/unshare.go @@ -84,8 +84,8 @@ type UnshareBody struct { // reserved Reserved bool `json:"reserved,omitempty"` - // shr token - ShrToken string `json:"shrToken,omitempty"` + // share token + ShareToken string `json:"shareToken,omitempty"` } // Validate validates this unshare body diff --git a/rest_server_zrok/operations/share/update_share.go b/rest_server_zrok/operations/share/update_share.go index bee14a65..554938a6 100644 --- a/rest_server_zrok/operations/share/update_share.go +++ b/rest_server_zrok/operations/share/update_share.go @@ -87,8 +87,8 @@ type UpdateShareBody struct { // remove access grants RemoveAccessGrants []string `json:"removeAccessGrants"` - // shr token - ShrToken string `json:"shrToken,omitempty"` + // share token + ShareToken string `json:"shareToken,omitempty"` } // Validate validates this update share body diff --git a/rest_server_zrok/operations/zrok_api.go b/rest_server_zrok/operations/zrok_api.go index 306186be..a28ef2be 100644 --- a/rest_server_zrok/operations/zrok_api.go +++ b/rest_server_zrok/operations/zrok_api.go @@ -694,11 +694,11 @@ func (o *ZrokAPI) initHandlerCache() { if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/detail/share/{shrToken}"] = metadata.NewGetShareDetail(o.context, o.MetadataGetShareDetailHandler) + o.handlers["GET"]["/detail/share/{shareToken}"] = metadata.NewGetShareDetail(o.context, o.MetadataGetShareDetailHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/metrics/share/{shrToken}"] = metadata.NewGetShareMetrics(o.context, o.MetadataGetShareMetricsHandler) + o.handlers["GET"]["/metrics/share/{shareToken}"] = metadata.NewGetShareMetrics(o.context, o.MetadataGetShareMetricsHandler) if o.handlers["POST"] == nil { o.handlers["POST"] = make(map[string]http.Handler) } diff --git a/sdk/golang/sdk/access.go b/sdk/golang/sdk/access.go index 9e06db94..56c1c2df 100644 --- a/sdk/golang/sdk/access.go +++ b/sdk/golang/sdk/access.go @@ -13,7 +13,7 @@ func CreateAccess(root env_core.Root, request *AccessRequest) (*Access, error) { } out := share.NewAccessParams() - out.Body.ShrToken = request.ShareToken + out.Body.ShareToken = request.ShareToken out.Body.EnvZID = root.Environment().ZitiIdentity zrok, err := root.Client() @@ -33,7 +33,7 @@ func CreateAccess(root env_core.Root, request *AccessRequest) (*Access, error) { func DeleteAccess(root env_core.Root, acc *Access) error { out := share.NewUnaccessParams() out.Body.FrontendToken = acc.Token - out.Body.ShrToken = acc.ShareToken + out.Body.ShareToken = acc.ShareToken out.Body.EnvZID = root.Environment().ZitiIdentity zrok, err := root.Client() diff --git a/sdk/golang/sdk/share.go b/sdk/golang/sdk/share.go index 22e22d06..4184c413 100644 --- a/sdk/golang/sdk/share.go +++ b/sdk/golang/sdk/share.go @@ -58,7 +58,7 @@ func CreateShare(root env_core.Root, request *ShareRequest) (*Share, error) { } return &Share{ - Token: in.Payload.ShrToken, + Token: in.Payload.ShareToken, FrontendEndpoints: in.Payload.FrontendProxyEndpoints, }, nil } @@ -98,7 +98,7 @@ func newPublicShare(root env_core.Root, request *ShareRequest) *share.ShareParam func DeleteShare(root env_core.Root, shr *Share) error { req := share.NewUnshareParams() req.Body.EnvZID = root.Environment().ZitiIdentity - req.Body.ShrToken = shr.Token + req.Body.ShareToken = shr.Token zrok, err := root.Client() if err != nil { diff --git a/sdk/nodejs/sdk/src/zrok/api/api/metadataApi.ts b/sdk/nodejs/sdk/src/zrok/api/api/metadataApi.ts index b949d857..d28ed27e 100644 --- a/sdk/nodejs/sdk/src/zrok/api/api/metadataApi.ts +++ b/sdk/nodejs/sdk/src/zrok/api/api/metadataApi.ts @@ -513,11 +513,11 @@ export class MetadataApi { } /** * - * @param shrToken + * @param shareToken */ - public async getShareDetail (shrToken: string, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.IncomingMessage; body: Share; }> { - const localVarPath = this.basePath + '/detail/share/{shrToken}' - .replace('{' + 'shrToken' + '}', encodeURIComponent(String(shrToken))); + public async getShareDetail (shareToken: string, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.IncomingMessage; body: Share; }> { + const localVarPath = this.basePath + '/detail/share/{shareToken}' + .replace('{' + 'shareToken' + '}', encodeURIComponent(String(shareToken))); let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this._defaultHeaders); const produces = ['application/zrok.v1+json']; @@ -529,9 +529,9 @@ export class MetadataApi { } let localVarFormParams: any = {}; - // verify required parameter 'shrToken' is not null or undefined - if (shrToken === null || shrToken === undefined) { - throw new Error('Required parameter shrToken was null or undefined when calling getShareDetail.'); + // verify required parameter 'shareToken' is not null or undefined + if (shareToken === null || shareToken === undefined) { + throw new Error('Required parameter shareToken was null or undefined when calling getShareDetail.'); } (Object).assign(localVarHeaderParams, options.headers); @@ -584,12 +584,12 @@ export class MetadataApi { } /** * - * @param shrToken + * @param shareToken * @param duration */ - public async getShareMetrics (shrToken: string, duration?: string, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.IncomingMessage; body: Metrics; }> { - const localVarPath = this.basePath + '/metrics/share/{shrToken}' - .replace('{' + 'shrToken' + '}', encodeURIComponent(String(shrToken))); + public async getShareMetrics (shareToken: string, duration?: string, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.IncomingMessage; body: Metrics; }> { + const localVarPath = this.basePath + '/metrics/share/{shareToken}' + .replace('{' + 'shareToken' + '}', encodeURIComponent(String(shareToken))); let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this._defaultHeaders); const produces = ['application/zrok.v1+json']; @@ -601,9 +601,9 @@ export class MetadataApi { } let localVarFormParams: any = {}; - // verify required parameter 'shrToken' is not null or undefined - if (shrToken === null || shrToken === undefined) { - throw new Error('Required parameter shrToken was null or undefined when calling getShareMetrics.'); + // verify required parameter 'shareToken' is not null or undefined + if (shareToken === null || shareToken === undefined) { + throw new Error('Required parameter shareToken was null or undefined when calling getShareMetrics.'); } if (duration !== undefined) { diff --git a/sdk/nodejs/sdk/src/zrok/api/model/accessRequest.ts b/sdk/nodejs/sdk/src/zrok/api/model/accessRequest.ts index 9c632631..efa820b6 100644 --- a/sdk/nodejs/sdk/src/zrok/api/model/accessRequest.ts +++ b/sdk/nodejs/sdk/src/zrok/api/model/accessRequest.ts @@ -14,7 +14,7 @@ import { RequestFile } from './models'; export class AccessRequest { 'envZId'?: string; - 'shrToken'?: string; + 'shareToken'?: string; static discriminator: string | undefined = undefined; @@ -25,8 +25,8 @@ export class AccessRequest { "type": "string" }, { - "name": "shrToken", - "baseName": "shrToken", + "name": "shareToken", + "baseName": "shareToken", "type": "string" } ]; diff --git a/sdk/nodejs/sdk/src/zrok/api/model/frontend.ts b/sdk/nodejs/sdk/src/zrok/api/model/frontend.ts index 0b94d65a..f3a09442 100644 --- a/sdk/nodejs/sdk/src/zrok/api/model/frontend.ts +++ b/sdk/nodejs/sdk/src/zrok/api/model/frontend.ts @@ -15,7 +15,7 @@ import { RequestFile } from './models'; export class Frontend { 'id'?: number; 'feToken'?: string; - 'shrToken'?: string; + 'shareToken'?: string; 'zId'?: string; 'createdAt'?: number; 'updatedAt'?: number; @@ -34,8 +34,8 @@ export class Frontend { "type": "string" }, { - "name": "shrToken", - "baseName": "shrToken", + "name": "shareToken", + "baseName": "shareToken", "type": "string" }, { diff --git a/sdk/nodejs/sdk/src/zrok/api/model/inviteRequest.ts b/sdk/nodejs/sdk/src/zrok/api/model/inviteRequest.ts index 42c54f87..5776ab04 100644 --- a/sdk/nodejs/sdk/src/zrok/api/model/inviteRequest.ts +++ b/sdk/nodejs/sdk/src/zrok/api/model/inviteRequest.ts @@ -14,7 +14,7 @@ import { RequestFile } from './models'; export class InviteRequest { 'email'?: string; - 'invToken'?: string; + 'inviteToken'?: string; static discriminator: string | undefined = undefined; @@ -25,8 +25,8 @@ export class InviteRequest { "type": "string" }, { - "name": "invToken", - "baseName": "invToken", + "name": "inviteToken", + "baseName": "inviteToken", "type": "string" } ]; diff --git a/sdk/nodejs/sdk/src/zrok/api/model/registerRequest.ts b/sdk/nodejs/sdk/src/zrok/api/model/registerRequest.ts index d6cf6ecd..276123eb 100644 --- a/sdk/nodejs/sdk/src/zrok/api/model/registerRequest.ts +++ b/sdk/nodejs/sdk/src/zrok/api/model/registerRequest.ts @@ -13,15 +13,15 @@ import { RequestFile } from './models'; export class RegisterRequest { - 'regToken'?: string; + 'registerToken'?: string; 'password'?: string; static discriminator: string | undefined = undefined; static attributeTypeMap: Array<{name: string, baseName: string, type: string}> = [ { - "name": "regToken", - "baseName": "regToken", + "name": "registerToken", + "baseName": "registerToken", "type": "string" }, { diff --git a/sdk/nodejs/sdk/src/zrok/api/model/share.ts b/sdk/nodejs/sdk/src/zrok/api/model/share.ts index 4113ea1f..bf4ffa9e 100644 --- a/sdk/nodejs/sdk/src/zrok/api/model/share.ts +++ b/sdk/nodejs/sdk/src/zrok/api/model/share.ts @@ -14,7 +14,7 @@ import { RequestFile } from './models'; import { SparkDataSample } from './sparkDataSample'; export class Share { - 'token'?: string; + 'shareToken'?: string; 'zId'?: string; 'shareMode'?: string; 'backendMode'?: string; @@ -31,8 +31,8 @@ export class Share { static attributeTypeMap: Array<{name: string, baseName: string, type: string}> = [ { - "name": "token", - "baseName": "token", + "name": "shareToken", + "baseName": "shareToken", "type": "string" }, { diff --git a/sdk/nodejs/sdk/src/zrok/api/model/shareResponse.ts b/sdk/nodejs/sdk/src/zrok/api/model/shareResponse.ts index f099ef23..e5821d11 100644 --- a/sdk/nodejs/sdk/src/zrok/api/model/shareResponse.ts +++ b/sdk/nodejs/sdk/src/zrok/api/model/shareResponse.ts @@ -14,7 +14,7 @@ import { RequestFile } from './models'; export class ShareResponse { 'frontendProxyEndpoints'?: Array; - 'shrToken'?: string; + 'shareToken'?: string; static discriminator: string | undefined = undefined; @@ -25,8 +25,8 @@ export class ShareResponse { "type": "Array" }, { - "name": "shrToken", - "baseName": "shrToken", + "name": "shareToken", + "baseName": "shareToken", "type": "string" } ]; diff --git a/sdk/nodejs/sdk/src/zrok/api/model/unaccessRequest.ts b/sdk/nodejs/sdk/src/zrok/api/model/unaccessRequest.ts index 11beb921..8404fc4e 100644 --- a/sdk/nodejs/sdk/src/zrok/api/model/unaccessRequest.ts +++ b/sdk/nodejs/sdk/src/zrok/api/model/unaccessRequest.ts @@ -15,7 +15,7 @@ import { RequestFile } from './models'; export class UnaccessRequest { 'frontendToken'?: string; 'envZId'?: string; - 'shrToken'?: string; + 'shareToken'?: string; static discriminator: string | undefined = undefined; @@ -31,8 +31,8 @@ export class UnaccessRequest { "type": "string" }, { - "name": "shrToken", - "baseName": "shrToken", + "name": "shareToken", + "baseName": "shareToken", "type": "string" } ]; diff --git a/sdk/nodejs/sdk/src/zrok/api/model/unshareRequest.ts b/sdk/nodejs/sdk/src/zrok/api/model/unshareRequest.ts index 16485d21..91983732 100644 --- a/sdk/nodejs/sdk/src/zrok/api/model/unshareRequest.ts +++ b/sdk/nodejs/sdk/src/zrok/api/model/unshareRequest.ts @@ -14,7 +14,7 @@ import { RequestFile } from './models'; export class UnshareRequest { 'envZId'?: string; - 'shrToken'?: string; + 'shareToken'?: string; 'reserved'?: boolean; static discriminator: string | undefined = undefined; @@ -26,8 +26,8 @@ export class UnshareRequest { "type": "string" }, { - "name": "shrToken", - "baseName": "shrToken", + "name": "shareToken", + "baseName": "shareToken", "type": "string" }, { diff --git a/sdk/nodejs/sdk/src/zrok/api/model/updateShareRequest.ts b/sdk/nodejs/sdk/src/zrok/api/model/updateShareRequest.ts index 554971b5..cc43f1c7 100644 --- a/sdk/nodejs/sdk/src/zrok/api/model/updateShareRequest.ts +++ b/sdk/nodejs/sdk/src/zrok/api/model/updateShareRequest.ts @@ -13,7 +13,7 @@ import { RequestFile } from './models'; export class UpdateShareRequest { - 'shrToken'?: string; + 'shareToken'?: string; 'backendProxyEndpoint'?: string; 'addAccessGrants'?: Array; 'removeAccessGrants'?: Array; @@ -22,8 +22,8 @@ export class UpdateShareRequest { static attributeTypeMap: Array<{name: string, baseName: string, type: string}> = [ { - "name": "shrToken", - "baseName": "shrToken", + "name": "shareToken", + "baseName": "shareToken", "type": "string" }, { diff --git a/sdk/nodejs/sdk/src/zrok/api/model/verifyRequest.ts b/sdk/nodejs/sdk/src/zrok/api/model/verifyRequest.ts index c051d013..413e7c5b 100644 --- a/sdk/nodejs/sdk/src/zrok/api/model/verifyRequest.ts +++ b/sdk/nodejs/sdk/src/zrok/api/model/verifyRequest.ts @@ -13,14 +13,14 @@ import { RequestFile } from './models'; export class VerifyRequest { - 'registrationToken'?: string; + 'registerToken'?: string; static discriminator: string | undefined = undefined; static attributeTypeMap: Array<{name: string, baseName: string, type: string}> = [ { - "name": "registrationToken", - "baseName": "registrationToken", + "name": "registerToken", + "baseName": "registerToken", "type": "string" } ]; diff --git a/sdk/python/sdk/zrok/README.md b/sdk/python/sdk/zrok/README.md index 7c44b87a..1dae54c0 100644 --- a/sdk/python/sdk/zrok/README.md +++ b/sdk/python/sdk/zrok/README.md @@ -176,8 +176,8 @@ Class | Method | HTTP request | Description *MetadataApi* | [**get_environment_detail**](docs/MetadataApi.md#get_environment_detail) | **GET** /detail/environment/{envZId} | *MetadataApi* | [**get_environment_metrics**](docs/MetadataApi.md#get_environment_metrics) | **GET** /metrics/environment/{envId} | *MetadataApi* | [**get_frontend_detail**](docs/MetadataApi.md#get_frontend_detail) | **GET** /detail/frontend/{feId} | -*MetadataApi* | [**get_share_detail**](docs/MetadataApi.md#get_share_detail) | **GET** /detail/share/{shrToken} | -*MetadataApi* | [**get_share_metrics**](docs/MetadataApi.md#get_share_metrics) | **GET** /metrics/share/{shrToken} | +*MetadataApi* | [**get_share_detail**](docs/MetadataApi.md#get_share_detail) | **GET** /detail/share/{shareToken} | +*MetadataApi* | [**get_share_metrics**](docs/MetadataApi.md#get_share_metrics) | **GET** /metrics/share/{shareToken} | *MetadataApi* | [**get_sparklines**](docs/MetadataApi.md#get_sparklines) | **POST** /sparklines | *MetadataApi* | [**list_memberships**](docs/MetadataApi.md#list_memberships) | **GET** /memberships | *MetadataApi* | [**list_org_members**](docs/MetadataApi.md#list_org_members) | **GET** /members/{organizationToken} | diff --git a/sdk/python/sdk/zrok/docs/AccessBody.md b/sdk/python/sdk/zrok/docs/AccessBody.md index 66deac46..d5546bf3 100644 --- a/sdk/python/sdk/zrok/docs/AccessBody.md +++ b/sdk/python/sdk/zrok/docs/AccessBody.md @@ -4,7 +4,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **env_zid** | **str** | | [optional] -**shr_token** | **str** | | [optional] +**share_token** | **str** | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/sdk/python/sdk/zrok/docs/Frontend.md b/sdk/python/sdk/zrok/docs/Frontend.md index 386e480a..fb3f9754 100644 --- a/sdk/python/sdk/zrok/docs/Frontend.md +++ b/sdk/python/sdk/zrok/docs/Frontend.md @@ -5,7 +5,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **id** | **int** | | [optional] **fe_token** | **str** | | [optional] -**shr_token** | **str** | | [optional] +**share_token** | **str** | | [optional] **z_id** | **str** | | [optional] **created_at** | **int** | | [optional] **updated_at** | **int** | | [optional] diff --git a/sdk/python/sdk/zrok/docs/InviteBody.md b/sdk/python/sdk/zrok/docs/InviteBody.md index a7359008..0fb2fcb0 100644 --- a/sdk/python/sdk/zrok/docs/InviteBody.md +++ b/sdk/python/sdk/zrok/docs/InviteBody.md @@ -4,7 +4,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **email** | **str** | | [optional] -**inv_token** | **str** | | [optional] +**invite_token** | **str** | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/sdk/python/sdk/zrok/docs/MetadataApi.md b/sdk/python/sdk/zrok/docs/MetadataApi.md index a6a9bdfc..aceb144e 100644 --- a/sdk/python/sdk/zrok/docs/MetadataApi.md +++ b/sdk/python/sdk/zrok/docs/MetadataApi.md @@ -10,8 +10,8 @@ Method | HTTP request | Description [**get_environment_detail**](MetadataApi.md#get_environment_detail) | **GET** /detail/environment/{envZId} | [**get_environment_metrics**](MetadataApi.md#get_environment_metrics) | **GET** /metrics/environment/{envId} | [**get_frontend_detail**](MetadataApi.md#get_frontend_detail) | **GET** /detail/frontend/{feId} | -[**get_share_detail**](MetadataApi.md#get_share_detail) | **GET** /detail/share/{shrToken} | -[**get_share_metrics**](MetadataApi.md#get_share_metrics) | **GET** /metrics/share/{shrToken} | +[**get_share_detail**](MetadataApi.md#get_share_detail) | **GET** /detail/share/{shareToken} | +[**get_share_metrics**](MetadataApi.md#get_share_metrics) | **GET** /metrics/share/{shareToken} | [**get_sparklines**](MetadataApi.md#get_sparklines) | **POST** /sparklines | [**list_memberships**](MetadataApi.md#list_memberships) | **GET** /memberships | [**list_org_members**](MetadataApi.md#list_org_members) | **GET** /members/{organizationToken} | @@ -314,7 +314,7 @@ Name | Type | Description | Notes [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **get_share_detail** -> Share get_share_detail(shr_token) +> Share get_share_detail(share_token) @@ -334,10 +334,10 @@ configuration.api_key['x-token'] = 'YOUR_API_KEY' # create an instance of the API class api_instance = zrok_api.MetadataApi(zrok_api.ApiClient(configuration)) -shr_token = 'shr_token_example' # str | +share_token = 'share_token_example' # str | try: - api_response = api_instance.get_share_detail(shr_token) + api_response = api_instance.get_share_detail(share_token) pprint(api_response) except ApiException as e: print("Exception when calling MetadataApi->get_share_detail: %s\n" % e) @@ -347,7 +347,7 @@ except ApiException as e: Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **shr_token** | **str**| | + **share_token** | **str**| | ### Return type @@ -365,7 +365,7 @@ Name | Type | Description | Notes [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **get_share_metrics** -> Metrics get_share_metrics(shr_token, duration=duration) +> Metrics get_share_metrics(share_token, duration=duration) @@ -385,11 +385,11 @@ configuration.api_key['x-token'] = 'YOUR_API_KEY' # create an instance of the API class api_instance = zrok_api.MetadataApi(zrok_api.ApiClient(configuration)) -shr_token = 'shr_token_example' # str | +share_token = 'share_token_example' # str | duration = 'duration_example' # str | (optional) try: - api_response = api_instance.get_share_metrics(shr_token, duration=duration) + api_response = api_instance.get_share_metrics(share_token, duration=duration) pprint(api_response) except ApiException as e: print("Exception when calling MetadataApi->get_share_metrics: %s\n" % e) @@ -399,7 +399,7 @@ except ApiException as e: Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **shr_token** | **str**| | + **share_token** | **str**| | **duration** | **str**| | [optional] ### Return type diff --git a/sdk/python/sdk/zrok/docs/RegisterBody.md b/sdk/python/sdk/zrok/docs/RegisterBody.md index 66b17771..0adc3fc8 100644 --- a/sdk/python/sdk/zrok/docs/RegisterBody.md +++ b/sdk/python/sdk/zrok/docs/RegisterBody.md @@ -3,7 +3,7 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**reg_token** | **str** | | [optional] +**register_token** | **str** | | [optional] **password** | **str** | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/sdk/python/sdk/zrok/docs/Share.md b/sdk/python/sdk/zrok/docs/Share.md index f8849edb..8a5d67ab 100644 --- a/sdk/python/sdk/zrok/docs/Share.md +++ b/sdk/python/sdk/zrok/docs/Share.md @@ -3,7 +3,7 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**token** | **str** | | [optional] +**share_token** | **str** | | [optional] **z_id** | **str** | | [optional] **share_mode** | **str** | | [optional] **backend_mode** | **str** | | [optional] diff --git a/sdk/python/sdk/zrok/docs/ShareBody.md b/sdk/python/sdk/zrok/docs/ShareBody.md index 33adc695..4c01d818 100644 --- a/sdk/python/sdk/zrok/docs/ShareBody.md +++ b/sdk/python/sdk/zrok/docs/ShareBody.md @@ -3,7 +3,7 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**shr_token** | **str** | | [optional] +**share_token** | **str** | | [optional] **backend_proxy_endpoint** | **str** | | [optional] **add_access_grants** | **list[str]** | | [optional] **remove_access_grants** | **list[str]** | | [optional] diff --git a/sdk/python/sdk/zrok/docs/ShareResponse.md b/sdk/python/sdk/zrok/docs/ShareResponse.md index 04850e66..f6d09e89 100644 --- a/sdk/python/sdk/zrok/docs/ShareResponse.md +++ b/sdk/python/sdk/zrok/docs/ShareResponse.md @@ -4,7 +4,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **frontend_proxy_endpoints** | **list[str]** | | [optional] -**shr_token** | **str** | | [optional] +**share_token** | **str** | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/sdk/python/sdk/zrok/docs/UnaccessBody.md b/sdk/python/sdk/zrok/docs/UnaccessBody.md index bc7e4159..d3bcdfbe 100644 --- a/sdk/python/sdk/zrok/docs/UnaccessBody.md +++ b/sdk/python/sdk/zrok/docs/UnaccessBody.md @@ -5,7 +5,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **frontend_token** | **str** | | [optional] **env_zid** | **str** | | [optional] -**shr_token** | **str** | | [optional] +**share_token** | **str** | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/sdk/python/sdk/zrok/docs/UnshareBody.md b/sdk/python/sdk/zrok/docs/UnshareBody.md index d488bf9c..ec7c4dd1 100644 --- a/sdk/python/sdk/zrok/docs/UnshareBody.md +++ b/sdk/python/sdk/zrok/docs/UnshareBody.md @@ -4,7 +4,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **env_zid** | **str** | | [optional] -**shr_token** | **str** | | [optional] +**share_token** | **str** | | [optional] **reserved** | **bool** | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/sdk/python/sdk/zrok/docs/VerifyBody.md b/sdk/python/sdk/zrok/docs/VerifyBody.md index ace3611b..993e6a34 100644 --- a/sdk/python/sdk/zrok/docs/VerifyBody.md +++ b/sdk/python/sdk/zrok/docs/VerifyBody.md @@ -3,7 +3,7 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**registration_token** | **str** | | [optional] +**register_token** | **str** | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/sdk/python/sdk/zrok/zrok_api/api/metadata_api.py b/sdk/python/sdk/zrok/zrok_api/api/metadata_api.py index 9e784ed9..499c9e26 100644 --- a/sdk/python/sdk/zrok/zrok_api/api/metadata_api.py +++ b/sdk/python/sdk/zrok/zrok_api/api/metadata_api.py @@ -574,43 +574,43 @@ class MetadataApi(object): _request_timeout=params.get('_request_timeout'), collection_formats=collection_formats) - def get_share_detail(self, shr_token, **kwargs): # noqa: E501 + def get_share_detail(self, share_token, **kwargs): # noqa: E501 """get_share_detail # noqa: E501 This method makes a synchronous HTTP request by default. To make an asynchronous HTTP request, please pass async_req=True - >>> thread = api.get_share_detail(shr_token, async_req=True) + >>> thread = api.get_share_detail(share_token, async_req=True) >>> result = thread.get() :param async_req bool - :param str shr_token: (required) + :param str share_token: (required) :return: Share If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True if kwargs.get('async_req'): - return self.get_share_detail_with_http_info(shr_token, **kwargs) # noqa: E501 + return self.get_share_detail_with_http_info(share_token, **kwargs) # noqa: E501 else: - (data) = self.get_share_detail_with_http_info(shr_token, **kwargs) # noqa: E501 + (data) = self.get_share_detail_with_http_info(share_token, **kwargs) # noqa: E501 return data - def get_share_detail_with_http_info(self, shr_token, **kwargs): # noqa: E501 + def get_share_detail_with_http_info(self, share_token, **kwargs): # noqa: E501 """get_share_detail # noqa: E501 This method makes a synchronous HTTP request by default. To make an asynchronous HTTP request, please pass async_req=True - >>> thread = api.get_share_detail_with_http_info(shr_token, async_req=True) + >>> thread = api.get_share_detail_with_http_info(share_token, async_req=True) >>> result = thread.get() :param async_req bool - :param str shr_token: (required) + :param str share_token: (required) :return: Share If the method is called asynchronously, returns the request thread. """ - all_params = ['shr_token'] # noqa: E501 + all_params = ['share_token'] # noqa: E501 all_params.append('async_req') all_params.append('_return_http_data_only') all_params.append('_preload_content') @@ -625,16 +625,16 @@ class MetadataApi(object): ) params[key] = val del params['kwargs'] - # verify the required parameter 'shr_token' is set - if ('shr_token' not in params or - params['shr_token'] is None): - raise ValueError("Missing the required parameter `shr_token` when calling `get_share_detail`") # noqa: E501 + # verify the required parameter 'share_token' is set + if ('share_token' not in params or + params['share_token'] is None): + raise ValueError("Missing the required parameter `share_token` when calling `get_share_detail`") # noqa: E501 collection_formats = {} path_params = {} - if 'shr_token' in params: - path_params['shrToken'] = params['shr_token'] # noqa: E501 + if 'share_token' in params: + path_params['shareToken'] = params['share_token'] # noqa: E501 query_params = [] @@ -652,7 +652,7 @@ class MetadataApi(object): auth_settings = ['key'] # noqa: E501 return self.api_client.call_api( - '/detail/share/{shrToken}', 'GET', + '/detail/share/{shareToken}', 'GET', path_params, query_params, header_params, @@ -667,16 +667,16 @@ class MetadataApi(object): _request_timeout=params.get('_request_timeout'), collection_formats=collection_formats) - def get_share_metrics(self, shr_token, **kwargs): # noqa: E501 + def get_share_metrics(self, share_token, **kwargs): # noqa: E501 """get_share_metrics # noqa: E501 This method makes a synchronous HTTP request by default. To make an asynchronous HTTP request, please pass async_req=True - >>> thread = api.get_share_metrics(shr_token, async_req=True) + >>> thread = api.get_share_metrics(share_token, async_req=True) >>> result = thread.get() :param async_req bool - :param str shr_token: (required) + :param str share_token: (required) :param str duration: :return: Metrics If the method is called asynchronously, @@ -684,28 +684,28 @@ class MetadataApi(object): """ kwargs['_return_http_data_only'] = True if kwargs.get('async_req'): - return self.get_share_metrics_with_http_info(shr_token, **kwargs) # noqa: E501 + return self.get_share_metrics_with_http_info(share_token, **kwargs) # noqa: E501 else: - (data) = self.get_share_metrics_with_http_info(shr_token, **kwargs) # noqa: E501 + (data) = self.get_share_metrics_with_http_info(share_token, **kwargs) # noqa: E501 return data - def get_share_metrics_with_http_info(self, shr_token, **kwargs): # noqa: E501 + def get_share_metrics_with_http_info(self, share_token, **kwargs): # noqa: E501 """get_share_metrics # noqa: E501 This method makes a synchronous HTTP request by default. To make an asynchronous HTTP request, please pass async_req=True - >>> thread = api.get_share_metrics_with_http_info(shr_token, async_req=True) + >>> thread = api.get_share_metrics_with_http_info(share_token, async_req=True) >>> result = thread.get() :param async_req bool - :param str shr_token: (required) + :param str share_token: (required) :param str duration: :return: Metrics If the method is called asynchronously, returns the request thread. """ - all_params = ['shr_token', 'duration'] # noqa: E501 + all_params = ['share_token', 'duration'] # noqa: E501 all_params.append('async_req') all_params.append('_return_http_data_only') all_params.append('_preload_content') @@ -720,16 +720,16 @@ class MetadataApi(object): ) params[key] = val del params['kwargs'] - # verify the required parameter 'shr_token' is set - if ('shr_token' not in params or - params['shr_token'] is None): - raise ValueError("Missing the required parameter `shr_token` when calling `get_share_metrics`") # noqa: E501 + # verify the required parameter 'share_token' is set + if ('share_token' not in params or + params['share_token'] is None): + raise ValueError("Missing the required parameter `share_token` when calling `get_share_metrics`") # noqa: E501 collection_formats = {} path_params = {} - if 'shr_token' in params: - path_params['shrToken'] = params['shr_token'] # noqa: E501 + if 'share_token' in params: + path_params['shareToken'] = params['share_token'] # noqa: E501 query_params = [] if 'duration' in params: @@ -749,7 +749,7 @@ class MetadataApi(object): auth_settings = ['key'] # noqa: E501 return self.api_client.call_api( - '/metrics/share/{shrToken}', 'GET', + '/metrics/share/{shareToken}', 'GET', path_params, query_params, header_params, diff --git a/sdk/python/sdk/zrok/zrok_api/models/access_body.py b/sdk/python/sdk/zrok/zrok_api/models/access_body.py index 5c345c7f..3c213723 100644 --- a/sdk/python/sdk/zrok/zrok_api/models/access_body.py +++ b/sdk/python/sdk/zrok/zrok_api/models/access_body.py @@ -29,23 +29,23 @@ class AccessBody(object): """ swagger_types = { 'env_zid': 'str', - 'shr_token': 'str' + 'share_token': 'str' } attribute_map = { 'env_zid': 'envZId', - 'shr_token': 'shrToken' + 'share_token': 'shareToken' } - def __init__(self, env_zid=None, shr_token=None): # noqa: E501 + def __init__(self, env_zid=None, share_token=None): # noqa: E501 """AccessBody - a model defined in Swagger""" # noqa: E501 self._env_zid = None - self._shr_token = None + self._share_token = None self.discriminator = None if env_zid is not None: self.env_zid = env_zid - if shr_token is not None: - self.shr_token = shr_token + if share_token is not None: + self.share_token = share_token @property def env_zid(self): @@ -69,25 +69,25 @@ class AccessBody(object): self._env_zid = env_zid @property - def shr_token(self): - """Gets the shr_token of this AccessBody. # noqa: E501 + def share_token(self): + """Gets the share_token of this AccessBody. # noqa: E501 - :return: The shr_token of this AccessBody. # noqa: E501 + :return: The share_token of this AccessBody. # noqa: E501 :rtype: str """ - return self._shr_token + return self._share_token - @shr_token.setter - def shr_token(self, shr_token): - """Sets the shr_token of this AccessBody. + @share_token.setter + def share_token(self, share_token): + """Sets the share_token of this AccessBody. - :param shr_token: The shr_token of this AccessBody. # noqa: E501 + :param share_token: The share_token of this AccessBody. # noqa: E501 :type: str """ - self._shr_token = shr_token + self._share_token = share_token def to_dict(self): """Returns the model properties as a dict""" diff --git a/sdk/python/sdk/zrok/zrok_api/models/frontend.py b/sdk/python/sdk/zrok/zrok_api/models/frontend.py index 8d6c8be8..0a1bd429 100644 --- a/sdk/python/sdk/zrok/zrok_api/models/frontend.py +++ b/sdk/python/sdk/zrok/zrok_api/models/frontend.py @@ -30,7 +30,7 @@ class Frontend(object): swagger_types = { 'id': 'int', 'fe_token': 'str', - 'shr_token': 'str', + 'share_token': 'str', 'z_id': 'str', 'created_at': 'int', 'updated_at': 'int' @@ -39,17 +39,17 @@ class Frontend(object): attribute_map = { 'id': 'id', 'fe_token': 'feToken', - 'shr_token': 'shrToken', + 'share_token': 'shareToken', 'z_id': 'zId', 'created_at': 'createdAt', 'updated_at': 'updatedAt' } - def __init__(self, id=None, fe_token=None, shr_token=None, z_id=None, created_at=None, updated_at=None): # noqa: E501 + def __init__(self, id=None, fe_token=None, share_token=None, z_id=None, created_at=None, updated_at=None): # noqa: E501 """Frontend - a model defined in Swagger""" # noqa: E501 self._id = None self._fe_token = None - self._shr_token = None + self._share_token = None self._z_id = None self._created_at = None self._updated_at = None @@ -58,8 +58,8 @@ class Frontend(object): self.id = id if fe_token is not None: self.fe_token = fe_token - if shr_token is not None: - self.shr_token = shr_token + if share_token is not None: + self.share_token = share_token if z_id is not None: self.z_id = z_id if created_at is not None: @@ -110,25 +110,25 @@ class Frontend(object): self._fe_token = fe_token @property - def shr_token(self): - """Gets the shr_token of this Frontend. # noqa: E501 + def share_token(self): + """Gets the share_token of this Frontend. # noqa: E501 - :return: The shr_token of this Frontend. # noqa: E501 + :return: The share_token of this Frontend. # noqa: E501 :rtype: str """ - return self._shr_token + return self._share_token - @shr_token.setter - def shr_token(self, shr_token): - """Sets the shr_token of this Frontend. + @share_token.setter + def share_token(self, share_token): + """Sets the share_token of this Frontend. - :param shr_token: The shr_token of this Frontend. # noqa: E501 + :param share_token: The share_token of this Frontend. # noqa: E501 :type: str """ - self._shr_token = shr_token + self._share_token = share_token @property def z_id(self): diff --git a/sdk/python/sdk/zrok/zrok_api/models/invite_body.py b/sdk/python/sdk/zrok/zrok_api/models/invite_body.py index 797fe804..bb4840d5 100644 --- a/sdk/python/sdk/zrok/zrok_api/models/invite_body.py +++ b/sdk/python/sdk/zrok/zrok_api/models/invite_body.py @@ -29,23 +29,23 @@ class InviteBody(object): """ swagger_types = { 'email': 'str', - 'inv_token': 'str' + 'invite_token': 'str' } attribute_map = { 'email': 'email', - 'inv_token': 'invToken' + 'invite_token': 'inviteToken' } - def __init__(self, email=None, inv_token=None): # noqa: E501 + def __init__(self, email=None, invite_token=None): # noqa: E501 """InviteBody - a model defined in Swagger""" # noqa: E501 self._email = None - self._inv_token = None + self._invite_token = None self.discriminator = None if email is not None: self.email = email - if inv_token is not None: - self.inv_token = inv_token + if invite_token is not None: + self.invite_token = invite_token @property def email(self): @@ -69,25 +69,25 @@ class InviteBody(object): self._email = email @property - def inv_token(self): - """Gets the inv_token of this InviteBody. # noqa: E501 + def invite_token(self): + """Gets the invite_token of this InviteBody. # noqa: E501 - :return: The inv_token of this InviteBody. # noqa: E501 + :return: The invite_token of this InviteBody. # noqa: E501 :rtype: str """ - return self._inv_token + return self._invite_token - @inv_token.setter - def inv_token(self, inv_token): - """Sets the inv_token of this InviteBody. + @invite_token.setter + def invite_token(self, invite_token): + """Sets the invite_token of this InviteBody. - :param inv_token: The inv_token of this InviteBody. # noqa: E501 + :param invite_token: The invite_token of this InviteBody. # noqa: E501 :type: str """ - self._inv_token = inv_token + self._invite_token = invite_token def to_dict(self): """Returns the model properties as a dict""" diff --git a/sdk/python/sdk/zrok/zrok_api/models/register_body.py b/sdk/python/sdk/zrok/zrok_api/models/register_body.py index 47587533..80549446 100644 --- a/sdk/python/sdk/zrok/zrok_api/models/register_body.py +++ b/sdk/python/sdk/zrok/zrok_api/models/register_body.py @@ -28,45 +28,45 @@ class RegisterBody(object): and the value is json key in definition. """ swagger_types = { - 'reg_token': 'str', + 'register_token': 'str', 'password': 'str' } attribute_map = { - 'reg_token': 'regToken', + 'register_token': 'registerToken', 'password': 'password' } - def __init__(self, reg_token=None, password=None): # noqa: E501 + def __init__(self, register_token=None, password=None): # noqa: E501 """RegisterBody - a model defined in Swagger""" # noqa: E501 - self._reg_token = None + self._register_token = None self._password = None self.discriminator = None - if reg_token is not None: - self.reg_token = reg_token + if register_token is not None: + self.register_token = register_token if password is not None: self.password = password @property - def reg_token(self): - """Gets the reg_token of this RegisterBody. # noqa: E501 + def register_token(self): + """Gets the register_token of this RegisterBody. # noqa: E501 - :return: The reg_token of this RegisterBody. # noqa: E501 + :return: The register_token of this RegisterBody. # noqa: E501 :rtype: str """ - return self._reg_token + return self._register_token - @reg_token.setter - def reg_token(self, reg_token): - """Sets the reg_token of this RegisterBody. + @register_token.setter + def register_token(self, register_token): + """Sets the register_token of this RegisterBody. - :param reg_token: The reg_token of this RegisterBody. # noqa: E501 + :param register_token: The register_token of this RegisterBody. # noqa: E501 :type: str """ - self._reg_token = reg_token + self._register_token = register_token @property def password(self): diff --git a/sdk/python/sdk/zrok/zrok_api/models/share.py b/sdk/python/sdk/zrok/zrok_api/models/share.py index cb0b8a1f..abdb66af 100644 --- a/sdk/python/sdk/zrok/zrok_api/models/share.py +++ b/sdk/python/sdk/zrok/zrok_api/models/share.py @@ -28,7 +28,7 @@ class Share(object): and the value is json key in definition. """ swagger_types = { - 'token': 'str', + 'share_token': 'str', 'z_id': 'str', 'share_mode': 'str', 'backend_mode': 'str', @@ -43,7 +43,7 @@ class Share(object): } attribute_map = { - 'token': 'token', + 'share_token': 'shareToken', 'z_id': 'zId', 'share_mode': 'shareMode', 'backend_mode': 'backendMode', @@ -57,9 +57,9 @@ class Share(object): 'updated_at': 'updatedAt' } - def __init__(self, token=None, z_id=None, share_mode=None, backend_mode=None, frontend_selection=None, frontend_endpoint=None, backend_proxy_endpoint=None, reserved=None, activity=None, limited=None, created_at=None, updated_at=None): # noqa: E501 + def __init__(self, share_token=None, z_id=None, share_mode=None, backend_mode=None, frontend_selection=None, frontend_endpoint=None, backend_proxy_endpoint=None, reserved=None, activity=None, limited=None, created_at=None, updated_at=None): # noqa: E501 """Share - a model defined in Swagger""" # noqa: E501 - self._token = None + self._share_token = None self._z_id = None self._share_mode = None self._backend_mode = None @@ -72,8 +72,8 @@ class Share(object): self._created_at = None self._updated_at = None self.discriminator = None - if token is not None: - self.token = token + if share_token is not None: + self.share_token = share_token if z_id is not None: self.z_id = z_id if share_mode is not None: @@ -98,25 +98,25 @@ class Share(object): self.updated_at = updated_at @property - def token(self): - """Gets the token of this Share. # noqa: E501 + def share_token(self): + """Gets the share_token of this Share. # noqa: E501 - :return: The token of this Share. # noqa: E501 + :return: The share_token of this Share. # noqa: E501 :rtype: str """ - return self._token + return self._share_token - @token.setter - def token(self, token): - """Sets the token of this Share. + @share_token.setter + def share_token(self, share_token): + """Sets the share_token of this Share. - :param token: The token of this Share. # noqa: E501 + :param share_token: The share_token of this Share. # noqa: E501 :type: str """ - self._token = token + self._share_token = share_token @property def z_id(self): diff --git a/sdk/python/sdk/zrok/zrok_api/models/share_body.py b/sdk/python/sdk/zrok/zrok_api/models/share_body.py index 7d2f87f3..f8398b70 100644 --- a/sdk/python/sdk/zrok/zrok_api/models/share_body.py +++ b/sdk/python/sdk/zrok/zrok_api/models/share_body.py @@ -28,28 +28,28 @@ class ShareBody(object): and the value is json key in definition. """ swagger_types = { - 'shr_token': 'str', + 'share_token': 'str', 'backend_proxy_endpoint': 'str', 'add_access_grants': 'list[str]', 'remove_access_grants': 'list[str]' } attribute_map = { - 'shr_token': 'shrToken', + 'share_token': 'shareToken', 'backend_proxy_endpoint': 'backendProxyEndpoint', 'add_access_grants': 'addAccessGrants', 'remove_access_grants': 'removeAccessGrants' } - def __init__(self, shr_token=None, backend_proxy_endpoint=None, add_access_grants=None, remove_access_grants=None): # noqa: E501 + def __init__(self, share_token=None, backend_proxy_endpoint=None, add_access_grants=None, remove_access_grants=None): # noqa: E501 """ShareBody - a model defined in Swagger""" # noqa: E501 - self._shr_token = None + self._share_token = None self._backend_proxy_endpoint = None self._add_access_grants = None self._remove_access_grants = None self.discriminator = None - if shr_token is not None: - self.shr_token = shr_token + if share_token is not None: + self.share_token = share_token if backend_proxy_endpoint is not None: self.backend_proxy_endpoint = backend_proxy_endpoint if add_access_grants is not None: @@ -58,25 +58,25 @@ class ShareBody(object): self.remove_access_grants = remove_access_grants @property - def shr_token(self): - """Gets the shr_token of this ShareBody. # noqa: E501 + def share_token(self): + """Gets the share_token of this ShareBody. # noqa: E501 - :return: The shr_token of this ShareBody. # noqa: E501 + :return: The share_token of this ShareBody. # noqa: E501 :rtype: str """ - return self._shr_token + return self._share_token - @shr_token.setter - def shr_token(self, shr_token): - """Sets the shr_token of this ShareBody. + @share_token.setter + def share_token(self, share_token): + """Sets the share_token of this ShareBody. - :param shr_token: The shr_token of this ShareBody. # noqa: E501 + :param share_token: The share_token of this ShareBody. # noqa: E501 :type: str """ - self._shr_token = shr_token + self._share_token = share_token @property def backend_proxy_endpoint(self): diff --git a/sdk/python/sdk/zrok/zrok_api/models/share_response.py b/sdk/python/sdk/zrok/zrok_api/models/share_response.py index 5f466321..dcb30e38 100644 --- a/sdk/python/sdk/zrok/zrok_api/models/share_response.py +++ b/sdk/python/sdk/zrok/zrok_api/models/share_response.py @@ -29,23 +29,23 @@ class ShareResponse(object): """ swagger_types = { 'frontend_proxy_endpoints': 'list[str]', - 'shr_token': 'str' + 'share_token': 'str' } attribute_map = { 'frontend_proxy_endpoints': 'frontendProxyEndpoints', - 'shr_token': 'shrToken' + 'share_token': 'shareToken' } - def __init__(self, frontend_proxy_endpoints=None, shr_token=None): # noqa: E501 + def __init__(self, frontend_proxy_endpoints=None, share_token=None): # noqa: E501 """ShareResponse - a model defined in Swagger""" # noqa: E501 self._frontend_proxy_endpoints = None - self._shr_token = None + self._share_token = None self.discriminator = None if frontend_proxy_endpoints is not None: self.frontend_proxy_endpoints = frontend_proxy_endpoints - if shr_token is not None: - self.shr_token = shr_token + if share_token is not None: + self.share_token = share_token @property def frontend_proxy_endpoints(self): @@ -69,25 +69,25 @@ class ShareResponse(object): self._frontend_proxy_endpoints = frontend_proxy_endpoints @property - def shr_token(self): - """Gets the shr_token of this ShareResponse. # noqa: E501 + def share_token(self): + """Gets the share_token of this ShareResponse. # noqa: E501 - :return: The shr_token of this ShareResponse. # noqa: E501 + :return: The share_token of this ShareResponse. # noqa: E501 :rtype: str """ - return self._shr_token + return self._share_token - @shr_token.setter - def shr_token(self, shr_token): - """Sets the shr_token of this ShareResponse. + @share_token.setter + def share_token(self, share_token): + """Sets the share_token of this ShareResponse. - :param shr_token: The shr_token of this ShareResponse. # noqa: E501 + :param share_token: The share_token of this ShareResponse. # noqa: E501 :type: str """ - self._shr_token = shr_token + self._share_token = share_token def to_dict(self): """Returns the model properties as a dict""" diff --git a/sdk/python/sdk/zrok/zrok_api/models/unaccess_body.py b/sdk/python/sdk/zrok/zrok_api/models/unaccess_body.py index b29248b9..77321334 100644 --- a/sdk/python/sdk/zrok/zrok_api/models/unaccess_body.py +++ b/sdk/python/sdk/zrok/zrok_api/models/unaccess_body.py @@ -30,27 +30,27 @@ class UnaccessBody(object): swagger_types = { 'frontend_token': 'str', 'env_zid': 'str', - 'shr_token': 'str' + 'share_token': 'str' } attribute_map = { 'frontend_token': 'frontendToken', 'env_zid': 'envZId', - 'shr_token': 'shrToken' + 'share_token': 'shareToken' } - def __init__(self, frontend_token=None, env_zid=None, shr_token=None): # noqa: E501 + def __init__(self, frontend_token=None, env_zid=None, share_token=None): # noqa: E501 """UnaccessBody - a model defined in Swagger""" # noqa: E501 self._frontend_token = None self._env_zid = None - self._shr_token = None + self._share_token = None self.discriminator = None if frontend_token is not None: self.frontend_token = frontend_token if env_zid is not None: self.env_zid = env_zid - if shr_token is not None: - self.shr_token = shr_token + if share_token is not None: + self.share_token = share_token @property def frontend_token(self): @@ -95,25 +95,25 @@ class UnaccessBody(object): self._env_zid = env_zid @property - def shr_token(self): - """Gets the shr_token of this UnaccessBody. # noqa: E501 + def share_token(self): + """Gets the share_token of this UnaccessBody. # noqa: E501 - :return: The shr_token of this UnaccessBody. # noqa: E501 + :return: The share_token of this UnaccessBody. # noqa: E501 :rtype: str """ - return self._shr_token + return self._share_token - @shr_token.setter - def shr_token(self, shr_token): - """Sets the shr_token of this UnaccessBody. + @share_token.setter + def share_token(self, share_token): + """Sets the share_token of this UnaccessBody. - :param shr_token: The shr_token of this UnaccessBody. # noqa: E501 + :param share_token: The share_token of this UnaccessBody. # noqa: E501 :type: str """ - self._shr_token = shr_token + self._share_token = share_token def to_dict(self): """Returns the model properties as a dict""" diff --git a/sdk/python/sdk/zrok/zrok_api/models/unshare_body.py b/sdk/python/sdk/zrok/zrok_api/models/unshare_body.py index 59ffd8f2..e6463475 100644 --- a/sdk/python/sdk/zrok/zrok_api/models/unshare_body.py +++ b/sdk/python/sdk/zrok/zrok_api/models/unshare_body.py @@ -29,26 +29,26 @@ class UnshareBody(object): """ swagger_types = { 'env_zid': 'str', - 'shr_token': 'str', + 'share_token': 'str', 'reserved': 'bool' } attribute_map = { 'env_zid': 'envZId', - 'shr_token': 'shrToken', + 'share_token': 'shareToken', 'reserved': 'reserved' } - def __init__(self, env_zid=None, shr_token=None, reserved=None): # noqa: E501 + def __init__(self, env_zid=None, share_token=None, reserved=None): # noqa: E501 """UnshareBody - a model defined in Swagger""" # noqa: E501 self._env_zid = None - self._shr_token = None + self._share_token = None self._reserved = None self.discriminator = None if env_zid is not None: self.env_zid = env_zid - if shr_token is not None: - self.shr_token = shr_token + if share_token is not None: + self.share_token = share_token if reserved is not None: self.reserved = reserved @@ -74,25 +74,25 @@ class UnshareBody(object): self._env_zid = env_zid @property - def shr_token(self): - """Gets the shr_token of this UnshareBody. # noqa: E501 + def share_token(self): + """Gets the share_token of this UnshareBody. # noqa: E501 - :return: The shr_token of this UnshareBody. # noqa: E501 + :return: The share_token of this UnshareBody. # noqa: E501 :rtype: str """ - return self._shr_token + return self._share_token - @shr_token.setter - def shr_token(self, shr_token): - """Sets the shr_token of this UnshareBody. + @share_token.setter + def share_token(self, share_token): + """Sets the share_token of this UnshareBody. - :param shr_token: The shr_token of this UnshareBody. # noqa: E501 + :param share_token: The share_token of this UnshareBody. # noqa: E501 :type: str """ - self._shr_token = shr_token + self._share_token = share_token @property def reserved(self): diff --git a/sdk/python/sdk/zrok/zrok_api/models/verify_body.py b/sdk/python/sdk/zrok/zrok_api/models/verify_body.py index a259faf9..26acf208 100644 --- a/sdk/python/sdk/zrok/zrok_api/models/verify_body.py +++ b/sdk/python/sdk/zrok/zrok_api/models/verify_body.py @@ -28,40 +28,40 @@ class VerifyBody(object): and the value is json key in definition. """ swagger_types = { - 'registration_token': 'str' + 'register_token': 'str' } attribute_map = { - 'registration_token': 'registrationToken' + 'register_token': 'registerToken' } - def __init__(self, registration_token=None): # noqa: E501 + def __init__(self, register_token=None): # noqa: E501 """VerifyBody - a model defined in Swagger""" # noqa: E501 - self._registration_token = None + self._register_token = None self.discriminator = None - if registration_token is not None: - self.registration_token = registration_token + if register_token is not None: + self.register_token = register_token @property - def registration_token(self): - """Gets the registration_token of this VerifyBody. # noqa: E501 + def register_token(self): + """Gets the register_token of this VerifyBody. # noqa: E501 - :return: The registration_token of this VerifyBody. # noqa: E501 + :return: The register_token of this VerifyBody. # noqa: E501 :rtype: str """ - return self._registration_token + return self._register_token - @registration_token.setter - def registration_token(self, registration_token): - """Sets the registration_token of this VerifyBody. + @register_token.setter + def register_token(self, register_token): + """Sets the register_token of this VerifyBody. - :param registration_token: The registration_token of this VerifyBody. # noqa: E501 + :param register_token: The register_token of this VerifyBody. # noqa: E501 :type: str """ - self._registration_token = registration_token + self._register_token = register_token def to_dict(self): """Returns the model properties as a dict""" diff --git a/specs/zrok.yml b/specs/zrok.yml index a6180299..8d8ac669 100644 --- a/specs/zrok.yml +++ b/specs/zrok.yml @@ -59,7 +59,7 @@ paths: properties: email: type: string - invToken: + inviteToken: type: string responses: 201: @@ -131,7 +131,7 @@ paths: in: body schema: properties: - regToken: + registerToken: type: string password: type: string @@ -207,7 +207,7 @@ paths: in: body schema: properties: - registrationToken: + registerToken: type: string responses: 200: @@ -747,7 +747,7 @@ paths: 500: description: internal server error - /detail/share/{shrToken}: + /detail/share/{shareToken}: get: tags: - metadata @@ -755,7 +755,7 @@ paths: - key: [] operationId: getShareDetail parameters: - - name: shrToken + - name: shareToken in: path type: string required: true @@ -918,7 +918,7 @@ paths: description: internal server error - /metrics/share/{shrToken}: + /metrics/share/{shareToken}: get: tags: - metadata @@ -926,7 +926,7 @@ paths: - key: [] operationId: getShareMetrics parameters: - - name: shrToken + - name: shareToken in: path type: string required: true @@ -1009,7 +1009,7 @@ paths: properties: envZId: type: string - shrToken: + shareToken: type: string responses: 201: @@ -1067,7 +1067,7 @@ paths: in: body schema: properties: - shrToken: + shareToken: type: string backendProxyEndpoint: type: string @@ -1107,7 +1107,7 @@ paths: type: string envZId: type: string - shrToken: + shareToken: type: string responses: 200: @@ -1133,7 +1133,7 @@ paths: properties: envZId: type: string - shrToken: + shareToken: type: string reserved: type: boolean @@ -1217,7 +1217,7 @@ definitions: type: integer feToken: type: string - shrToken: + shareToken: type: string zId: type: string @@ -1282,7 +1282,7 @@ definitions: share: type: object properties: - token: + shareToken: type: string zId: type: string @@ -1363,7 +1363,7 @@ definitions: type: array items: type: string - shrToken: + shareToken: type: string sparkData: diff --git a/ui/src/AccessPanel.tsx b/ui/src/AccessPanel.tsx index b4958188..1b208e65 100644 --- a/ui/src/AccessPanel.tsx +++ b/ui/src/AccessPanel.tsx @@ -43,7 +43,6 @@ const AccessPanel = ({ access }: AccessPanelProps) => { const labels = { createdAt: "Created", - shrToken: "Share Token", feToken: "Frontend Token", updatedAt: "Updated", } diff --git a/ui/src/ReleaseAccessModal.tsx b/ui/src/ReleaseAccessModal.tsx index 1b26f2ab..f40b7aae 100644 --- a/ui/src/ReleaseAccessModal.tsx +++ b/ui/src/ReleaseAccessModal.tsx @@ -30,19 +30,19 @@ const ReleaseAccessModal = ({ close, isOpen, user, access, detail }: ReleaseAcce }, [isOpen]); useEffect(() => { - if(detail && detail.token) { - setFeToken(detail.token); + if(detail && detail.feToken) { + setFeToken(detail.feToken); } }, [detail]); const releaseAccess = () => { setErrorMessage(null); - if(detail && detail.token) { + if(detail && detail.feToken) { getShareApi(user).unaccess({ body: { - frontendToken: detail.token, + frontendToken: detail.feToken, envZId: access.data.envZId as string, - shrToken: detail.shrToken + shareToken: detail.shareToken } }) .then(() => { @@ -52,7 +52,7 @@ const ReleaseAccessModal = ({ close, isOpen, user, access, detail }: ReleaseAcce e.response.json().then(ex => { console.log("releaseAccess", ex.message); }); - setErrorMessage(An error occurred releasing your access {detail.token}!); + setErrorMessage(An error occurred releasing your access {detail.feToken}!); setTimeout(() => { setErrorMessage(null); setChecked(false); diff --git a/ui/src/ReleaseShareModal.tsx b/ui/src/ReleaseShareModal.tsx index 31f772d7..5c970259 100644 --- a/ui/src/ReleaseShareModal.tsx +++ b/ui/src/ReleaseShareModal.tsx @@ -16,7 +16,7 @@ interface ReleaseShareProps { const ReleaseShareModal = ({ close, isOpen, user, share, detail }: ReleaseShareProps) => { const [errorMessage, setErrorMessage] = useState(null); - const [token, setToken] = useState(""); + const [shareToken, setShareToken] = useState(""); const [checked, setChecked] = useState(false); const checkedRef = useRef(); checkedRef.current = checked; @@ -31,8 +31,8 @@ const ReleaseShareModal = ({ close, isOpen, user, share, detail }: ReleaseShareP }, [isOpen]); useEffect(() => { - if(detail && detail.token) { - setToken(detail.token); + if(detail && detail.shareToken) { + setShareToken(detail.shareToken); } }, [detail]); @@ -41,7 +41,7 @@ const ReleaseShareModal = ({ close, isOpen, user, share, detail }: ReleaseShareP getShareApi(user).unshare({ body: { envZId: share.data.envZId as string, - shrToken: detail.token, + shareToken: detail.shareToken, reserved: detail.reserved } }) @@ -52,7 +52,7 @@ const ReleaseShareModal = ({ close, isOpen, user, share, detail }: ReleaseShareP e.response.json().then(ex => { console.log("releaseShare", ex.message); }); - setErrorMessage(An error occurred releasing your share {detail.token}!); + setErrorMessage(An error occurred releasing your share {detail.shareToken}!); setTimeout(() => { setErrorMessage(null); setChecked(false); @@ -68,10 +68,10 @@ const ReleaseShareModal = ({ close, isOpen, user, share, detail }: ReleaseShareP Release Share - Would you like to release the share {token} ? + Would you like to release the share {shareToken} ? - } label={

I confirm the release of {token}

} sx={{ mt: 2 }} /> + } label={

I confirm the release of {shareToken}

} sx={{ mt: 2 }} /> { errorMessage ? {errorMessage} : null} diff --git a/ui/src/ShareMetricsModal.tsx b/ui/src/ShareMetricsModal.tsx index 51475285..d7e78087 100644 --- a/ui/src/ShareMetricsModal.tsx +++ b/ui/src/ShareMetricsModal.tsx @@ -21,7 +21,7 @@ const ShareMetricsModal = ({ close, isOpen, user, share }: ShareMetricsModalProp useEffect(() => { let metadataApi = getMetadataApi(user); - metadataApi.getShareMetrics({shrToken: share.id}) + metadataApi.getShareMetrics({shareToken: share.id}) .then(d => { setMetrics30(buildMetrics(d)); }) @@ -30,7 +30,7 @@ const ShareMetricsModal = ({ close, isOpen, user, share }: ShareMetricsModalProp console.log("shareMetricsModal", ex.message); }); }); - metadataApi.getShareMetrics({shrToken: share.id, duration: "168h"}) + metadataApi.getShareMetrics({shareToken: share.id, duration: "168h"}) .then(d => { setMetrics7(buildMetrics(d)); }) @@ -39,7 +39,7 @@ const ShareMetricsModal = ({ close, isOpen, user, share }: ShareMetricsModalProp console.log("shareMetricsModal", ex.message); }); }); - metadataApi.getShareMetrics({shrToken: share.id, duration: "24h"}) + metadataApi.getShareMetrics({shareToken: share.id, duration: "24h"}) .then(d => { setMetrics1(buildMetrics(d)); }) diff --git a/ui/src/ShareNode.tsx b/ui/src/ShareNode.tsx index 3fb4658a..2f9093af 100644 --- a/ui/src/ShareNode.tsx +++ b/ui/src/ShareNode.tsx @@ -17,7 +17,7 @@ const ShareNode = ({ data }) => { const hiddenSparkline = <>; const visibleSparkline = ( - + ); @@ -29,7 +29,7 @@ const ShareNode = ({ data }) => { {data.label} - {sparkdata.get(data.shrToken)?.find(x => x > 0) ? visibleSparkline : hiddenSparkline} + {sparkdata.get(data.shareToken)?.find(x => x > 0) ? visibleSparkline : hiddenSparkline} ); } diff --git a/ui/src/SharePanel.tsx b/ui/src/SharePanel.tsx index 7941f081..29b0d468 100644 --- a/ui/src/SharePanel.tsx +++ b/ui/src/SharePanel.tsx @@ -69,7 +69,7 @@ const SharePanel = ({ share }: SharePanelProps) => { } useEffect(() => { - getMetadataApi(user).getShareDetail({ shrToken: share.data!.shrToken! as string }) + getMetadataApi(user).getShareDetail({ shareToken: share.data!.shareToken! as string }) .then(d => { delete d.activity; delete d.limited; diff --git a/ui/src/api/apis/MetadataApi.ts b/ui/src/api/apis/MetadataApi.ts index 2790b693..581658ac 100644 --- a/ui/src/api/apis/MetadataApi.ts +++ b/ui/src/api/apis/MetadataApi.ts @@ -70,11 +70,11 @@ export interface GetFrontendDetailRequest { } export interface GetShareDetailRequest { - shrToken: string; + shareToken: string; } export interface GetShareMetricsRequest { - shrToken: string; + shareToken: string; duration?: string; } @@ -292,10 +292,10 @@ export class MetadataApi extends runtime.BaseAPI { /** */ async getShareDetailRaw(requestParameters: GetShareDetailRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { - if (requestParameters['shrToken'] == null) { + if (requestParameters['shareToken'] == null) { throw new runtime.RequiredError( - 'shrToken', - 'Required parameter "shrToken" was null or undefined when calling getShareDetail().' + 'shareToken', + 'Required parameter "shareToken" was null or undefined when calling getShareDetail().' ); } @@ -308,7 +308,7 @@ export class MetadataApi extends runtime.BaseAPI { } const response = await this.request({ - path: `/detail/share/{shrToken}`.replace(`{${"shrToken"}}`, encodeURIComponent(String(requestParameters['shrToken']))), + path: `/detail/share/{shareToken}`.replace(`{${"shareToken"}}`, encodeURIComponent(String(requestParameters['shareToken']))), method: 'GET', headers: headerParameters, query: queryParameters, @@ -327,10 +327,10 @@ export class MetadataApi extends runtime.BaseAPI { /** */ async getShareMetricsRaw(requestParameters: GetShareMetricsRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { - if (requestParameters['shrToken'] == null) { + if (requestParameters['shareToken'] == null) { throw new runtime.RequiredError( - 'shrToken', - 'Required parameter "shrToken" was null or undefined when calling getShareMetrics().' + 'shareToken', + 'Required parameter "shareToken" was null or undefined when calling getShareMetrics().' ); } @@ -347,7 +347,7 @@ export class MetadataApi extends runtime.BaseAPI { } const response = await this.request({ - path: `/metrics/share/{shrToken}`.replace(`{${"shrToken"}}`, encodeURIComponent(String(requestParameters['shrToken']))), + path: `/metrics/share/{shareToken}`.replace(`{${"shareToken"}}`, encodeURIComponent(String(requestParameters['shareToken']))), method: 'GET', headers: headerParameters, query: queryParameters, diff --git a/ui/src/api/models/AccessRequest.ts b/ui/src/api/models/AccessRequest.ts index bade42a7..73a0cce7 100644 --- a/ui/src/api/models/AccessRequest.ts +++ b/ui/src/api/models/AccessRequest.ts @@ -30,7 +30,7 @@ export interface AccessRequest { * @type {string} * @memberof AccessRequest */ - shrToken?: string; + shareToken?: string; } /** @@ -51,7 +51,7 @@ export function AccessRequestFromJSONTyped(json: any, ignoreDiscriminator: boole return { 'envZId': json['envZId'] == null ? undefined : json['envZId'], - 'shrToken': json['shrToken'] == null ? undefined : json['shrToken'], + 'shareToken': json['shareToken'] == null ? undefined : json['shareToken'], }; } @@ -62,7 +62,7 @@ export function AccessRequestToJSON(value?: AccessRequest | null): any { return { 'envZId': value['envZId'], - 'shrToken': value['shrToken'], + 'shareToken': value['shareToken'], }; } diff --git a/ui/src/api/models/Frontend.ts b/ui/src/api/models/Frontend.ts index b59425f1..c6e4c3a0 100644 --- a/ui/src/api/models/Frontend.ts +++ b/ui/src/api/models/Frontend.ts @@ -36,7 +36,7 @@ export interface Frontend { * @type {string} * @memberof Frontend */ - shrToken?: string; + shareToken?: string; /** * * @type {string} @@ -76,7 +76,7 @@ export function FrontendFromJSONTyped(json: any, ignoreDiscriminator: boolean): 'id': json['id'] == null ? undefined : json['id'], 'feToken': json['feToken'] == null ? undefined : json['feToken'], - 'shrToken': json['shrToken'] == null ? undefined : json['shrToken'], + 'shareToken': json['shareToken'] == null ? undefined : json['shareToken'], 'zId': json['zId'] == null ? undefined : json['zId'], 'createdAt': json['createdAt'] == null ? undefined : json['createdAt'], 'updatedAt': json['updatedAt'] == null ? undefined : json['updatedAt'], @@ -91,7 +91,7 @@ export function FrontendToJSON(value?: Frontend | null): any { 'id': value['id'], 'feToken': value['feToken'], - 'shrToken': value['shrToken'], + 'shareToken': value['shareToken'], 'zId': value['zId'], 'createdAt': value['createdAt'], 'updatedAt': value['updatedAt'], diff --git a/ui/src/api/models/InviteRequest.ts b/ui/src/api/models/InviteRequest.ts index 3f8ae0ae..216e0988 100644 --- a/ui/src/api/models/InviteRequest.ts +++ b/ui/src/api/models/InviteRequest.ts @@ -30,7 +30,7 @@ export interface InviteRequest { * @type {string} * @memberof InviteRequest */ - invToken?: string; + inviteToken?: string; } /** @@ -51,7 +51,7 @@ export function InviteRequestFromJSONTyped(json: any, ignoreDiscriminator: boole return { 'email': json['email'] == null ? undefined : json['email'], - 'invToken': json['invToken'] == null ? undefined : json['invToken'], + 'inviteToken': json['inviteToken'] == null ? undefined : json['inviteToken'], }; } @@ -62,7 +62,7 @@ export function InviteRequestToJSON(value?: InviteRequest | null): any { return { 'email': value['email'], - 'invToken': value['invToken'], + 'inviteToken': value['inviteToken'], }; } diff --git a/ui/src/api/models/RegisterRequest.ts b/ui/src/api/models/RegisterRequest.ts index 3109f318..a8df6417 100644 --- a/ui/src/api/models/RegisterRequest.ts +++ b/ui/src/api/models/RegisterRequest.ts @@ -24,7 +24,7 @@ export interface RegisterRequest { * @type {string} * @memberof RegisterRequest */ - regToken?: string; + registerToken?: string; /** * * @type {string} @@ -50,7 +50,7 @@ export function RegisterRequestFromJSONTyped(json: any, ignoreDiscriminator: boo } return { - 'regToken': json['regToken'] == null ? undefined : json['regToken'], + 'registerToken': json['registerToken'] == null ? undefined : json['registerToken'], 'password': json['password'] == null ? undefined : json['password'], }; } @@ -61,7 +61,7 @@ export function RegisterRequestToJSON(value?: RegisterRequest | null): any { } return { - 'regToken': value['regToken'], + 'registerToken': value['registerToken'], 'password': value['password'], }; } diff --git a/ui/src/api/models/Share.ts b/ui/src/api/models/Share.ts index 529a6ab3..88c06280 100644 --- a/ui/src/api/models/Share.ts +++ b/ui/src/api/models/Share.ts @@ -31,7 +31,7 @@ export interface Share { * @type {string} * @memberof Share */ - token?: string; + shareToken?: string; /** * * @type {string} @@ -117,7 +117,7 @@ export function ShareFromJSONTyped(json: any, ignoreDiscriminator: boolean): Sha } return { - 'token': json['token'] == null ? undefined : json['token'], + 'shareToken': json['shareToken'] == null ? undefined : json['shareToken'], 'zId': json['zId'] == null ? undefined : json['zId'], 'shareMode': json['shareMode'] == null ? undefined : json['shareMode'], 'backendMode': json['backendMode'] == null ? undefined : json['backendMode'], @@ -138,7 +138,7 @@ export function ShareToJSON(value?: Share | null): any { } return { - 'token': value['token'], + 'shareToken': value['shareToken'], 'zId': value['zId'], 'shareMode': value['shareMode'], 'backendMode': value['backendMode'], diff --git a/ui/src/api/models/ShareResponse.ts b/ui/src/api/models/ShareResponse.ts index b3ce1c1f..a440c089 100644 --- a/ui/src/api/models/ShareResponse.ts +++ b/ui/src/api/models/ShareResponse.ts @@ -30,7 +30,7 @@ export interface ShareResponse { * @type {string} * @memberof ShareResponse */ - shrToken?: string; + shareToken?: string; } /** @@ -51,7 +51,7 @@ export function ShareResponseFromJSONTyped(json: any, ignoreDiscriminator: boole return { 'frontendProxyEndpoints': json['frontendProxyEndpoints'] == null ? undefined : json['frontendProxyEndpoints'], - 'shrToken': json['shrToken'] == null ? undefined : json['shrToken'], + 'shareToken': json['shareToken'] == null ? undefined : json['shareToken'], }; } @@ -62,7 +62,7 @@ export function ShareResponseToJSON(value?: ShareResponse | null): any { return { 'frontendProxyEndpoints': value['frontendProxyEndpoints'], - 'shrToken': value['shrToken'], + 'shareToken': value['shareToken'], }; } diff --git a/ui/src/api/models/UnaccessRequest.ts b/ui/src/api/models/UnaccessRequest.ts index da6065c7..2cd57f14 100644 --- a/ui/src/api/models/UnaccessRequest.ts +++ b/ui/src/api/models/UnaccessRequest.ts @@ -36,7 +36,7 @@ export interface UnaccessRequest { * @type {string} * @memberof UnaccessRequest */ - shrToken?: string; + shareToken?: string; } /** @@ -58,7 +58,7 @@ export function UnaccessRequestFromJSONTyped(json: any, ignoreDiscriminator: boo 'frontendToken': json['frontendToken'] == null ? undefined : json['frontendToken'], 'envZId': json['envZId'] == null ? undefined : json['envZId'], - 'shrToken': json['shrToken'] == null ? undefined : json['shrToken'], + 'shareToken': json['shareToken'] == null ? undefined : json['shareToken'], }; } @@ -70,7 +70,7 @@ export function UnaccessRequestToJSON(value?: UnaccessRequest | null): any { 'frontendToken': value['frontendToken'], 'envZId': value['envZId'], - 'shrToken': value['shrToken'], + 'shareToken': value['shareToken'], }; } diff --git a/ui/src/api/models/UnshareRequest.ts b/ui/src/api/models/UnshareRequest.ts index 7eef1709..20e5ed8a 100644 --- a/ui/src/api/models/UnshareRequest.ts +++ b/ui/src/api/models/UnshareRequest.ts @@ -30,7 +30,7 @@ export interface UnshareRequest { * @type {string} * @memberof UnshareRequest */ - shrToken?: string; + shareToken?: string; /** * * @type {boolean} @@ -57,7 +57,7 @@ export function UnshareRequestFromJSONTyped(json: any, ignoreDiscriminator: bool return { 'envZId': json['envZId'] == null ? undefined : json['envZId'], - 'shrToken': json['shrToken'] == null ? undefined : json['shrToken'], + 'shareToken': json['shareToken'] == null ? undefined : json['shareToken'], 'reserved': json['reserved'] == null ? undefined : json['reserved'], }; } @@ -69,7 +69,7 @@ export function UnshareRequestToJSON(value?: UnshareRequest | null): any { return { 'envZId': value['envZId'], - 'shrToken': value['shrToken'], + 'shareToken': value['shareToken'], 'reserved': value['reserved'], }; } diff --git a/ui/src/api/models/UpdateShareRequest.ts b/ui/src/api/models/UpdateShareRequest.ts index 8af5fa5d..e78d31be 100644 --- a/ui/src/api/models/UpdateShareRequest.ts +++ b/ui/src/api/models/UpdateShareRequest.ts @@ -24,7 +24,7 @@ export interface UpdateShareRequest { * @type {string} * @memberof UpdateShareRequest */ - shrToken?: string; + shareToken?: string; /** * * @type {string} @@ -62,7 +62,7 @@ export function UpdateShareRequestFromJSONTyped(json: any, ignoreDiscriminator: } return { - 'shrToken': json['shrToken'] == null ? undefined : json['shrToken'], + 'shareToken': json['shareToken'] == null ? undefined : json['shareToken'], 'backendProxyEndpoint': json['backendProxyEndpoint'] == null ? undefined : json['backendProxyEndpoint'], 'addAccessGrants': json['addAccessGrants'] == null ? undefined : json['addAccessGrants'], 'removeAccessGrants': json['removeAccessGrants'] == null ? undefined : json['removeAccessGrants'], @@ -75,7 +75,7 @@ export function UpdateShareRequestToJSON(value?: UpdateShareRequest | null): any } return { - 'shrToken': value['shrToken'], + 'shareToken': value['shareToken'], 'backendProxyEndpoint': value['backendProxyEndpoint'], 'addAccessGrants': value['addAccessGrants'], 'removeAccessGrants': value['removeAccessGrants'], diff --git a/ui/src/api/models/VerifyRequest.ts b/ui/src/api/models/VerifyRequest.ts index e818a2c6..388d889d 100644 --- a/ui/src/api/models/VerifyRequest.ts +++ b/ui/src/api/models/VerifyRequest.ts @@ -24,7 +24,7 @@ export interface VerifyRequest { * @type {string} * @memberof VerifyRequest */ - registrationToken?: string; + registerToken?: string; } /** @@ -44,7 +44,7 @@ export function VerifyRequestFromJSONTyped(json: any, ignoreDiscriminator: boole } return { - 'registrationToken': json['registrationToken'] == null ? undefined : json['registrationToken'], + 'registerToken': json['registerToken'] == null ? undefined : json['registerToken'], }; } @@ -54,7 +54,7 @@ export function VerifyRequestToJSON(value?: VerifyRequest | null): any { } return { - 'registrationToken': value['registrationToken'], + 'registerToken': value['registerToken'], }; } diff --git a/ui/src/model/graph.ts b/ui/src/model/graph.ts index 5dd7aaf3..3d8241ff 100644 --- a/ui/src/model/graph.ts +++ b/ui/src/model/graph.ts @@ -53,10 +53,10 @@ export const mergeGraph = (oldVov: Graph, u: User, limited: boolean, newOv: Over shrLabel = shr.backendProxyEndpoint!; } let shrNode = { - id: shr.token!, + id: shr.shareToken!, data: { label: shrLabel, - shrToken: shr.token!, + shareToken: shr.shareToken!, envZId: env.environment?.zId!, limited: !!limited, accessed: false, @@ -64,7 +64,7 @@ export const mergeGraph = (oldVov: Graph, u: User, limited: boolean, newOv: Over type: "share", position: { x: 0, y: 0 } } - allShares[shr.token!] = shrNode; + allShares[shr.shareToken!] = shrNode; newVov.nodes.push(shrNode); newVov.edges.push({ id: envNode.id + "-" + shrNode.id, @@ -82,7 +82,7 @@ export const mergeGraph = (oldVov: Graph, u: User, limited: boolean, newOv: Over data: { label: fe.feToken!, feId: fe.id, - target: fe.shrToken, + target: fe.shareToken, envZId: fe.zId, }, type: "access",