diff --git a/cmd/zrok/adminCreateFrontend.go b/cmd/zrok/adminCreateFrontend.go index ef1473dc..01460e9c 100644 --- a/cmd/zrok/adminCreateFrontend.go +++ b/cmd/zrok/adminCreateFrontend.go @@ -68,5 +68,5 @@ func (cmd *adminCreateFrontendCommand) run(_ *cobra.Command, args []string) { } } - logrus.Infof("created global public frontend '%v'", resp.Payload.Token) + logrus.Infof("created global public frontend '%v'", resp.Payload.FrontendToken) } diff --git a/cmd/zrok/adminListFrontends.go b/cmd/zrok/adminListFrontends.go index ee7ece19..7446a703 100644 --- a/cmd/zrok/adminListFrontends.go +++ b/cmd/zrok/adminListFrontends.go @@ -54,7 +54,7 @@ func (cmd *adminListFrontendsCommand) run(_ *cobra.Command, _ []string) { t.AppendHeader(table.Row{"Token", "zId", "Public Name", "Url Template", "Created At", "Updated At"}) for _, pfe := range resp.Payload { t.AppendRow(table.Row{ - pfe.Token, + pfe.FrontendToken, pfe.ZID, pfe.PublicName, pfe.URLTemplate, diff --git a/controller/createFrontend.go b/controller/createFrontend.go index 4252bf3d..d1034398 100644 --- a/controller/createFrontend.go +++ b/controller/createFrontend.go @@ -88,5 +88,5 @@ func (h *createFrontendHandler) Handle(params admin.CreateFrontendParams, princi logrus.Infof("created global frontend '%v' with public name '%v'", fe.Token, *fe.PublicName) - return admin.NewCreateFrontendCreated().WithPayload(&admin.CreateFrontendCreatedBody{Token: feToken}) + return admin.NewCreateFrontendCreated().WithPayload(&admin.CreateFrontendCreatedBody{FrontendToken: feToken}) } diff --git a/controller/listFrontends.go b/controller/listFrontends.go index e87e8bbd..8858ac6c 100644 --- a/controller/listFrontends.go +++ b/controller/listFrontends.go @@ -35,10 +35,10 @@ func (h *listFrontendsHandler) Handle(params admin.ListFrontendsParams, principa var frontends []*admin.ListFrontendsOKBodyItems0 for _, sfe := range sfes { frontend := &admin.ListFrontendsOKBodyItems0{ - Token: sfe.Token, - ZID: sfe.ZId, - CreatedAt: sfe.CreatedAt.UnixMilli(), - UpdatedAt: sfe.UpdatedAt.UnixMilli(), + FrontendToken: sfe.Token, + ZID: sfe.ZId, + CreatedAt: sfe.CreatedAt.UnixMilli(), + UpdatedAt: sfe.UpdatedAt.UnixMilli(), } if sfe.UrlTemplate != nil { frontend.URLTemplate = *sfe.UrlTemplate diff --git a/rest_client_zrok/admin/create_frontend_responses.go b/rest_client_zrok/admin/create_frontend_responses.go index 66054f14..367d6b5c 100644 --- a/rest_client_zrok/admin/create_frontend_responses.go +++ b/rest_client_zrok/admin/create_frontend_responses.go @@ -458,8 +458,8 @@ swagger:model CreateFrontendCreatedBody */ type CreateFrontendCreatedBody struct { - // token - Token string `json:"token,omitempty"` + // frontend token + FrontendToken string `json:"frontendToken,omitempty"` } // Validate validates this create frontend created body diff --git a/rest_client_zrok/admin/list_frontends_responses.go b/rest_client_zrok/admin/list_frontends_responses.go index 175f61e2..d351c898 100644 --- a/rest_client_zrok/admin/list_frontends_responses.go +++ b/rest_client_zrok/admin/list_frontends_responses.go @@ -233,12 +233,12 @@ type ListFrontendsOKBodyItems0 struct { // created at CreatedAt int64 `json:"createdAt,omitempty"` + // frontend token + FrontendToken string `json:"frontendToken,omitempty"` + // public name PublicName string `json:"publicName,omitempty"` - // token - Token string `json:"token,omitempty"` - // updated at UpdatedAt int64 `json:"updatedAt,omitempty"` diff --git a/rest_server_zrok/embedded_spec.go b/rest_server_zrok/embedded_spec.go index e797c75f..7303e0d7 100644 --- a/rest_server_zrok/embedded_spec.go +++ b/rest_server_zrok/embedded_spec.go @@ -475,7 +475,7 @@ func init() { "schema": { "type": "object", "properties": { - "token": { + "frontendToken": { "type": "string" } } @@ -602,10 +602,10 @@ func init() { "createdAt": { "type": "integer" }, - "publicName": { + "frontendToken": { "type": "string" }, - "token": { + "publicName": { "type": "string" }, "updatedAt": { @@ -2672,7 +2672,7 @@ func init() { "schema": { "type": "object", "properties": { - "token": { + "frontendToken": { "type": "string" } } @@ -4015,10 +4015,10 @@ func init() { "createdAt": { "type": "integer" }, - "publicName": { + "frontendToken": { "type": "string" }, - "token": { + "publicName": { "type": "string" }, "updatedAt": { diff --git a/rest_server_zrok/operations/admin/create_frontend.go b/rest_server_zrok/operations/admin/create_frontend.go index 56918800..dd2a15aa 100644 --- a/rest_server_zrok/operations/admin/create_frontend.go +++ b/rest_server_zrok/operations/admin/create_frontend.go @@ -179,8 +179,8 @@ func (o *CreateFrontendBody) UnmarshalBinary(b []byte) error { // swagger:model CreateFrontendCreatedBody type CreateFrontendCreatedBody struct { - // token - Token string `json:"token,omitempty"` + // frontend token + FrontendToken string `json:"frontendToken,omitempty"` } // Validate validates this create frontend created body diff --git a/rest_server_zrok/operations/admin/list_frontends.go b/rest_server_zrok/operations/admin/list_frontends.go index 300dd2c4..77f8971d 100644 --- a/rest_server_zrok/operations/admin/list_frontends.go +++ b/rest_server_zrok/operations/admin/list_frontends.go @@ -81,12 +81,12 @@ type ListFrontendsOKBodyItems0 struct { // created at CreatedAt int64 `json:"createdAt,omitempty"` + // frontend token + FrontendToken string `json:"frontendToken,omitempty"` + // public name PublicName string `json:"publicName,omitempty"` - // token - Token string `json:"token,omitempty"` - // updated at UpdatedAt int64 `json:"updatedAt,omitempty"` diff --git a/sdk/nodejs/sdk/src/zrok/api/.openapi-generator/FILES b/sdk/nodejs/sdk/src/zrok/api/.openapi-generator/FILES index 3757a925..5eb37dc0 100644 --- a/sdk/nodejs/sdk/src/zrok/api/.openapi-generator/FILES +++ b/sdk/nodejs/sdk/src/zrok/api/.openapi-generator/FILES @@ -13,11 +13,11 @@ model/addOrganizationMemberRequest.ts model/authUser.ts model/changePasswordRequest.ts model/configuration.ts +model/createFrontend201Response.ts model/createFrontendRequest.ts model/createIdentity201Response.ts model/createIdentityRequest.ts model/createOrganizationRequest.ts -model/deleteFrontendRequest.ts model/disableRequest.ts model/enableRequest.ts model/environment.ts diff --git a/sdk/nodejs/sdk/src/zrok/api/api/adminApi.ts b/sdk/nodejs/sdk/src/zrok/api/api/adminApi.ts index 6e2613f5..1c6a1c1e 100644 --- a/sdk/nodejs/sdk/src/zrok/api/api/adminApi.ts +++ b/sdk/nodejs/sdk/src/zrok/api/api/adminApi.ts @@ -16,11 +16,11 @@ import http from 'http'; /* tslint:disable:no-unused-locals */ import { AddOrganizationMemberRequest } from '../model/addOrganizationMemberRequest'; +import { CreateFrontend201Response } from '../model/createFrontend201Response'; import { CreateFrontendRequest } from '../model/createFrontendRequest'; import { CreateIdentity201Response } from '../model/createIdentity201Response'; import { CreateIdentityRequest } from '../model/createIdentityRequest'; import { CreateOrganizationRequest } from '../model/createOrganizationRequest'; -import { DeleteFrontendRequest } from '../model/deleteFrontendRequest'; import { InviteTokenGenerateRequest } from '../model/inviteTokenGenerateRequest'; import { ListFrontends200ResponseInner } from '../model/listFrontends200ResponseInner'; import { ListOrganizationMembers200Response } from '../model/listOrganizationMembers200Response'; @@ -232,7 +232,7 @@ export class AdminApi { * * @param body */ - public async createFrontend (body?: CreateFrontendRequest, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.IncomingMessage; body: VerifyRequest; }> { + public async createFrontend (body?: CreateFrontendRequest, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.IncomingMessage; body: CreateFrontend201Response; }> { const localVarPath = this.basePath + '/frontend'; let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this._defaultHeaders); @@ -278,13 +278,13 @@ export class AdminApi { localVarRequestOptions.form = localVarFormParams; } } - return new Promise<{ response: http.IncomingMessage; body: VerifyRequest; }>((resolve, reject) => { + return new Promise<{ response: http.IncomingMessage; body: CreateFrontend201Response; }>((resolve, reject) => { localVarRequest(localVarRequestOptions, (error, response, body) => { if (error) { reject(error); } else { if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) { - body = ObjectSerializer.deserialize(body, "VerifyRequest"); + body = ObjectSerializer.deserialize(body, "CreateFrontend201Response"); resolve({ response: response, body: body }); } else { reject(new HttpError(response, body, response.statusCode)); @@ -430,7 +430,7 @@ export class AdminApi { * * @param body */ - public async deleteFrontend (body?: DeleteFrontendRequest, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.IncomingMessage; body?: any; }> { + public async deleteFrontend (body?: CreateFrontend201Response, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.IncomingMessage; body?: any; }> { const localVarPath = this.basePath + '/frontend'; let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this._defaultHeaders); @@ -447,7 +447,7 @@ export class AdminApi { uri: localVarPath, useQuerystring: this._useQuerystring, json: true, - body: ObjectSerializer.serialize(body, "DeleteFrontendRequest") + body: ObjectSerializer.serialize(body, "CreateFrontend201Response") }; let authenticationPromise = Promise.resolve(); diff --git a/sdk/nodejs/sdk/src/zrok/api/model/createFrontend201Response.ts b/sdk/nodejs/sdk/src/zrok/api/model/createFrontend201Response.ts new file mode 100644 index 00000000..78d3fadd --- /dev/null +++ b/sdk/nodejs/sdk/src/zrok/api/model/createFrontend201Response.ts @@ -0,0 +1,31 @@ +/** + * zrok + * zrok client access + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +import { RequestFile } from './models'; + +export class CreateFrontend201Response { + 'frontendToken'?: string; + + static discriminator: string | undefined = undefined; + + static attributeTypeMap: Array<{name: string, baseName: string, type: string}> = [ + { + "name": "frontendToken", + "baseName": "frontendToken", + "type": "string" + } ]; + + static getAttributeTypeMap() { + return CreateFrontend201Response.attributeTypeMap; + } +} + diff --git a/sdk/nodejs/sdk/src/zrok/api/model/listFrontends200ResponseInner.ts b/sdk/nodejs/sdk/src/zrok/api/model/listFrontends200ResponseInner.ts index 7dd3e2f8..c09f4b2e 100644 --- a/sdk/nodejs/sdk/src/zrok/api/model/listFrontends200ResponseInner.ts +++ b/sdk/nodejs/sdk/src/zrok/api/model/listFrontends200ResponseInner.ts @@ -13,7 +13,7 @@ import { RequestFile } from './models'; export class ListFrontends200ResponseInner { - 'token'?: string; + 'frontendToken'?: string; 'zId'?: string; 'urlTemplate'?: string; 'publicName'?: string; @@ -24,8 +24,8 @@ export class ListFrontends200ResponseInner { static attributeTypeMap: Array<{name: string, baseName: string, type: string}> = [ { - "name": "token", - "baseName": "token", + "name": "frontendToken", + "baseName": "frontendToken", "type": "string" }, { diff --git a/sdk/nodejs/sdk/src/zrok/api/model/models.ts b/sdk/nodejs/sdk/src/zrok/api/model/models.ts index 81d70f38..50d7eeb7 100644 --- a/sdk/nodejs/sdk/src/zrok/api/model/models.ts +++ b/sdk/nodejs/sdk/src/zrok/api/model/models.ts @@ -6,11 +6,11 @@ export * from './addOrganizationMemberRequest'; export * from './authUser'; export * from './changePasswordRequest'; export * from './configuration'; +export * from './createFrontend201Response'; export * from './createFrontendRequest'; export * from './createIdentity201Response'; export * from './createIdentityRequest'; export * from './createOrganizationRequest'; -export * from './deleteFrontendRequest'; export * from './disableRequest'; export * from './enableRequest'; export * from './environment'; @@ -67,11 +67,11 @@ import { AddOrganizationMemberRequest } from './addOrganizationMemberRequest'; import { AuthUser } from './authUser'; import { ChangePasswordRequest } from './changePasswordRequest'; import { Configuration } from './configuration'; +import { CreateFrontend201Response } from './createFrontend201Response'; import { CreateFrontendRequest } from './createFrontendRequest'; import { CreateIdentity201Response } from './createIdentity201Response'; import { CreateIdentityRequest } from './createIdentityRequest'; import { CreateOrganizationRequest } from './createOrganizationRequest'; -import { DeleteFrontendRequest } from './deleteFrontendRequest'; import { DisableRequest } from './disableRequest'; import { EnableRequest } from './enableRequest'; import { Environment } from './environment'; @@ -136,11 +136,11 @@ let typeMap: {[index: string]: any} = { "AuthUser": AuthUser, "ChangePasswordRequest": ChangePasswordRequest, "Configuration": Configuration, + "CreateFrontend201Response": CreateFrontend201Response, "CreateFrontendRequest": CreateFrontendRequest, "CreateIdentity201Response": CreateIdentity201Response, "CreateIdentityRequest": CreateIdentityRequest, "CreateOrganizationRequest": CreateOrganizationRequest, - "DeleteFrontendRequest": DeleteFrontendRequest, "DisableRequest": DisableRequest, "EnableRequest": EnableRequest, "Environment": Environment, diff --git a/sdk/python/sdk/zrok/README.md b/sdk/python/sdk/zrok/README.md index 6dea39ff..35c99565 100644 --- a/sdk/python/sdk/zrok/README.md +++ b/sdk/python/sdk/zrok/README.md @@ -222,6 +222,7 @@ Class | Method | HTTP request | Description - [InlineResponse2006](docs/InlineResponse2006.md) - [InlineResponse201](docs/InlineResponse201.md) - [InlineResponse2011](docs/InlineResponse2011.md) + - [InlineResponse2012](docs/InlineResponse2012.md) - [InviteBody](docs/InviteBody.md) - [LoginBody](docs/LoginBody.md) - [Metrics](docs/Metrics.md) diff --git a/sdk/python/sdk/zrok/docs/AdminApi.md b/sdk/python/sdk/zrok/docs/AdminApi.md index 0c93d7f7..62abadfb 100644 --- a/sdk/python/sdk/zrok/docs/AdminApi.md +++ b/sdk/python/sdk/zrok/docs/AdminApi.md @@ -121,7 +121,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) # **create_frontend** -> VerifyBody create_frontend(body=body) +> InlineResponse201 create_frontend(body=body) @@ -158,7 +158,7 @@ Name | Type | Description | Notes ### Return type -[**VerifyBody**](VerifyBody.md) +[**InlineResponse201**](InlineResponse201.md) ### Authorization @@ -172,7 +172,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) # **create_identity** -> InlineResponse201 create_identity(body=body) +> InlineResponse2011 create_identity(body=body) @@ -209,7 +209,7 @@ Name | Type | Description | Notes ### Return type -[**InlineResponse201**](InlineResponse201.md) +[**InlineResponse2011**](InlineResponse2011.md) ### Authorization diff --git a/sdk/python/sdk/zrok/docs/EnvironmentApi.md b/sdk/python/sdk/zrok/docs/EnvironmentApi.md index 65a4af64..f9e49447 100644 --- a/sdk/python/sdk/zrok/docs/EnvironmentApi.md +++ b/sdk/python/sdk/zrok/docs/EnvironmentApi.md @@ -58,7 +58,7 @@ void (empty response body) [[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) # **enable** -> InlineResponse201 enable(body=body) +> InlineResponse2011 enable(body=body) @@ -95,7 +95,7 @@ Name | Type | Description | Notes ### Return type -[**InlineResponse201**](InlineResponse201.md) +[**InlineResponse2011**](InlineResponse2011.md) ### Authorization diff --git a/sdk/python/sdk/zrok/docs/InlineResponse2002.md b/sdk/python/sdk/zrok/docs/InlineResponse2002.md index d56e391e..d50b57e3 100644 --- a/sdk/python/sdk/zrok/docs/InlineResponse2002.md +++ b/sdk/python/sdk/zrok/docs/InlineResponse2002.md @@ -3,7 +3,7 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**token** | **str** | | [optional] +**frontend_token** | **str** | | [optional] **z_id** | **str** | | [optional] **url_template** | **str** | | [optional] **public_name** | **str** | | [optional] diff --git a/sdk/python/sdk/zrok/docs/InlineResponse201.md b/sdk/python/sdk/zrok/docs/InlineResponse201.md index 862e5596..bbe25b94 100644 --- a/sdk/python/sdk/zrok/docs/InlineResponse201.md +++ b/sdk/python/sdk/zrok/docs/InlineResponse201.md @@ -3,8 +3,7 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**identity** | **str** | | [optional] -**cfg** | **str** | | [optional] +**frontend_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/InlineResponse2011.md b/sdk/python/sdk/zrok/docs/InlineResponse2011.md index f169e815..8fd74494 100644 --- a/sdk/python/sdk/zrok/docs/InlineResponse2011.md +++ b/sdk/python/sdk/zrok/docs/InlineResponse2011.md @@ -3,8 +3,8 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**frontend_token** | **str** | | [optional] -**backend_mode** | **str** | | [optional] +**identity** | **str** | | [optional] +**cfg** | **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/InlineResponse2012.md b/sdk/python/sdk/zrok/docs/InlineResponse2012.md new file mode 100644 index 00000000..6eb5df14 --- /dev/null +++ b/sdk/python/sdk/zrok/docs/InlineResponse2012.md @@ -0,0 +1,10 @@ +# InlineResponse2012 + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**frontend_token** | **str** | | [optional] +**backend_mode** | **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/ShareApi.md b/sdk/python/sdk/zrok/docs/ShareApi.md index 44752358..25cc60ec 100644 --- a/sdk/python/sdk/zrok/docs/ShareApi.md +++ b/sdk/python/sdk/zrok/docs/ShareApi.md @@ -11,7 +11,7 @@ Method | HTTP request | Description [**update_share**](ShareApi.md#update_share) | **PATCH** /share | # **access** -> InlineResponse2011 access(body=body) +> InlineResponse2012 access(body=body) @@ -48,7 +48,7 @@ Name | Type | Description | Notes ### Return type -[**InlineResponse2011**](InlineResponse2011.md) +[**InlineResponse2012**](InlineResponse2012.md) ### Authorization diff --git a/sdk/python/sdk/zrok/test/test_inline_response2012.py b/sdk/python/sdk/zrok/test/test_inline_response2012.py new file mode 100644 index 00000000..cc69a570 --- /dev/null +++ b/sdk/python/sdk/zrok/test/test_inline_response2012.py @@ -0,0 +1,39 @@ +# coding: utf-8 + +""" + zrok + + zrok client access # noqa: E501 + + OpenAPI spec version: 1.0.0 + + Generated by: https://github.com/swagger-api/swagger-codegen.git +""" + +from __future__ import absolute_import + +import unittest + +import zrok_api +from zrok_api.models.inline_response2012 import InlineResponse2012 # noqa: E501 +from zrok_api.rest import ApiException + + +class TestInlineResponse2012(unittest.TestCase): + """InlineResponse2012 unit test stubs""" + + def setUp(self): + pass + + def tearDown(self): + pass + + def testInlineResponse2012(self): + """Test InlineResponse2012""" + # FIXME: construct object with mandatory attributes with example values + # model = zrok_api.models.inline_response2012.InlineResponse2012() # noqa: E501 + pass + + +if __name__ == '__main__': + unittest.main() diff --git a/sdk/python/sdk/zrok/zrok_api/__init__.py b/sdk/python/sdk/zrok/zrok_api/__init__.py index ac3dde5e..83d3d320 100644 --- a/sdk/python/sdk/zrok/zrok_api/__init__.py +++ b/sdk/python/sdk/zrok/zrok_api/__init__.py @@ -54,6 +54,7 @@ from zrok_api.models.inline_response2005_memberships import InlineResponse2005Me from zrok_api.models.inline_response2006 import InlineResponse2006 from zrok_api.models.inline_response201 import InlineResponse201 from zrok_api.models.inline_response2011 import InlineResponse2011 +from zrok_api.models.inline_response2012 import InlineResponse2012 from zrok_api.models.invite_body import InviteBody from zrok_api.models.login_body import LoginBody from zrok_api.models.metrics import Metrics diff --git a/sdk/python/sdk/zrok/zrok_api/api/admin_api.py b/sdk/python/sdk/zrok/zrok_api/api/admin_api.py index 15ef47cb..3760abd1 100644 --- a/sdk/python/sdk/zrok/zrok_api/api/admin_api.py +++ b/sdk/python/sdk/zrok/zrok_api/api/admin_api.py @@ -224,7 +224,7 @@ class AdminApi(object): :param async_req bool :param FrontendBody body: - :return: VerifyBody + :return: InlineResponse201 If the method is called asynchronously, returns the request thread. """ @@ -245,7 +245,7 @@ class AdminApi(object): :param async_req bool :param FrontendBody body: - :return: VerifyBody + :return: InlineResponse201 If the method is called asynchronously, returns the request thread. """ @@ -299,7 +299,7 @@ class AdminApi(object): body=body_params, post_params=form_params, files=local_var_files, - response_type='VerifyBody', # noqa: E501 + response_type='InlineResponse201', # noqa: E501 auth_settings=auth_settings, async_req=params.get('async_req'), _return_http_data_only=params.get('_return_http_data_only'), @@ -317,7 +317,7 @@ class AdminApi(object): :param async_req bool :param IdentityBody body: - :return: InlineResponse201 + :return: InlineResponse2011 If the method is called asynchronously, returns the request thread. """ @@ -338,7 +338,7 @@ class AdminApi(object): :param async_req bool :param IdentityBody body: - :return: InlineResponse201 + :return: InlineResponse2011 If the method is called asynchronously, returns the request thread. """ @@ -392,7 +392,7 @@ class AdminApi(object): body=body_params, post_params=form_params, files=local_var_files, - response_type='InlineResponse201', # noqa: E501 + response_type='InlineResponse2011', # noqa: E501 auth_settings=auth_settings, async_req=params.get('async_req'), _return_http_data_only=params.get('_return_http_data_only'), diff --git a/sdk/python/sdk/zrok/zrok_api/api/environment_api.py b/sdk/python/sdk/zrok/zrok_api/api/environment_api.py index 663b42fe..16bc987e 100644 --- a/sdk/python/sdk/zrok/zrok_api/api/environment_api.py +++ b/sdk/python/sdk/zrok/zrok_api/api/environment_api.py @@ -131,7 +131,7 @@ class EnvironmentApi(object): :param async_req bool :param EnableBody body: - :return: InlineResponse201 + :return: InlineResponse2011 If the method is called asynchronously, returns the request thread. """ @@ -152,7 +152,7 @@ class EnvironmentApi(object): :param async_req bool :param EnableBody body: - :return: InlineResponse201 + :return: InlineResponse2011 If the method is called asynchronously, returns the request thread. """ @@ -206,7 +206,7 @@ class EnvironmentApi(object): body=body_params, post_params=form_params, files=local_var_files, - response_type='InlineResponse201', # noqa: E501 + response_type='InlineResponse2011', # noqa: E501 auth_settings=auth_settings, async_req=params.get('async_req'), _return_http_data_only=params.get('_return_http_data_only'), diff --git a/sdk/python/sdk/zrok/zrok_api/api/share_api.py b/sdk/python/sdk/zrok/zrok_api/api/share_api.py index 39593dac..e02a2c24 100644 --- a/sdk/python/sdk/zrok/zrok_api/api/share_api.py +++ b/sdk/python/sdk/zrok/zrok_api/api/share_api.py @@ -42,7 +42,7 @@ class ShareApi(object): :param async_req bool :param AccessBody body: - :return: InlineResponse2011 + :return: InlineResponse2012 If the method is called asynchronously, returns the request thread. """ @@ -63,7 +63,7 @@ class ShareApi(object): :param async_req bool :param AccessBody body: - :return: InlineResponse2011 + :return: InlineResponse2012 If the method is called asynchronously, returns the request thread. """ @@ -117,7 +117,7 @@ class ShareApi(object): body=body_params, post_params=form_params, files=local_var_files, - response_type='InlineResponse2011', # noqa: E501 + response_type='InlineResponse2012', # noqa: E501 auth_settings=auth_settings, async_req=params.get('async_req'), _return_http_data_only=params.get('_return_http_data_only'), diff --git a/sdk/python/sdk/zrok/zrok_api/models/__init__.py b/sdk/python/sdk/zrok/zrok_api/models/__init__.py index 9155362b..11643377 100644 --- a/sdk/python/sdk/zrok/zrok_api/models/__init__.py +++ b/sdk/python/sdk/zrok/zrok_api/models/__init__.py @@ -44,6 +44,7 @@ from zrok_api.models.inline_response2005_memberships import InlineResponse2005Me from zrok_api.models.inline_response2006 import InlineResponse2006 from zrok_api.models.inline_response201 import InlineResponse201 from zrok_api.models.inline_response2011 import InlineResponse2011 +from zrok_api.models.inline_response2012 import InlineResponse2012 from zrok_api.models.invite_body import InviteBody from zrok_api.models.login_body import LoginBody from zrok_api.models.metrics import Metrics diff --git a/sdk/python/sdk/zrok/zrok_api/models/inline_response2002.py b/sdk/python/sdk/zrok/zrok_api/models/inline_response2002.py index 7f57e60e..a162bfdc 100644 --- a/sdk/python/sdk/zrok/zrok_api/models/inline_response2002.py +++ b/sdk/python/sdk/zrok/zrok_api/models/inline_response2002.py @@ -28,7 +28,7 @@ class InlineResponse2002(object): and the value is json key in definition. """ swagger_types = { - 'token': 'str', + 'frontend_token': 'str', 'z_id': 'str', 'url_template': 'str', 'public_name': 'str', @@ -37,7 +37,7 @@ class InlineResponse2002(object): } attribute_map = { - 'token': 'token', + 'frontend_token': 'frontendToken', 'z_id': 'zId', 'url_template': 'urlTemplate', 'public_name': 'publicName', @@ -45,17 +45,17 @@ class InlineResponse2002(object): 'updated_at': 'updatedAt' } - def __init__(self, token=None, z_id=None, url_template=None, public_name=None, created_at=None, updated_at=None): # noqa: E501 + def __init__(self, frontend_token=None, z_id=None, url_template=None, public_name=None, created_at=None, updated_at=None): # noqa: E501 """InlineResponse2002 - a model defined in Swagger""" # noqa: E501 - self._token = None + self._frontend_token = None self._z_id = None self._url_template = None self._public_name = None self._created_at = None self._updated_at = None self.discriminator = None - if token is not None: - self.token = token + if frontend_token is not None: + self.frontend_token = frontend_token if z_id is not None: self.z_id = z_id if url_template is not None: @@ -68,25 +68,25 @@ class InlineResponse2002(object): self.updated_at = updated_at @property - def token(self): - """Gets the token of this InlineResponse2002. # noqa: E501 + def frontend_token(self): + """Gets the frontend_token of this InlineResponse2002. # noqa: E501 - :return: The token of this InlineResponse2002. # noqa: E501 + :return: The frontend_token of this InlineResponse2002. # noqa: E501 :rtype: str """ - return self._token + return self._frontend_token - @token.setter - def token(self, token): - """Sets the token of this InlineResponse2002. + @frontend_token.setter + def frontend_token(self, frontend_token): + """Sets the frontend_token of this InlineResponse2002. - :param token: The token of this InlineResponse2002. # noqa: E501 + :param frontend_token: The frontend_token of this InlineResponse2002. # noqa: E501 :type: str """ - self._token = token + self._frontend_token = frontend_token @property def z_id(self): diff --git a/sdk/python/sdk/zrok/zrok_api/models/inline_response201.py b/sdk/python/sdk/zrok/zrok_api/models/inline_response201.py index 25230c11..2cc96e64 100644 --- a/sdk/python/sdk/zrok/zrok_api/models/inline_response201.py +++ b/sdk/python/sdk/zrok/zrok_api/models/inline_response201.py @@ -28,66 +28,40 @@ class InlineResponse201(object): and the value is json key in definition. """ swagger_types = { - 'identity': 'str', - 'cfg': 'str' + 'frontend_token': 'str' } attribute_map = { - 'identity': 'identity', - 'cfg': 'cfg' + 'frontend_token': 'frontendToken' } - def __init__(self, identity=None, cfg=None): # noqa: E501 + def __init__(self, frontend_token=None): # noqa: E501 """InlineResponse201 - a model defined in Swagger""" # noqa: E501 - self._identity = None - self._cfg = None + self._frontend_token = None self.discriminator = None - if identity is not None: - self.identity = identity - if cfg is not None: - self.cfg = cfg + if frontend_token is not None: + self.frontend_token = frontend_token @property - def identity(self): - """Gets the identity of this InlineResponse201. # noqa: E501 + def frontend_token(self): + """Gets the frontend_token of this InlineResponse201. # noqa: E501 - :return: The identity of this InlineResponse201. # noqa: E501 + :return: The frontend_token of this InlineResponse201. # noqa: E501 :rtype: str """ - return self._identity + return self._frontend_token - @identity.setter - def identity(self, identity): - """Sets the identity of this InlineResponse201. + @frontend_token.setter + def frontend_token(self, frontend_token): + """Sets the frontend_token of this InlineResponse201. - :param identity: The identity of this InlineResponse201. # noqa: E501 + :param frontend_token: The frontend_token of this InlineResponse201. # noqa: E501 :type: str """ - self._identity = identity - - @property - def cfg(self): - """Gets the cfg of this InlineResponse201. # noqa: E501 - - - :return: The cfg of this InlineResponse201. # noqa: E501 - :rtype: str - """ - return self._cfg - - @cfg.setter - def cfg(self, cfg): - """Sets the cfg of this InlineResponse201. - - - :param cfg: The cfg of this InlineResponse201. # noqa: E501 - :type: str - """ - - self._cfg = cfg + self._frontend_token = frontend_token def to_dict(self): """Returns the model properties as a dict""" diff --git a/sdk/python/sdk/zrok/zrok_api/models/inline_response2011.py b/sdk/python/sdk/zrok/zrok_api/models/inline_response2011.py index 883b8788..9d80730a 100644 --- a/sdk/python/sdk/zrok/zrok_api/models/inline_response2011.py +++ b/sdk/python/sdk/zrok/zrok_api/models/inline_response2011.py @@ -28,66 +28,66 @@ class InlineResponse2011(object): and the value is json key in definition. """ swagger_types = { - 'frontend_token': 'str', - 'backend_mode': 'str' + 'identity': 'str', + 'cfg': 'str' } attribute_map = { - 'frontend_token': 'frontendToken', - 'backend_mode': 'backendMode' + 'identity': 'identity', + 'cfg': 'cfg' } - def __init__(self, frontend_token=None, backend_mode=None): # noqa: E501 + def __init__(self, identity=None, cfg=None): # noqa: E501 """InlineResponse2011 - a model defined in Swagger""" # noqa: E501 - self._frontend_token = None - self._backend_mode = None + self._identity = None + self._cfg = None self.discriminator = None - if frontend_token is not None: - self.frontend_token = frontend_token - if backend_mode is not None: - self.backend_mode = backend_mode + if identity is not None: + self.identity = identity + if cfg is not None: + self.cfg = cfg @property - def frontend_token(self): - """Gets the frontend_token of this InlineResponse2011. # noqa: E501 + def identity(self): + """Gets the identity of this InlineResponse2011. # noqa: E501 - :return: The frontend_token of this InlineResponse2011. # noqa: E501 + :return: The identity of this InlineResponse2011. # noqa: E501 :rtype: str """ - return self._frontend_token + return self._identity - @frontend_token.setter - def frontend_token(self, frontend_token): - """Sets the frontend_token of this InlineResponse2011. + @identity.setter + def identity(self, identity): + """Sets the identity of this InlineResponse2011. - :param frontend_token: The frontend_token of this InlineResponse2011. # noqa: E501 + :param identity: The identity of this InlineResponse2011. # noqa: E501 :type: str """ - self._frontend_token = frontend_token + self._identity = identity @property - def backend_mode(self): - """Gets the backend_mode of this InlineResponse2011. # noqa: E501 + def cfg(self): + """Gets the cfg of this InlineResponse2011. # noqa: E501 - :return: The backend_mode of this InlineResponse2011. # noqa: E501 + :return: The cfg of this InlineResponse2011. # noqa: E501 :rtype: str """ - return self._backend_mode + return self._cfg - @backend_mode.setter - def backend_mode(self, backend_mode): - """Sets the backend_mode of this InlineResponse2011. + @cfg.setter + def cfg(self, cfg): + """Sets the cfg of this InlineResponse2011. - :param backend_mode: The backend_mode of this InlineResponse2011. # noqa: E501 + :param cfg: The cfg of this InlineResponse2011. # noqa: E501 :type: str """ - self._backend_mode = backend_mode + self._cfg = cfg def to_dict(self): """Returns the model properties as a dict""" diff --git a/sdk/python/sdk/zrok/zrok_api/models/inline_response2012.py b/sdk/python/sdk/zrok/zrok_api/models/inline_response2012.py new file mode 100644 index 00000000..f4c827f7 --- /dev/null +++ b/sdk/python/sdk/zrok/zrok_api/models/inline_response2012.py @@ -0,0 +1,136 @@ +# coding: utf-8 + +""" + zrok + + zrok client access # noqa: E501 + + OpenAPI spec version: 1.0.0 + + Generated by: https://github.com/swagger-api/swagger-codegen.git +""" + +import pprint +import re # noqa: F401 + +import six + +class InlineResponse2012(object): + """NOTE: This class is auto generated by the swagger code generator program. + + Do not edit the class manually. + """ + """ + Attributes: + swagger_types (dict): The key is attribute name + and the value is attribute type. + attribute_map (dict): The key is attribute name + and the value is json key in definition. + """ + swagger_types = { + 'frontend_token': 'str', + 'backend_mode': 'str' + } + + attribute_map = { + 'frontend_token': 'frontendToken', + 'backend_mode': 'backendMode' + } + + def __init__(self, frontend_token=None, backend_mode=None): # noqa: E501 + """InlineResponse2012 - a model defined in Swagger""" # noqa: E501 + self._frontend_token = None + self._backend_mode = None + self.discriminator = None + if frontend_token is not None: + self.frontend_token = frontend_token + if backend_mode is not None: + self.backend_mode = backend_mode + + @property + def frontend_token(self): + """Gets the frontend_token of this InlineResponse2012. # noqa: E501 + + + :return: The frontend_token of this InlineResponse2012. # noqa: E501 + :rtype: str + """ + return self._frontend_token + + @frontend_token.setter + def frontend_token(self, frontend_token): + """Sets the frontend_token of this InlineResponse2012. + + + :param frontend_token: The frontend_token of this InlineResponse2012. # noqa: E501 + :type: str + """ + + self._frontend_token = frontend_token + + @property + def backend_mode(self): + """Gets the backend_mode of this InlineResponse2012. # noqa: E501 + + + :return: The backend_mode of this InlineResponse2012. # noqa: E501 + :rtype: str + """ + return self._backend_mode + + @backend_mode.setter + def backend_mode(self, backend_mode): + """Sets the backend_mode of this InlineResponse2012. + + + :param backend_mode: The backend_mode of this InlineResponse2012. # noqa: E501 + :type: str + """ + + self._backend_mode = backend_mode + + def to_dict(self): + """Returns the model properties as a dict""" + result = {} + + for attr, _ in six.iteritems(self.swagger_types): + value = getattr(self, attr) + if isinstance(value, list): + result[attr] = list(map( + lambda x: x.to_dict() if hasattr(x, "to_dict") else x, + value + )) + elif hasattr(value, "to_dict"): + result[attr] = value.to_dict() + elif isinstance(value, dict): + result[attr] = dict(map( + lambda item: (item[0], item[1].to_dict()) + if hasattr(item[1], "to_dict") else item, + value.items() + )) + else: + result[attr] = value + if issubclass(InlineResponse2012, dict): + for key, value in self.items(): + result[key] = value + + return result + + def to_str(self): + """Returns the string representation of the model""" + return pprint.pformat(self.to_dict()) + + def __repr__(self): + """For `print` and `pprint`""" + return self.to_str() + + def __eq__(self, other): + """Returns true if both objects are equal""" + if not isinstance(other, InlineResponse2012): + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + """Returns true if both objects are not equal""" + return not self == other diff --git a/specs/zrok.yml b/specs/zrok.yml index 58377ab8..80b2b0ea 100644 --- a/specs/zrok.yml +++ b/specs/zrok.yml @@ -280,7 +280,7 @@ paths: schema: type: object properties: - token: + frontendToken: type: string 400: description: bad request @@ -356,7 +356,7 @@ paths: items: type: object properties: - token: + frontendToken: type: string zId: type: string diff --git a/ui/src/api/.openapi-generator/FILES b/ui/src/api/.openapi-generator/FILES index 39673d79..99c8c056 100644 --- a/ui/src/api/.openapi-generator/FILES +++ b/ui/src/api/.openapi-generator/FILES @@ -10,11 +10,11 @@ models/AccessRequest.ts models/AddOrganizationMemberRequest.ts models/AuthUser.ts models/ChangePasswordRequest.ts +models/CreateFrontend201Response.ts models/CreateFrontendRequest.ts models/CreateIdentity201Response.ts models/CreateIdentityRequest.ts models/CreateOrganizationRequest.ts -models/DeleteFrontendRequest.ts models/DisableRequest.ts models/EnableRequest.ts models/Environment.ts diff --git a/ui/src/api/apis/AdminApi.ts b/ui/src/api/apis/AdminApi.ts index 2d279e36..7dbae8bb 100644 --- a/ui/src/api/apis/AdminApi.ts +++ b/ui/src/api/apis/AdminApi.ts @@ -16,11 +16,11 @@ import * as runtime from '../runtime'; import type { AddOrganizationMemberRequest, + CreateFrontend201Response, CreateFrontendRequest, CreateIdentity201Response, CreateIdentityRequest, CreateOrganizationRequest, - DeleteFrontendRequest, InviteTokenGenerateRequest, ListFrontends200ResponseInner, ListOrganizationMembers200Response, @@ -35,6 +35,8 @@ import type { import { AddOrganizationMemberRequestFromJSON, AddOrganizationMemberRequestToJSON, + CreateFrontend201ResponseFromJSON, + CreateFrontend201ResponseToJSON, CreateFrontendRequestFromJSON, CreateFrontendRequestToJSON, CreateIdentity201ResponseFromJSON, @@ -43,8 +45,6 @@ import { CreateIdentityRequestToJSON, CreateOrganizationRequestFromJSON, CreateOrganizationRequestToJSON, - DeleteFrontendRequestFromJSON, - DeleteFrontendRequestToJSON, InviteTokenGenerateRequestFromJSON, InviteTokenGenerateRequestToJSON, ListFrontends200ResponseInnerFromJSON, @@ -87,8 +87,8 @@ export interface CreateOrganizationOperationRequest { body?: CreateOrganizationRequest; } -export interface DeleteFrontendOperationRequest { - body?: DeleteFrontendRequest; +export interface DeleteFrontendRequest { + body?: CreateFrontend201Response; } export interface DeleteOrganizationRequest { @@ -183,7 +183,7 @@ export class AdminApi extends runtime.BaseAPI { /** */ - async createFrontendRaw(requestParameters: CreateFrontendOperationRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { + async createFrontendRaw(requestParameters: CreateFrontendOperationRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { const queryParameters: any = {}; const headerParameters: runtime.HTTPHeaders = {}; @@ -202,12 +202,12 @@ export class AdminApi extends runtime.BaseAPI { body: CreateFrontendRequestToJSON(requestParameters['body']), }, initOverrides); - return new runtime.JSONApiResponse(response, (jsonValue) => VerifyRequestFromJSON(jsonValue)); + return new runtime.JSONApiResponse(response, (jsonValue) => CreateFrontend201ResponseFromJSON(jsonValue)); } /** */ - async createFrontend(requestParameters: CreateFrontendOperationRequest = {}, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { + async createFrontend(requestParameters: CreateFrontendOperationRequest = {}, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { const response = await this.createFrontendRaw(requestParameters, initOverrides); return await response.value(); } @@ -276,7 +276,7 @@ export class AdminApi extends runtime.BaseAPI { /** */ - async deleteFrontendRaw(requestParameters: DeleteFrontendOperationRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { + async deleteFrontendRaw(requestParameters: DeleteFrontendRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { const queryParameters: any = {}; const headerParameters: runtime.HTTPHeaders = {}; @@ -292,7 +292,7 @@ export class AdminApi extends runtime.BaseAPI { method: 'DELETE', headers: headerParameters, query: queryParameters, - body: DeleteFrontendRequestToJSON(requestParameters['body']), + body: CreateFrontend201ResponseToJSON(requestParameters['body']), }, initOverrides); return new runtime.VoidApiResponse(response); @@ -300,7 +300,7 @@ export class AdminApi extends runtime.BaseAPI { /** */ - async deleteFrontend(requestParameters: DeleteFrontendOperationRequest = {}, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { + async deleteFrontend(requestParameters: DeleteFrontendRequest = {}, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { await this.deleteFrontendRaw(requestParameters, initOverrides); } diff --git a/ui/src/api/models/CreateFrontend201Response.ts b/ui/src/api/models/CreateFrontend201Response.ts new file mode 100644 index 00000000..3ea2816d --- /dev/null +++ b/ui/src/api/models/CreateFrontend201Response.ts @@ -0,0 +1,60 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * zrok + * zrok client access + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +import { mapValues } from '../runtime'; +/** + * + * @export + * @interface CreateFrontend201Response + */ +export interface CreateFrontend201Response { + /** + * + * @type {string} + * @memberof CreateFrontend201Response + */ + frontendToken?: string; +} + +/** + * Check if a given object implements the CreateFrontend201Response interface. + */ +export function instanceOfCreateFrontend201Response(value: object): value is CreateFrontend201Response { + return true; +} + +export function CreateFrontend201ResponseFromJSON(json: any): CreateFrontend201Response { + return CreateFrontend201ResponseFromJSONTyped(json, false); +} + +export function CreateFrontend201ResponseFromJSONTyped(json: any, ignoreDiscriminator: boolean): CreateFrontend201Response { + if (json == null) { + return json; + } + return { + + 'frontendToken': json['frontendToken'] == null ? undefined : json['frontendToken'], + }; +} + +export function CreateFrontend201ResponseToJSON(value?: CreateFrontend201Response | null): any { + if (value == null) { + return value; + } + return { + + 'frontendToken': value['frontendToken'], + }; +} + diff --git a/ui/src/api/models/ListFrontends200ResponseInner.ts b/ui/src/api/models/ListFrontends200ResponseInner.ts index 41d1572b..b4683e2a 100644 --- a/ui/src/api/models/ListFrontends200ResponseInner.ts +++ b/ui/src/api/models/ListFrontends200ResponseInner.ts @@ -24,7 +24,7 @@ export interface ListFrontends200ResponseInner { * @type {string} * @memberof ListFrontends200ResponseInner */ - token?: string; + frontendToken?: string; /** * * @type {string} @@ -74,7 +74,7 @@ export function ListFrontends200ResponseInnerFromJSONTyped(json: any, ignoreDisc } return { - 'token': json['token'] == null ? undefined : json['token'], + 'frontendToken': json['frontendToken'] == null ? undefined : json['frontendToken'], 'zId': json['zId'] == null ? undefined : json['zId'], 'urlTemplate': json['urlTemplate'] == null ? undefined : json['urlTemplate'], 'publicName': json['publicName'] == null ? undefined : json['publicName'], @@ -89,7 +89,7 @@ export function ListFrontends200ResponseInnerToJSON(value?: ListFrontends200Resp } return { - 'token': value['token'], + 'frontendToken': value['frontendToken'], 'zId': value['zId'], 'urlTemplate': value['urlTemplate'], 'publicName': value['publicName'], diff --git a/ui/src/api/models/index.ts b/ui/src/api/models/index.ts index 89b219bd..0f9b8f4f 100644 --- a/ui/src/api/models/index.ts +++ b/ui/src/api/models/index.ts @@ -5,11 +5,11 @@ export * from './AccessRequest'; export * from './AddOrganizationMemberRequest'; export * from './AuthUser'; export * from './ChangePasswordRequest'; +export * from './CreateFrontend201Response'; export * from './CreateFrontendRequest'; export * from './CreateIdentity201Response'; export * from './CreateIdentityRequest'; export * from './CreateOrganizationRequest'; -export * from './DeleteFrontendRequest'; export * from './DisableRequest'; export * from './EnableRequest'; export * from './Environment';