From fa8200a603c444088da68a4cb5c4867b8329fe1a Mon Sep 17 00:00:00 2001 From: Michael Quigley Date: Tue, 4 Feb 2025 14:16:16 -0500 Subject: [PATCH] account token (#820, #834) --- cmd/zrok/adminCreateAccount.go | 2 +- controller/createAccount.go | 2 +- rest_client_zrok/admin/create_account_responses.go | 4 ++-- rest_server_zrok/embedded_spec.go | 4 ++-- rest_server_zrok/operations/admin/create_account.go | 4 ++-- sdk/nodejs/sdk/src/zrok/api/api/adminApi.ts | 7 ++++--- sdk/python/sdk/zrok/docs/AdminApi.md | 4 ++-- sdk/python/sdk/zrok/zrok_api/api/admin_api.py | 6 +++--- specs/zrok.yml | 2 +- ui/src/api/apis/AdminApi.ts | 9 ++++++--- 10 files changed, 24 insertions(+), 20 deletions(-) diff --git a/cmd/zrok/adminCreateAccount.go b/cmd/zrok/adminCreateAccount.go index 80151ecc..1c646af2 100644 --- a/cmd/zrok/adminCreateAccount.go +++ b/cmd/zrok/adminCreateAccount.go @@ -46,5 +46,5 @@ func (cmd *adminCreateAccount) run(_ *cobra.Command, args []string) { panic(err) } - fmt.Println(resp.GetPayload().Token) + fmt.Println(resp.GetPayload().AccountToken) } diff --git a/controller/createAccount.go b/controller/createAccount.go index 0fc5ef6a..269cff07 100644 --- a/controller/createAccount.go +++ b/controller/createAccount.go @@ -55,5 +55,5 @@ func (h *createAccountHandler) Handle(params admin.CreateAccountParams, principa logrus.Infof("administratively created account '%v'", params.Body.Email) - return admin.NewCreateAccountCreated().WithPayload(&admin.CreateAccountCreatedBody{Token: token}) + return admin.NewCreateAccountCreated().WithPayload(&admin.CreateAccountCreatedBody{AccountToken: token}) } diff --git a/rest_client_zrok/admin/create_account_responses.go b/rest_client_zrok/admin/create_account_responses.go index 2e5a4020..9f0f4f39 100644 --- a/rest_client_zrok/admin/create_account_responses.go +++ b/rest_client_zrok/admin/create_account_responses.go @@ -273,8 +273,8 @@ swagger:model CreateAccountCreatedBody */ type CreateAccountCreatedBody struct { - // token - Token string `json:"token,omitempty"` + // account token + AccountToken string `json:"accountToken,omitempty"` } // Validate validates this create account created body diff --git a/rest_server_zrok/embedded_spec.go b/rest_server_zrok/embedded_spec.go index 373699e2..e797c75f 100644 --- a/rest_server_zrok/embedded_spec.go +++ b/rest_server_zrok/embedded_spec.go @@ -120,7 +120,7 @@ func init() { "description": "created", "schema": { "properties": { - "token": { + "accountToken": { "type": "string" } } @@ -2317,7 +2317,7 @@ func init() { "description": "created", "schema": { "properties": { - "token": { + "accountToken": { "type": "string" } } diff --git a/rest_server_zrok/operations/admin/create_account.go b/rest_server_zrok/operations/admin/create_account.go index 186dbb09..6eb23202 100644 --- a/rest_server_zrok/operations/admin/create_account.go +++ b/rest_server_zrok/operations/admin/create_account.go @@ -118,8 +118,8 @@ func (o *CreateAccountBody) UnmarshalBinary(b []byte) error { // swagger:model CreateAccountCreatedBody type CreateAccountCreatedBody struct { - // token - Token string `json:"token,omitempty"` + // account token + AccountToken string `json:"accountToken,omitempty"` } // Validate validates this create account created body diff --git a/sdk/nodejs/sdk/src/zrok/api/api/adminApi.ts b/sdk/nodejs/sdk/src/zrok/api/api/adminApi.ts index a1e0e83a..6e2613f5 100644 --- a/sdk/nodejs/sdk/src/zrok/api/api/adminApi.ts +++ b/sdk/nodejs/sdk/src/zrok/api/api/adminApi.ts @@ -26,6 +26,7 @@ import { ListFrontends200ResponseInner } from '../model/listFrontends200Response import { ListOrganizationMembers200Response } from '../model/listOrganizationMembers200Response'; import { ListOrganizations200Response } from '../model/listOrganizations200Response'; import { LoginRequest } from '../model/loginRequest'; +import { RegenerateAccountToken200Response } from '../model/regenerateAccountToken200Response'; import { RemoveOrganizationMemberRequest } from '../model/removeOrganizationMemberRequest'; import { UpdateFrontendRequest } from '../model/updateFrontendRequest'; import { Verify200Response } from '../model/verify200Response'; @@ -165,7 +166,7 @@ export class AdminApi { * * @param body */ - public async createAccount (body?: LoginRequest, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.IncomingMessage; body: VerifyRequest; }> { + public async createAccount (body?: LoginRequest, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.IncomingMessage; body: RegenerateAccountToken200Response; }> { const localVarPath = this.basePath + '/account'; let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this._defaultHeaders); @@ -211,13 +212,13 @@ export class AdminApi { localVarRequestOptions.form = localVarFormParams; } } - return new Promise<{ response: http.IncomingMessage; body: VerifyRequest; }>((resolve, reject) => { + return new Promise<{ response: http.IncomingMessage; body: RegenerateAccountToken200Response; }>((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, "RegenerateAccountToken200Response"); resolve({ response: response, body: body }); } else { reject(new HttpError(response, body, response.statusCode)); diff --git a/sdk/python/sdk/zrok/docs/AdminApi.md b/sdk/python/sdk/zrok/docs/AdminApi.md index 690a6aac..0c93d7f7 100644 --- a/sdk/python/sdk/zrok/docs/AdminApi.md +++ b/sdk/python/sdk/zrok/docs/AdminApi.md @@ -70,7 +70,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) # **create_account** -> VerifyBody create_account(body=body) +> InlineResponse200 create_account(body=body) @@ -107,7 +107,7 @@ Name | Type | Description | Notes ### Return type -[**VerifyBody**](VerifyBody.md) +[**InlineResponse200**](InlineResponse200.md) ### Authorization 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 08ee4dc4..15ef47cb 100644 --- a/sdk/python/sdk/zrok/zrok_api/api/admin_api.py +++ b/sdk/python/sdk/zrok/zrok_api/api/admin_api.py @@ -131,7 +131,7 @@ class AdminApi(object): :param async_req bool :param AccountBody body: - :return: VerifyBody + :return: InlineResponse200 If the method is called asynchronously, returns the request thread. """ @@ -152,7 +152,7 @@ class AdminApi(object): :param async_req bool :param AccountBody body: - :return: VerifyBody + :return: InlineResponse200 If the method is called asynchronously, returns the request thread. """ @@ -206,7 +206,7 @@ class AdminApi(object): body=body_params, post_params=form_params, files=local_var_files, - response_type='VerifyBody', # noqa: E501 + response_type='InlineResponse200', # 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/specs/zrok.yml b/specs/zrok.yml index 1b5c569a..58377ab8 100644 --- a/specs/zrok.yml +++ b/specs/zrok.yml @@ -245,7 +245,7 @@ paths: description: created schema: properties: - token: + accountToken: type: string 401: description: unauthorized diff --git a/ui/src/api/apis/AdminApi.ts b/ui/src/api/apis/AdminApi.ts index 7acd7dfb..2d279e36 100644 --- a/ui/src/api/apis/AdminApi.ts +++ b/ui/src/api/apis/AdminApi.ts @@ -26,6 +26,7 @@ import type { ListOrganizationMembers200Response, ListOrganizations200Response, LoginRequest, + RegenerateAccountToken200Response, RemoveOrganizationMemberRequest, UpdateFrontendRequest, Verify200Response, @@ -54,6 +55,8 @@ import { ListOrganizations200ResponseToJSON, LoginRequestFromJSON, LoginRequestToJSON, + RegenerateAccountToken200ResponseFromJSON, + RegenerateAccountToken200ResponseToJSON, RemoveOrganizationMemberRequestFromJSON, RemoveOrganizationMemberRequestToJSON, UpdateFrontendRequestFromJSON, @@ -149,7 +152,7 @@ export class AdminApi extends runtime.BaseAPI { /** */ - async createAccountRaw(requestParameters: CreateAccountRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { + async createAccountRaw(requestParameters: CreateAccountRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { const queryParameters: any = {}; const headerParameters: runtime.HTTPHeaders = {}; @@ -168,12 +171,12 @@ export class AdminApi extends runtime.BaseAPI { body: LoginRequestToJSON(requestParameters['body']), }, initOverrides); - return new runtime.JSONApiResponse(response, (jsonValue) => VerifyRequestFromJSON(jsonValue)); + return new runtime.JSONApiResponse(response, (jsonValue) => RegenerateAccountToken200ResponseFromJSON(jsonValue)); } /** */ - async createAccount(requestParameters: CreateAccountRequest = {}, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { + async createAccount(requestParameters: CreateAccountRequest = {}, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { const response = await this.createAccountRaw(requestParameters, initOverrides); return await response.value(); }