diff --git a/controller/invite.go b/controller/invite.go index ee4ee315..0e062abc 100644 --- a/controller/invite.go +++ b/controller/invite.go @@ -33,7 +33,7 @@ func (h *inviteHandler) Handle(params account.InviteParams) middleware.Responder return account.NewInviteBadRequest() } logrus.Infof("received account request for email '%v'", params.Body.Email) - var token string + var regToken string tx, err := str.Begin() if err != nil { @@ -55,13 +55,13 @@ func (h *inviteHandler) Handle(params account.InviteParams) middleware.Responder logrus.Infof("using invite token '%v' to process invite request for '%v'", inviteToken.Token, params.Body.Email) } - token, err = CreateToken() + regToken, err = CreateToken() if err != nil { logrus.Error(err) return account.NewInviteInternalServerError() } ar := &store.AccountRequest{ - Token: token, + Token: regToken, Email: params.Body.Email, SourceAddress: params.HTTPRequest.RemoteAddr, } @@ -94,7 +94,7 @@ func (h *inviteHandler) Handle(params account.InviteParams) middleware.Responder } if cfg.Email != nil && cfg.Registration != nil { - if err := sendVerificationEmail(params.Body.Email, token); err != nil { + if err := sendVerificationEmail(params.Body.Email, regToken); err != nil { logrus.Errorf("error sending verification email for '%v': %v", params.Body.Email, err) return account.NewInviteInternalServerError() } diff --git a/controller/register.go b/controller/register.go index 82f888d7..39c52f76 100644 --- a/controller/register.go +++ b/controller/register.go @@ -19,63 +19,63 @@ func newRegisterHandler(cfg *config.Config) *registerHandler { } } func (h *registerHandler) Handle(params account.RegisterParams) middleware.Responder { - if params.Body.Token == "" || params.Body.Password == "" { + if params.Body.RegToken == "" || params.Body.Password == "" { logrus.Error("missing token or password") return account.NewRegisterNotFound() } - logrus.Infof("received register request for token '%v'", params.Body.Token) + logrus.Infof("received register request for registration token '%v'", params.Body.RegToken) tx, err := str.Begin() if err != nil { - logrus.Errorf("error starting transaction for token '%v': %v", params.Body.Token, err) + logrus.Errorf("error starting transaction for registration token '%v': %v", params.Body.RegToken, err) return account.NewRegisterInternalServerError() } defer func() { _ = tx.Rollback() }() - ar, err := str.FindAccountRequestWithToken(params.Body.Token, tx) + ar, err := str.FindAccountRequestWithToken(params.Body.RegToken, tx) if err != nil { - logrus.Errorf("error finding account request with token '%v': %v", params.Body.Token, err) + logrus.Errorf("error finding account request with registration token '%v': %v", params.Body.RegToken, err) return account.NewRegisterNotFound() } - token, err := CreateToken() + accountToken, err := CreateToken() if err != nil { - logrus.Errorf("error creating token for request '%v' (%v): %v", params.Body.Token, ar.Email, err) + logrus.Errorf("error creating account token for request '%v' (%v): %v", params.Body.RegToken, 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.Token, ar.Email, err) + logrus.Errorf("password not valid for request '%v', (%v): %v", params.Body.RegToken, 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.Token, ar.Email, err) + logrus.Errorf("error hashing password for request '%v' (%v): %v", params.Body.RegToken, ar.Email, err) return account.NewRegisterInternalServerError() } a := &store.Account{ Email: ar.Email, Salt: hpwd.Salt, Password: hpwd.Password, - Token: token, + Token: accountToken, } if _, err := str.CreateAccount(a, tx); err != nil { - logrus.Errorf("error creating account for request '%v' (%v): %v", params.Body.Token, ar.Email, err) + logrus.Errorf("error creating account for request '%v' (%v): %v", params.Body.RegToken, 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.Token, ar.Email, err) + logrus.Errorf("error deleteing account request '%v' (%v): %v", params.Body.RegToken, ar.Email, err) return account.NewRegisterInternalServerError() } if err := tx.Commit(); err != nil { - logrus.Errorf("error committing '%v' (%v): %v", params.Body.Token, ar.Email, err) + logrus.Errorf("error committing '%v' (%v): %v", params.Body.RegToken, ar.Email, err) return account.NewRegisterInternalServerError() } logrus.Infof("created account '%v'", a.Email) - return account.NewRegisterOK().WithPayload(&account.RegisterOKBody{Token: a.Token}) + return account.NewRegisterOK().WithPayload(&account.RegisterOKBody{AccountToken: a.Token}) } diff --git a/controller/verifyEmail.go b/controller/verifyEmail.go index b7a448ad..a020f665 100644 --- a/controller/verifyEmail.go +++ b/controller/verifyEmail.go @@ -17,10 +17,10 @@ type verificationEmail struct { Version string } -func sendVerificationEmail(emailAddress, token string) error { +func sendVerificationEmail(emailAddress, regToken string) error { emailData := &verificationEmail{ EmailAddress: emailAddress, - VerifyUrl: cfg.Registration.RegistrationUrlTemplate + "/" + token, + VerifyUrl: cfg.Registration.RegistrationUrlTemplate + "/" + regToken, Version: build.String(), } diff --git a/rest_client_zrok/account/register_responses.go b/rest_client_zrok/account/register_responses.go index 1ddcbc23..14620fc0 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"` - // token - Token string `json:"token,omitempty"` + // reg token + RegToken string `json:"regToken,omitempty"` } // Validate validates this register body @@ -347,8 +347,8 @@ swagger:model RegisterOKBody */ type RegisterOKBody struct { - // token - Token string `json:"token,omitempty"` + // account token + AccountToken string `json:"accountToken,omitempty"` } // Validate validates this register o k body diff --git a/rest_server_zrok/embedded_spec.go b/rest_server_zrok/embedded_spec.go index 5aae9841..fcd5c2bc 100644 --- a/rest_server_zrok/embedded_spec.go +++ b/rest_server_zrok/embedded_spec.go @@ -1442,7 +1442,7 @@ func init() { "password": { "type": "string" }, - "token": { + "regToken": { "type": "string" } } @@ -1454,7 +1454,7 @@ func init() { "description": "account created", "schema": { "properties": { - "token": { + "accountToken": { "type": "string" } } @@ -3588,7 +3588,7 @@ func init() { "password": { "type": "string" }, - "token": { + "regToken": { "type": "string" } } @@ -3600,7 +3600,7 @@ func init() { "description": "account created", "schema": { "properties": { - "token": { + "accountToken": { "type": "string" } } diff --git a/rest_server_zrok/operations/account/register.go b/rest_server_zrok/operations/account/register.go index 982ea4db..aed75ed2 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"` - // token - Token string `json:"token,omitempty"` + // reg token + RegToken string `json:"regToken,omitempty"` } // Validate validates this register body @@ -103,8 +103,8 @@ func (o *RegisterBody) UnmarshalBinary(b []byte) error { // swagger:model RegisterOKBody type RegisterOKBody struct { - // token - Token string `json:"token,omitempty"` + // account token + AccountToken string `json:"accountToken,omitempty"` } // Validate validates this register o k body diff --git a/sdk/nodejs/sdk/src/zrok/api/.openapi-generator/FILES b/sdk/nodejs/sdk/src/zrok/api/.openapi-generator/FILES index 2f62dc65..3757a925 100644 --- a/sdk/nodejs/sdk/src/zrok/api/.openapi-generator/FILES +++ b/sdk/nodejs/sdk/src/zrok/api/.openapi-generator/FILES @@ -42,9 +42,9 @@ model/overview.ts model/principal.ts model/regenerateAccountToken200Response.ts model/regenerateAccountTokenRequest.ts -model/register200Response.ts model/registerRequest.ts model/removeOrganizationMemberRequest.ts +model/resetPasswordRequest.ts model/share.ts model/shareRequest.ts model/shareResponse.ts @@ -54,3 +54,4 @@ model/unshareRequest.ts model/updateFrontendRequest.ts model/updateShareRequest.ts model/verify200Response.ts +model/verifyRequest.ts diff --git a/sdk/nodejs/sdk/src/zrok/api/api/accountApi.ts b/sdk/nodejs/sdk/src/zrok/api/api/accountApi.ts index 95934b65..3ec287ec 100644 --- a/sdk/nodejs/sdk/src/zrok/api/api/accountApi.ts +++ b/sdk/nodejs/sdk/src/zrok/api/api/accountApi.ts @@ -20,9 +20,10 @@ import { InviteRequest } from '../model/inviteRequest'; import { LoginRequest } from '../model/loginRequest'; import { RegenerateAccountToken200Response } from '../model/regenerateAccountToken200Response'; import { RegenerateAccountTokenRequest } from '../model/regenerateAccountTokenRequest'; -import { Register200Response } from '../model/register200Response'; import { RegisterRequest } from '../model/registerRequest'; +import { ResetPasswordRequest } from '../model/resetPasswordRequest'; import { Verify200Response } from '../model/verify200Response'; +import { VerifyRequest } from '../model/verifyRequest'; import { ObjectSerializer, Authentication, VoidAuth, Interceptor } from '../model/models'; import { HttpBasicAuth, HttpBearerAuth, ApiKeyAuth, OAuth } from '../model/models'; @@ -356,7 +357,7 @@ export class AccountApi { * * @param body */ - public async register (body?: RegisterRequest, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.IncomingMessage; body: Register200Response; }> { + public async register (body?: RegisterRequest, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.IncomingMessage; body: RegenerateAccountToken200Response; }> { const localVarPath = this.basePath + '/register'; let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this._defaultHeaders); @@ -399,13 +400,13 @@ export class AccountApi { localVarRequestOptions.form = localVarFormParams; } } - return new Promise<{ response: http.IncomingMessage; body: Register200Response; }>((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, "Register200Response"); + body = ObjectSerializer.deserialize(body, "RegenerateAccountToken200Response"); resolve({ response: response, body: body }); } else { reject(new HttpError(response, body, response.statusCode)); @@ -419,7 +420,7 @@ export class AccountApi { * * @param body */ - public async resetPassword (body?: RegisterRequest, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.IncomingMessage; body?: any; }> { + public async resetPassword (body?: ResetPasswordRequest, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.IncomingMessage; body?: any; }> { const localVarPath = this.basePath + '/resetPassword'; let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this._defaultHeaders); @@ -443,7 +444,7 @@ export class AccountApi { uri: localVarPath, useQuerystring: this._useQuerystring, json: true, - body: ObjectSerializer.serialize(body, "RegisterRequest") + body: ObjectSerializer.serialize(body, "ResetPasswordRequest") }; let authenticationPromise = Promise.resolve(); @@ -536,7 +537,7 @@ export class AccountApi { * * @param body */ - public async verify (body?: Register200Response, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.IncomingMessage; body: Verify200Response; }> { + public async verify (body?: VerifyRequest, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.IncomingMessage; body: Verify200Response; }> { const localVarPath = this.basePath + '/verify'; let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this._defaultHeaders); @@ -560,7 +561,7 @@ export class AccountApi { uri: localVarPath, useQuerystring: this._useQuerystring, json: true, - body: ObjectSerializer.serialize(body, "Register200Response") + body: ObjectSerializer.serialize(body, "VerifyRequest") }; let authenticationPromise = Promise.resolve(); diff --git a/sdk/nodejs/sdk/src/zrok/api/api/adminApi.ts b/sdk/nodejs/sdk/src/zrok/api/api/adminApi.ts index 77661447..a1e0e83a 100644 --- a/sdk/nodejs/sdk/src/zrok/api/api/adminApi.ts +++ b/sdk/nodejs/sdk/src/zrok/api/api/adminApi.ts @@ -26,10 +26,10 @@ import { ListFrontends200ResponseInner } from '../model/listFrontends200Response import { ListOrganizationMembers200Response } from '../model/listOrganizationMembers200Response'; import { ListOrganizations200Response } from '../model/listOrganizations200Response'; import { LoginRequest } from '../model/loginRequest'; -import { Register200Response } from '../model/register200Response'; import { RemoveOrganizationMemberRequest } from '../model/removeOrganizationMemberRequest'; import { UpdateFrontendRequest } from '../model/updateFrontendRequest'; import { Verify200Response } from '../model/verify200Response'; +import { VerifyRequest } from '../model/verifyRequest'; import { ObjectSerializer, Authentication, VoidAuth, Interceptor } from '../model/models'; import { HttpBasicAuth, HttpBearerAuth, ApiKeyAuth, OAuth } from '../model/models'; @@ -165,7 +165,7 @@ export class AdminApi { * * @param body */ - public async createAccount (body?: LoginRequest, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.IncomingMessage; body: Register200Response; }> { + public async createAccount (body?: LoginRequest, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.IncomingMessage; body: VerifyRequest; }> { const localVarPath = this.basePath + '/account'; let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this._defaultHeaders); @@ -211,13 +211,13 @@ export class AdminApi { localVarRequestOptions.form = localVarFormParams; } } - return new Promise<{ response: http.IncomingMessage; body: Register200Response; }>((resolve, reject) => { + return new Promise<{ response: http.IncomingMessage; body: VerifyRequest; }>((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, "Register200Response"); + body = ObjectSerializer.deserialize(body, "VerifyRequest"); resolve({ response: response, body: body }); } else { reject(new HttpError(response, body, response.statusCode)); @@ -231,7 +231,7 @@ export class AdminApi { * * @param body */ - public async createFrontend (body?: CreateFrontendRequest, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.IncomingMessage; body: Register200Response; }> { + public async createFrontend (body?: CreateFrontendRequest, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.IncomingMessage; body: VerifyRequest; }> { const localVarPath = this.basePath + '/frontend'; let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this._defaultHeaders); @@ -277,13 +277,13 @@ export class AdminApi { localVarRequestOptions.form = localVarFormParams; } } - return new Promise<{ response: http.IncomingMessage; body: Register200Response; }>((resolve, reject) => { + return new Promise<{ response: http.IncomingMessage; body: VerifyRequest; }>((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, "Register200Response"); + body = ObjectSerializer.deserialize(body, "VerifyRequest"); resolve({ response: response, body: body }); } else { reject(new HttpError(response, body, response.statusCode)); @@ -363,7 +363,7 @@ export class AdminApi { * * @param body */ - public async createOrganization (body?: CreateOrganizationRequest, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.IncomingMessage; body: Register200Response; }> { + public async createOrganization (body?: CreateOrganizationRequest, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.IncomingMessage; body: VerifyRequest; }> { const localVarPath = this.basePath + '/organization'; let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this._defaultHeaders); @@ -409,13 +409,13 @@ export class AdminApi { localVarRequestOptions.form = localVarFormParams; } } - return new Promise<{ response: http.IncomingMessage; body: Register200Response; }>((resolve, reject) => { + return new Promise<{ response: http.IncomingMessage; body: VerifyRequest; }>((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, "Register200Response"); + body = ObjectSerializer.deserialize(body, "VerifyRequest"); resolve({ response: response, body: body }); } else { reject(new HttpError(response, body, response.statusCode)); @@ -487,7 +487,7 @@ export class AdminApi { * * @param body */ - public async deleteOrganization (body?: Register200Response, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.IncomingMessage; body?: any; }> { + public async deleteOrganization (body?: VerifyRequest, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.IncomingMessage; body?: any; }> { const localVarPath = this.basePath + '/organization'; let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this._defaultHeaders); @@ -504,7 +504,7 @@ export class AdminApi { uri: localVarPath, useQuerystring: this._useQuerystring, json: true, - body: ObjectSerializer.serialize(body, "Register200Response") + body: ObjectSerializer.serialize(body, "VerifyRequest") }; let authenticationPromise = Promise.resolve(); @@ -725,7 +725,7 @@ export class AdminApi { * * @param body */ - public async listOrganizationMembers (body?: Register200Response, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.IncomingMessage; body: ListOrganizationMembers200Response; }> { + public async listOrganizationMembers (body?: VerifyRequest, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.IncomingMessage; body: ListOrganizationMembers200Response; }> { const localVarPath = this.basePath + '/organization/list'; let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this._defaultHeaders); @@ -749,7 +749,7 @@ export class AdminApi { uri: localVarPath, useQuerystring: this._useQuerystring, json: true, - body: ObjectSerializer.serialize(body, "Register200Response") + body: ObjectSerializer.serialize(body, "VerifyRequest") }; let authenticationPromise = Promise.resolve(); diff --git a/sdk/nodejs/sdk/src/zrok/api/model/models.ts b/sdk/nodejs/sdk/src/zrok/api/model/models.ts index 64b355f6..81d70f38 100644 --- a/sdk/nodejs/sdk/src/zrok/api/model/models.ts +++ b/sdk/nodejs/sdk/src/zrok/api/model/models.ts @@ -34,9 +34,9 @@ export * from './overview'; export * from './principal'; export * from './regenerateAccountToken200Response'; export * from './regenerateAccountTokenRequest'; -export * from './register200Response'; export * from './registerRequest'; export * from './removeOrganizationMemberRequest'; +export * from './resetPasswordRequest'; export * from './share'; export * from './shareRequest'; export * from './shareResponse'; @@ -46,6 +46,7 @@ export * from './unshareRequest'; export * from './updateFrontendRequest'; export * from './updateShareRequest'; export * from './verify200Response'; +export * from './verifyRequest'; import * as fs from 'fs'; @@ -94,9 +95,9 @@ import { Overview } from './overview'; import { Principal } from './principal'; import { RegenerateAccountToken200Response } from './regenerateAccountToken200Response'; import { RegenerateAccountTokenRequest } from './regenerateAccountTokenRequest'; -import { Register200Response } from './register200Response'; import { RegisterRequest } from './registerRequest'; import { RemoveOrganizationMemberRequest } from './removeOrganizationMemberRequest'; +import { ResetPasswordRequest } from './resetPasswordRequest'; import { Share } from './share'; import { ShareRequest } from './shareRequest'; import { ShareResponse } from './shareResponse'; @@ -106,6 +107,7 @@ import { UnshareRequest } from './unshareRequest'; import { UpdateFrontendRequest } from './updateFrontendRequest'; import { UpdateShareRequest } from './updateShareRequest'; import { Verify200Response } from './verify200Response'; +import { VerifyRequest } from './verifyRequest'; /* tslint:disable:no-unused-variable */ let primitives = [ @@ -162,9 +164,9 @@ let typeMap: {[index: string]: any} = { "Principal": Principal, "RegenerateAccountToken200Response": RegenerateAccountToken200Response, "RegenerateAccountTokenRequest": RegenerateAccountTokenRequest, - "Register200Response": Register200Response, "RegisterRequest": RegisterRequest, "RemoveOrganizationMemberRequest": RemoveOrganizationMemberRequest, + "ResetPasswordRequest": ResetPasswordRequest, "Share": Share, "ShareRequest": ShareRequest, "ShareResponse": ShareResponse, @@ -174,6 +176,7 @@ let typeMap: {[index: string]: any} = { "UpdateFrontendRequest": UpdateFrontendRequest, "UpdateShareRequest": UpdateShareRequest, "Verify200Response": Verify200Response, + "VerifyRequest": VerifyRequest, } export class ObjectSerializer { diff --git a/sdk/nodejs/sdk/src/zrok/api/model/registerRequest.ts b/sdk/nodejs/sdk/src/zrok/api/model/registerRequest.ts index f29eb880..d6cf6ecd 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 { - 'token'?: string; + 'regToken'?: string; 'password'?: string; static discriminator: string | undefined = undefined; static attributeTypeMap: Array<{name: string, baseName: string, type: string}> = [ { - "name": "token", - "baseName": "token", + "name": "regToken", + "baseName": "regToken", "type": "string" }, { diff --git a/sdk/nodejs/sdk/src/zrok/api/model/resetPasswordRequest.ts b/sdk/nodejs/sdk/src/zrok/api/model/resetPasswordRequest.ts new file mode 100644 index 00000000..fb80f8da --- /dev/null +++ b/sdk/nodejs/sdk/src/zrok/api/model/resetPasswordRequest.ts @@ -0,0 +1,37 @@ +/** + * 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 ResetPasswordRequest { + 'token'?: string; + 'password'?: string; + + static discriminator: string | undefined = undefined; + + static attributeTypeMap: Array<{name: string, baseName: string, type: string}> = [ + { + "name": "token", + "baseName": "token", + "type": "string" + }, + { + "name": "password", + "baseName": "password", + "type": "string" + } ]; + + static getAttributeTypeMap() { + return ResetPasswordRequest.attributeTypeMap; + } +} + diff --git a/sdk/nodejs/sdk/src/zrok/api/model/verifyRequest.ts b/sdk/nodejs/sdk/src/zrok/api/model/verifyRequest.ts new file mode 100644 index 00000000..ca71ab08 --- /dev/null +++ b/sdk/nodejs/sdk/src/zrok/api/model/verifyRequest.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 VerifyRequest { + 'token'?: string; + + static discriminator: string | undefined = undefined; + + static attributeTypeMap: Array<{name: string, baseName: string, type: string}> = [ + { + "name": "token", + "baseName": "token", + "type": "string" + } ]; + + static getAttributeTypeMap() { + return VerifyRequest.attributeTypeMap; + } +} + diff --git a/sdk/python/sdk/zrok/README.md b/sdk/python/sdk/zrok/README.md index 025dfc00..6dea39ff 100644 --- a/sdk/python/sdk/zrok/README.md +++ b/sdk/python/sdk/zrok/README.md @@ -214,13 +214,12 @@ Class | Method | HTTP request | Description - [InlineResponse2001](docs/InlineResponse2001.md) - [InlineResponse2002](docs/InlineResponse2002.md) - [InlineResponse2003](docs/InlineResponse2003.md) + - [InlineResponse2003Members](docs/InlineResponse2003Members.md) - [InlineResponse2004](docs/InlineResponse2004.md) - - [InlineResponse2004Members](docs/InlineResponse2004Members.md) + - [InlineResponse2004Organizations](docs/InlineResponse2004Organizations.md) - [InlineResponse2005](docs/InlineResponse2005.md) - - [InlineResponse2005Organizations](docs/InlineResponse2005Organizations.md) + - [InlineResponse2005Memberships](docs/InlineResponse2005Memberships.md) - [InlineResponse2006](docs/InlineResponse2006.md) - - [InlineResponse2006Memberships](docs/InlineResponse2006Memberships.md) - - [InlineResponse2007](docs/InlineResponse2007.md) - [InlineResponse201](docs/InlineResponse201.md) - [InlineResponse2011](docs/InlineResponse2011.md) - [InviteBody](docs/InviteBody.md) diff --git a/sdk/python/sdk/zrok/docs/AccountApi.md b/sdk/python/sdk/zrok/docs/AccountApi.md index a348d562..531caa12 100644 --- a/sdk/python/sdk/zrok/docs/AccountApi.md +++ b/sdk/python/sdk/zrok/docs/AccountApi.md @@ -204,7 +204,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) # **register** -> InlineResponse2001 register(body=body) +> InlineResponse200 register(body=body) @@ -235,7 +235,7 @@ Name | Type | Description | Notes ### Return type -[**InlineResponse2001**](InlineResponse2001.md) +[**InlineResponse200**](InlineResponse200.md) ### Authorization @@ -337,7 +337,7 @@ No authorization required [[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) # **verify** -> InlineResponse2002 verify(body=body) +> InlineResponse2001 verify(body=body) @@ -368,7 +368,7 @@ Name | Type | Description | Notes ### Return type -[**InlineResponse2002**](InlineResponse2002.md) +[**InlineResponse2001**](InlineResponse2001.md) ### Authorization diff --git a/sdk/python/sdk/zrok/docs/AdminApi.md b/sdk/python/sdk/zrok/docs/AdminApi.md index c7b644ff..690a6aac 100644 --- a/sdk/python/sdk/zrok/docs/AdminApi.md +++ b/sdk/python/sdk/zrok/docs/AdminApi.md @@ -474,7 +474,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) # **list_frontends** -> list[InlineResponse2003] list_frontends() +> list[InlineResponse2002] list_frontends() @@ -507,7 +507,7 @@ This endpoint does not need any parameter. ### Return type -[**list[InlineResponse2003]**](InlineResponse2003.md) +[**list[InlineResponse2002]**](InlineResponse2002.md) ### Authorization @@ -521,7 +521,7 @@ This endpoint does not need any parameter. [[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) # **list_organization_members** -> InlineResponse2004 list_organization_members(body=body) +> InlineResponse2003 list_organization_members(body=body) @@ -558,7 +558,7 @@ Name | Type | Description | Notes ### Return type -[**InlineResponse2004**](InlineResponse2004.md) +[**InlineResponse2003**](InlineResponse2003.md) ### Authorization @@ -572,7 +572,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) # **list_organizations** -> InlineResponse2005 list_organizations() +> InlineResponse2004 list_organizations() @@ -605,7 +605,7 @@ This endpoint does not need any parameter. ### Return type -[**InlineResponse2005**](InlineResponse2005.md) +[**InlineResponse2004**](InlineResponse2004.md) ### Authorization diff --git a/sdk/python/sdk/zrok/docs/InlineResponse2001.md b/sdk/python/sdk/zrok/docs/InlineResponse2001.md index 8c5f8923..820bf042 100644 --- a/sdk/python/sdk/zrok/docs/InlineResponse2001.md +++ b/sdk/python/sdk/zrok/docs/InlineResponse2001.md @@ -3,7 +3,7 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**token** | **str** | | [optional] +**email** | **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/InlineResponse2002.md b/sdk/python/sdk/zrok/docs/InlineResponse2002.md index ecb38cc8..d56e391e 100644 --- a/sdk/python/sdk/zrok/docs/InlineResponse2002.md +++ b/sdk/python/sdk/zrok/docs/InlineResponse2002.md @@ -3,7 +3,12 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**email** | **str** | | [optional] +**token** | **str** | | [optional] +**z_id** | **str** | | [optional] +**url_template** | **str** | | [optional] +**public_name** | **str** | | [optional] +**created_at** | **int** | | [optional] +**updated_at** | **int** | | [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/InlineResponse2003.md b/sdk/python/sdk/zrok/docs/InlineResponse2003.md index d38fecb7..39488d9e 100644 --- a/sdk/python/sdk/zrok/docs/InlineResponse2003.md +++ b/sdk/python/sdk/zrok/docs/InlineResponse2003.md @@ -3,12 +3,7 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**token** | **str** | | [optional] -**z_id** | **str** | | [optional] -**url_template** | **str** | | [optional] -**public_name** | **str** | | [optional] -**created_at** | **int** | | [optional] -**updated_at** | **int** | | [optional] +**members** | [**list[InlineResponse2003Members]**](InlineResponse2003Members.md) | | [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/InlineResponse2004.md b/sdk/python/sdk/zrok/docs/InlineResponse2004.md index 9ee7c8fa..8c11d95d 100644 --- a/sdk/python/sdk/zrok/docs/InlineResponse2004.md +++ b/sdk/python/sdk/zrok/docs/InlineResponse2004.md @@ -3,7 +3,7 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**members** | [**list[InlineResponse2004Members]**](InlineResponse2004Members.md) | | [optional] +**organizations** | [**list[InlineResponse2004Organizations]**](InlineResponse2004Organizations.md) | | [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/InlineResponse2005.md b/sdk/python/sdk/zrok/docs/InlineResponse2005.md index 209eb22b..8f539747 100644 --- a/sdk/python/sdk/zrok/docs/InlineResponse2005.md +++ b/sdk/python/sdk/zrok/docs/InlineResponse2005.md @@ -3,7 +3,7 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**organizations** | [**list[InlineResponse2005Organizations]**](InlineResponse2005Organizations.md) | | [optional] +**memberships** | [**list[InlineResponse2005Memberships]**](InlineResponse2005Memberships.md) | | [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/InlineResponse2006.md b/sdk/python/sdk/zrok/docs/InlineResponse2006.md index 283baaac..7a03d61e 100644 --- a/sdk/python/sdk/zrok/docs/InlineResponse2006.md +++ b/sdk/python/sdk/zrok/docs/InlineResponse2006.md @@ -3,7 +3,7 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**memberships** | [**list[InlineResponse2006Memberships]**](InlineResponse2006Memberships.md) | | [optional] +**sparklines** | [**list[Metrics]**](Metrics.md) | | [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 45555550..a6a9bdfc 100644 --- a/sdk/python/sdk/zrok/docs/MetadataApi.md +++ b/sdk/python/sdk/zrok/docs/MetadataApi.md @@ -418,7 +418,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_sparklines** -> InlineResponse2007 get_sparklines(body=body) +> InlineResponse2006 get_sparklines(body=body) @@ -455,7 +455,7 @@ Name | Type | Description | Notes ### Return type -[**InlineResponse2007**](InlineResponse2007.md) +[**InlineResponse2006**](InlineResponse2006.md) ### Authorization @@ -469,7 +469,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) # **list_memberships** -> InlineResponse2006 list_memberships() +> InlineResponse2005 list_memberships() @@ -502,7 +502,7 @@ This endpoint does not need any parameter. ### Return type -[**InlineResponse2006**](InlineResponse2006.md) +[**InlineResponse2005**](InlineResponse2005.md) ### Authorization @@ -516,7 +516,7 @@ This endpoint does not need any parameter. [[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) # **list_org_members** -> InlineResponse2004 list_org_members(organization_token) +> InlineResponse2003 list_org_members(organization_token) @@ -553,7 +553,7 @@ Name | Type | Description | Notes ### Return type -[**InlineResponse2004**](InlineResponse2004.md) +[**InlineResponse2003**](InlineResponse2003.md) ### Authorization diff --git a/sdk/python/sdk/zrok/docs/RegisterBody.md b/sdk/python/sdk/zrok/docs/RegisterBody.md index 0882c962..66b17771 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 ------------ | ------------- | ------------- | ------------- -**token** | **str** | | [optional] +**reg_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/zrok_api/__init__.py b/sdk/python/sdk/zrok/zrok_api/__init__.py index 55ad230b..ac3dde5e 100644 --- a/sdk/python/sdk/zrok/zrok_api/__init__.py +++ b/sdk/python/sdk/zrok/zrok_api/__init__.py @@ -46,13 +46,12 @@ from zrok_api.models.inline_response200 import InlineResponse200 from zrok_api.models.inline_response2001 import InlineResponse2001 from zrok_api.models.inline_response2002 import InlineResponse2002 from zrok_api.models.inline_response2003 import InlineResponse2003 +from zrok_api.models.inline_response2003_members import InlineResponse2003Members from zrok_api.models.inline_response2004 import InlineResponse2004 -from zrok_api.models.inline_response2004_members import InlineResponse2004Members +from zrok_api.models.inline_response2004_organizations import InlineResponse2004Organizations from zrok_api.models.inline_response2005 import InlineResponse2005 -from zrok_api.models.inline_response2005_organizations import InlineResponse2005Organizations +from zrok_api.models.inline_response2005_memberships import InlineResponse2005Memberships from zrok_api.models.inline_response2006 import InlineResponse2006 -from zrok_api.models.inline_response2006_memberships import InlineResponse2006Memberships -from zrok_api.models.inline_response2007 import InlineResponse2007 from zrok_api.models.inline_response201 import InlineResponse201 from zrok_api.models.inline_response2011 import InlineResponse2011 from zrok_api.models.invite_body import InviteBody diff --git a/sdk/python/sdk/zrok/zrok_api/api/account_api.py b/sdk/python/sdk/zrok/zrok_api/api/account_api.py index 384d8ba1..8a85d9e1 100644 --- a/sdk/python/sdk/zrok/zrok_api/api/account_api.py +++ b/sdk/python/sdk/zrok/zrok_api/api/account_api.py @@ -414,7 +414,7 @@ class AccountApi(object): :param async_req bool :param RegisterBody body: - :return: InlineResponse2001 + :return: InlineResponse200 If the method is called asynchronously, returns the request thread. """ @@ -435,7 +435,7 @@ class AccountApi(object): :param async_req bool :param RegisterBody body: - :return: InlineResponse2001 + :return: InlineResponse200 If the method is called asynchronously, returns the request thread. """ @@ -489,7 +489,7 @@ class AccountApi(object): body=body_params, post_params=form_params, files=local_var_files, - response_type='InlineResponse2001', # 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'), @@ -689,7 +689,7 @@ class AccountApi(object): :param async_req bool :param VerifyBody body: - :return: InlineResponse2002 + :return: InlineResponse2001 If the method is called asynchronously, returns the request thread. """ @@ -710,7 +710,7 @@ class AccountApi(object): :param async_req bool :param VerifyBody body: - :return: InlineResponse2002 + :return: InlineResponse2001 If the method is called asynchronously, returns the request thread. """ @@ -764,7 +764,7 @@ class AccountApi(object): body=body_params, post_params=form_params, files=local_var_files, - response_type='InlineResponse2002', # noqa: E501 + response_type='InlineResponse2001', # 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/admin_api.py b/sdk/python/sdk/zrok/zrok_api/api/admin_api.py index 12095cce..08ee4dc4 100644 --- a/sdk/python/sdk/zrok/zrok_api/api/admin_api.py +++ b/sdk/python/sdk/zrok/zrok_api/api/admin_api.py @@ -858,7 +858,7 @@ class AdminApi(object): >>> result = thread.get() :param async_req bool - :return: list[InlineResponse2003] + :return: list[InlineResponse2002] If the method is called asynchronously, returns the request thread. """ @@ -878,7 +878,7 @@ class AdminApi(object): >>> result = thread.get() :param async_req bool - :return: list[InlineResponse2003] + :return: list[InlineResponse2002] If the method is called asynchronously, returns the request thread. """ @@ -926,7 +926,7 @@ class AdminApi(object): body=body_params, post_params=form_params, files=local_var_files, - response_type='list[InlineResponse2003]', # noqa: E501 + response_type='list[InlineResponse2002]', # noqa: E501 auth_settings=auth_settings, async_req=params.get('async_req'), _return_http_data_only=params.get('_return_http_data_only'), @@ -944,7 +944,7 @@ class AdminApi(object): :param async_req bool :param OrganizationListBody body: - :return: InlineResponse2004 + :return: InlineResponse2003 If the method is called asynchronously, returns the request thread. """ @@ -965,7 +965,7 @@ class AdminApi(object): :param async_req bool :param OrganizationListBody body: - :return: InlineResponse2004 + :return: InlineResponse2003 If the method is called asynchronously, returns the request thread. """ @@ -1019,7 +1019,7 @@ class AdminApi(object): body=body_params, post_params=form_params, files=local_var_files, - response_type='InlineResponse2004', # noqa: E501 + response_type='InlineResponse2003', # noqa: E501 auth_settings=auth_settings, async_req=params.get('async_req'), _return_http_data_only=params.get('_return_http_data_only'), @@ -1036,7 +1036,7 @@ class AdminApi(object): >>> result = thread.get() :param async_req bool - :return: InlineResponse2005 + :return: InlineResponse2004 If the method is called asynchronously, returns the request thread. """ @@ -1056,7 +1056,7 @@ class AdminApi(object): >>> result = thread.get() :param async_req bool - :return: InlineResponse2005 + :return: InlineResponse2004 If the method is called asynchronously, returns the request thread. """ @@ -1104,7 +1104,7 @@ class AdminApi(object): body=body_params, post_params=form_params, files=local_var_files, - response_type='InlineResponse2005', # noqa: E501 + response_type='InlineResponse2004', # 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/metadata_api.py b/sdk/python/sdk/zrok/zrok_api/api/metadata_api.py index 402f43e3..9e784ed9 100644 --- a/sdk/python/sdk/zrok/zrok_api/api/metadata_api.py +++ b/sdk/python/sdk/zrok/zrok_api/api/metadata_api.py @@ -774,7 +774,7 @@ class MetadataApi(object): :param async_req bool :param SparklinesBody body: - :return: InlineResponse2007 + :return: InlineResponse2006 If the method is called asynchronously, returns the request thread. """ @@ -795,7 +795,7 @@ class MetadataApi(object): :param async_req bool :param SparklinesBody body: - :return: InlineResponse2007 + :return: InlineResponse2006 If the method is called asynchronously, returns the request thread. """ @@ -849,7 +849,7 @@ class MetadataApi(object): body=body_params, post_params=form_params, files=local_var_files, - response_type='InlineResponse2007', # noqa: E501 + response_type='InlineResponse2006', # noqa: E501 auth_settings=auth_settings, async_req=params.get('async_req'), _return_http_data_only=params.get('_return_http_data_only'), @@ -866,7 +866,7 @@ class MetadataApi(object): >>> result = thread.get() :param async_req bool - :return: InlineResponse2006 + :return: InlineResponse2005 If the method is called asynchronously, returns the request thread. """ @@ -886,7 +886,7 @@ class MetadataApi(object): >>> result = thread.get() :param async_req bool - :return: InlineResponse2006 + :return: InlineResponse2005 If the method is called asynchronously, returns the request thread. """ @@ -934,7 +934,7 @@ class MetadataApi(object): body=body_params, post_params=form_params, files=local_var_files, - response_type='InlineResponse2006', # noqa: E501 + response_type='InlineResponse2005', # noqa: E501 auth_settings=auth_settings, async_req=params.get('async_req'), _return_http_data_only=params.get('_return_http_data_only'), @@ -952,7 +952,7 @@ class MetadataApi(object): :param async_req bool :param str organization_token: (required) - :return: InlineResponse2004 + :return: InlineResponse2003 If the method is called asynchronously, returns the request thread. """ @@ -973,7 +973,7 @@ class MetadataApi(object): :param async_req bool :param str organization_token: (required) - :return: InlineResponse2004 + :return: InlineResponse2003 If the method is called asynchronously, returns the request thread. """ @@ -1027,7 +1027,7 @@ class MetadataApi(object): body=body_params, post_params=form_params, files=local_var_files, - response_type='InlineResponse2004', # noqa: E501 + response_type='InlineResponse2003', # 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 dc920900..9155362b 100644 --- a/sdk/python/sdk/zrok/zrok_api/models/__init__.py +++ b/sdk/python/sdk/zrok/zrok_api/models/__init__.py @@ -36,13 +36,12 @@ from zrok_api.models.inline_response200 import InlineResponse200 from zrok_api.models.inline_response2001 import InlineResponse2001 from zrok_api.models.inline_response2002 import InlineResponse2002 from zrok_api.models.inline_response2003 import InlineResponse2003 +from zrok_api.models.inline_response2003_members import InlineResponse2003Members from zrok_api.models.inline_response2004 import InlineResponse2004 -from zrok_api.models.inline_response2004_members import InlineResponse2004Members +from zrok_api.models.inline_response2004_organizations import InlineResponse2004Organizations from zrok_api.models.inline_response2005 import InlineResponse2005 -from zrok_api.models.inline_response2005_organizations import InlineResponse2005Organizations +from zrok_api.models.inline_response2005_memberships import InlineResponse2005Memberships from zrok_api.models.inline_response2006 import InlineResponse2006 -from zrok_api.models.inline_response2006_memberships import InlineResponse2006Memberships -from zrok_api.models.inline_response2007 import InlineResponse2007 from zrok_api.models.inline_response201 import InlineResponse201 from zrok_api.models.inline_response2011 import InlineResponse2011 from zrok_api.models.invite_body import InviteBody diff --git a/sdk/python/sdk/zrok/zrok_api/models/inline_response2001.py b/sdk/python/sdk/zrok/zrok_api/models/inline_response2001.py index 78ae4df5..32a1818a 100644 --- a/sdk/python/sdk/zrok/zrok_api/models/inline_response2001.py +++ b/sdk/python/sdk/zrok/zrok_api/models/inline_response2001.py @@ -28,40 +28,40 @@ class InlineResponse2001(object): and the value is json key in definition. """ swagger_types = { - 'token': 'str' + 'email': 'str' } attribute_map = { - 'token': 'token' + 'email': 'email' } - def __init__(self, token=None): # noqa: E501 + def __init__(self, email=None): # noqa: E501 """InlineResponse2001 - a model defined in Swagger""" # noqa: E501 - self._token = None + self._email = None self.discriminator = None - if token is not None: - self.token = token + if email is not None: + self.email = email @property - def token(self): - """Gets the token of this InlineResponse2001. # noqa: E501 + def email(self): + """Gets the email of this InlineResponse2001. # noqa: E501 - :return: The token of this InlineResponse2001. # noqa: E501 + :return: The email of this InlineResponse2001. # noqa: E501 :rtype: str """ - return self._token + return self._email - @token.setter - def token(self, token): - """Sets the token of this InlineResponse2001. + @email.setter + def email(self, email): + """Sets the email of this InlineResponse2001. - :param token: The token of this InlineResponse2001. # noqa: E501 + :param email: The email of this InlineResponse2001. # noqa: E501 :type: str """ - self._token = token + self._email = email def to_dict(self): """Returns the model properties as a dict""" 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 b617e524..7f57e60e 100644 --- a/sdk/python/sdk/zrok/zrok_api/models/inline_response2002.py +++ b/sdk/python/sdk/zrok/zrok_api/models/inline_response2002.py @@ -28,40 +28,170 @@ class InlineResponse2002(object): and the value is json key in definition. """ swagger_types = { - 'email': 'str' + 'token': 'str', + 'z_id': 'str', + 'url_template': 'str', + 'public_name': 'str', + 'created_at': 'int', + 'updated_at': 'int' } attribute_map = { - 'email': 'email' + 'token': 'token', + 'z_id': 'zId', + 'url_template': 'urlTemplate', + 'public_name': 'publicName', + 'created_at': 'createdAt', + 'updated_at': 'updatedAt' } - def __init__(self, email=None): # noqa: E501 + def __init__(self, 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._email = None + self._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 email is not None: - self.email = email + if token is not None: + self.token = token + if z_id is not None: + self.z_id = z_id + if url_template is not None: + self.url_template = url_template + if public_name is not None: + self.public_name = public_name + if created_at is not None: + self.created_at = created_at + if updated_at is not None: + self.updated_at = updated_at @property - def email(self): - """Gets the email of this InlineResponse2002. # noqa: E501 + def token(self): + """Gets the token of this InlineResponse2002. # noqa: E501 - :return: The email of this InlineResponse2002. # noqa: E501 + :return: The token of this InlineResponse2002. # noqa: E501 :rtype: str """ - return self._email + return self._token - @email.setter - def email(self, email): - """Sets the email of this InlineResponse2002. + @token.setter + def token(self, token): + """Sets the token of this InlineResponse2002. - :param email: The email of this InlineResponse2002. # noqa: E501 + :param token: The token of this InlineResponse2002. # noqa: E501 :type: str """ - self._email = email + self._token = token + + @property + def z_id(self): + """Gets the z_id of this InlineResponse2002. # noqa: E501 + + + :return: The z_id of this InlineResponse2002. # noqa: E501 + :rtype: str + """ + return self._z_id + + @z_id.setter + def z_id(self, z_id): + """Sets the z_id of this InlineResponse2002. + + + :param z_id: The z_id of this InlineResponse2002. # noqa: E501 + :type: str + """ + + self._z_id = z_id + + @property + def url_template(self): + """Gets the url_template of this InlineResponse2002. # noqa: E501 + + + :return: The url_template of this InlineResponse2002. # noqa: E501 + :rtype: str + """ + return self._url_template + + @url_template.setter + def url_template(self, url_template): + """Sets the url_template of this InlineResponse2002. + + + :param url_template: The url_template of this InlineResponse2002. # noqa: E501 + :type: str + """ + + self._url_template = url_template + + @property + def public_name(self): + """Gets the public_name of this InlineResponse2002. # noqa: E501 + + + :return: The public_name of this InlineResponse2002. # noqa: E501 + :rtype: str + """ + return self._public_name + + @public_name.setter + def public_name(self, public_name): + """Sets the public_name of this InlineResponse2002. + + + :param public_name: The public_name of this InlineResponse2002. # noqa: E501 + :type: str + """ + + self._public_name = public_name + + @property + def created_at(self): + """Gets the created_at of this InlineResponse2002. # noqa: E501 + + + :return: The created_at of this InlineResponse2002. # noqa: E501 + :rtype: int + """ + return self._created_at + + @created_at.setter + def created_at(self, created_at): + """Sets the created_at of this InlineResponse2002. + + + :param created_at: The created_at of this InlineResponse2002. # noqa: E501 + :type: int + """ + + self._created_at = created_at + + @property + def updated_at(self): + """Gets the updated_at of this InlineResponse2002. # noqa: E501 + + + :return: The updated_at of this InlineResponse2002. # noqa: E501 + :rtype: int + """ + return self._updated_at + + @updated_at.setter + def updated_at(self, updated_at): + """Sets the updated_at of this InlineResponse2002. + + + :param updated_at: The updated_at of this InlineResponse2002. # noqa: E501 + :type: int + """ + + self._updated_at = updated_at def to_dict(self): """Returns the model properties as a dict""" diff --git a/sdk/python/sdk/zrok/zrok_api/models/inline_response2003.py b/sdk/python/sdk/zrok/zrok_api/models/inline_response2003.py index 2c2557a1..93926054 100644 --- a/sdk/python/sdk/zrok/zrok_api/models/inline_response2003.py +++ b/sdk/python/sdk/zrok/zrok_api/models/inline_response2003.py @@ -28,170 +28,40 @@ class InlineResponse2003(object): and the value is json key in definition. """ swagger_types = { - 'token': 'str', - 'z_id': 'str', - 'url_template': 'str', - 'public_name': 'str', - 'created_at': 'int', - 'updated_at': 'int' + 'members': 'list[InlineResponse2003Members]' } attribute_map = { - 'token': 'token', - 'z_id': 'zId', - 'url_template': 'urlTemplate', - 'public_name': 'publicName', - 'created_at': 'createdAt', - 'updated_at': 'updatedAt' + 'members': 'members' } - 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, members=None): # noqa: E501 """InlineResponse2003 - a model defined in Swagger""" # noqa: E501 - self._token = None - self._z_id = None - self._url_template = None - self._public_name = None - self._created_at = None - self._updated_at = None + self._members = None self.discriminator = None - if token is not None: - self.token = token - if z_id is not None: - self.z_id = z_id - if url_template is not None: - self.url_template = url_template - if public_name is not None: - self.public_name = public_name - if created_at is not None: - self.created_at = created_at - if updated_at is not None: - self.updated_at = updated_at + if members is not None: + self.members = members @property - def token(self): - """Gets the token of this InlineResponse2003. # noqa: E501 + def members(self): + """Gets the members of this InlineResponse2003. # noqa: E501 - :return: The token of this InlineResponse2003. # noqa: E501 - :rtype: str + :return: The members of this InlineResponse2003. # noqa: E501 + :rtype: list[InlineResponse2003Members] """ - return self._token + return self._members - @token.setter - def token(self, token): - """Sets the token of this InlineResponse2003. + @members.setter + def members(self, members): + """Sets the members of this InlineResponse2003. - :param token: The token of this InlineResponse2003. # noqa: E501 - :type: str + :param members: The members of this InlineResponse2003. # noqa: E501 + :type: list[InlineResponse2003Members] """ - self._token = token - - @property - def z_id(self): - """Gets the z_id of this InlineResponse2003. # noqa: E501 - - - :return: The z_id of this InlineResponse2003. # noqa: E501 - :rtype: str - """ - return self._z_id - - @z_id.setter - def z_id(self, z_id): - """Sets the z_id of this InlineResponse2003. - - - :param z_id: The z_id of this InlineResponse2003. # noqa: E501 - :type: str - """ - - self._z_id = z_id - - @property - def url_template(self): - """Gets the url_template of this InlineResponse2003. # noqa: E501 - - - :return: The url_template of this InlineResponse2003. # noqa: E501 - :rtype: str - """ - return self._url_template - - @url_template.setter - def url_template(self, url_template): - """Sets the url_template of this InlineResponse2003. - - - :param url_template: The url_template of this InlineResponse2003. # noqa: E501 - :type: str - """ - - self._url_template = url_template - - @property - def public_name(self): - """Gets the public_name of this InlineResponse2003. # noqa: E501 - - - :return: The public_name of this InlineResponse2003. # noqa: E501 - :rtype: str - """ - return self._public_name - - @public_name.setter - def public_name(self, public_name): - """Sets the public_name of this InlineResponse2003. - - - :param public_name: The public_name of this InlineResponse2003. # noqa: E501 - :type: str - """ - - self._public_name = public_name - - @property - def created_at(self): - """Gets the created_at of this InlineResponse2003. # noqa: E501 - - - :return: The created_at of this InlineResponse2003. # noqa: E501 - :rtype: int - """ - return self._created_at - - @created_at.setter - def created_at(self, created_at): - """Sets the created_at of this InlineResponse2003. - - - :param created_at: The created_at of this InlineResponse2003. # noqa: E501 - :type: int - """ - - self._created_at = created_at - - @property - def updated_at(self): - """Gets the updated_at of this InlineResponse2003. # noqa: E501 - - - :return: The updated_at of this InlineResponse2003. # noqa: E501 - :rtype: int - """ - return self._updated_at - - @updated_at.setter - def updated_at(self, updated_at): - """Sets the updated_at of this InlineResponse2003. - - - :param updated_at: The updated_at of this InlineResponse2003. # noqa: E501 - :type: int - """ - - self._updated_at = updated_at + self._members = members def to_dict(self): """Returns the model properties as a dict""" diff --git a/sdk/python/sdk/zrok/zrok_api/models/inline_response2004.py b/sdk/python/sdk/zrok/zrok_api/models/inline_response2004.py index 97b793cf..d0a55eb0 100644 --- a/sdk/python/sdk/zrok/zrok_api/models/inline_response2004.py +++ b/sdk/python/sdk/zrok/zrok_api/models/inline_response2004.py @@ -28,40 +28,40 @@ class InlineResponse2004(object): and the value is json key in definition. """ swagger_types = { - 'members': 'list[InlineResponse2004Members]' + 'organizations': 'list[InlineResponse2004Organizations]' } attribute_map = { - 'members': 'members' + 'organizations': 'organizations' } - def __init__(self, members=None): # noqa: E501 + def __init__(self, organizations=None): # noqa: E501 """InlineResponse2004 - a model defined in Swagger""" # noqa: E501 - self._members = None + self._organizations = None self.discriminator = None - if members is not None: - self.members = members + if organizations is not None: + self.organizations = organizations @property - def members(self): - """Gets the members of this InlineResponse2004. # noqa: E501 + def organizations(self): + """Gets the organizations of this InlineResponse2004. # noqa: E501 - :return: The members of this InlineResponse2004. # noqa: E501 - :rtype: list[InlineResponse2004Members] + :return: The organizations of this InlineResponse2004. # noqa: E501 + :rtype: list[InlineResponse2004Organizations] """ - return self._members + return self._organizations - @members.setter - def members(self, members): - """Sets the members of this InlineResponse2004. + @organizations.setter + def organizations(self, organizations): + """Sets the organizations of this InlineResponse2004. - :param members: The members of this InlineResponse2004. # noqa: E501 - :type: list[InlineResponse2004Members] + :param organizations: The organizations of this InlineResponse2004. # noqa: E501 + :type: list[InlineResponse2004Organizations] """ - self._members = members + self._organizations = organizations def to_dict(self): """Returns the model properties as a dict""" diff --git a/sdk/python/sdk/zrok/zrok_api/models/inline_response2005.py b/sdk/python/sdk/zrok/zrok_api/models/inline_response2005.py index e4e7f092..3fa22e9d 100644 --- a/sdk/python/sdk/zrok/zrok_api/models/inline_response2005.py +++ b/sdk/python/sdk/zrok/zrok_api/models/inline_response2005.py @@ -28,40 +28,40 @@ class InlineResponse2005(object): and the value is json key in definition. """ swagger_types = { - 'organizations': 'list[InlineResponse2005Organizations]' + 'memberships': 'list[InlineResponse2005Memberships]' } attribute_map = { - 'organizations': 'organizations' + 'memberships': 'memberships' } - def __init__(self, organizations=None): # noqa: E501 + def __init__(self, memberships=None): # noqa: E501 """InlineResponse2005 - a model defined in Swagger""" # noqa: E501 - self._organizations = None + self._memberships = None self.discriminator = None - if organizations is not None: - self.organizations = organizations + if memberships is not None: + self.memberships = memberships @property - def organizations(self): - """Gets the organizations of this InlineResponse2005. # noqa: E501 + def memberships(self): + """Gets the memberships of this InlineResponse2005. # noqa: E501 - :return: The organizations of this InlineResponse2005. # noqa: E501 - :rtype: list[InlineResponse2005Organizations] + :return: The memberships of this InlineResponse2005. # noqa: E501 + :rtype: list[InlineResponse2005Memberships] """ - return self._organizations + return self._memberships - @organizations.setter - def organizations(self, organizations): - """Sets the organizations of this InlineResponse2005. + @memberships.setter + def memberships(self, memberships): + """Sets the memberships of this InlineResponse2005. - :param organizations: The organizations of this InlineResponse2005. # noqa: E501 - :type: list[InlineResponse2005Organizations] + :param memberships: The memberships of this InlineResponse2005. # noqa: E501 + :type: list[InlineResponse2005Memberships] """ - self._organizations = organizations + self._memberships = memberships def to_dict(self): """Returns the model properties as a dict""" diff --git a/sdk/python/sdk/zrok/zrok_api/models/inline_response2006.py b/sdk/python/sdk/zrok/zrok_api/models/inline_response2006.py index 3be494da..5757905a 100644 --- a/sdk/python/sdk/zrok/zrok_api/models/inline_response2006.py +++ b/sdk/python/sdk/zrok/zrok_api/models/inline_response2006.py @@ -28,40 +28,40 @@ class InlineResponse2006(object): and the value is json key in definition. """ swagger_types = { - 'memberships': 'list[InlineResponse2006Memberships]' + 'sparklines': 'list[Metrics]' } attribute_map = { - 'memberships': 'memberships' + 'sparklines': 'sparklines' } - def __init__(self, memberships=None): # noqa: E501 + def __init__(self, sparklines=None): # noqa: E501 """InlineResponse2006 - a model defined in Swagger""" # noqa: E501 - self._memberships = None + self._sparklines = None self.discriminator = None - if memberships is not None: - self.memberships = memberships + if sparklines is not None: + self.sparklines = sparklines @property - def memberships(self): - """Gets the memberships of this InlineResponse2006. # noqa: E501 + def sparklines(self): + """Gets the sparklines of this InlineResponse2006. # noqa: E501 - :return: The memberships of this InlineResponse2006. # noqa: E501 - :rtype: list[InlineResponse2006Memberships] + :return: The sparklines of this InlineResponse2006. # noqa: E501 + :rtype: list[Metrics] """ - return self._memberships + return self._sparklines - @memberships.setter - def memberships(self, memberships): - """Sets the memberships of this InlineResponse2006. + @sparklines.setter + def sparklines(self, sparklines): + """Sets the sparklines of this InlineResponse2006. - :param memberships: The memberships of this InlineResponse2006. # noqa: E501 - :type: list[InlineResponse2006Memberships] + :param sparklines: The sparklines of this InlineResponse2006. # noqa: E501 + :type: list[Metrics] """ - self._memberships = memberships + self._sparklines = sparklines 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 1927298e..47587533 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 = { - 'token': 'str', + 'reg_token': 'str', 'password': 'str' } attribute_map = { - 'token': 'token', + 'reg_token': 'regToken', 'password': 'password' } - def __init__(self, token=None, password=None): # noqa: E501 + def __init__(self, reg_token=None, password=None): # noqa: E501 """RegisterBody - a model defined in Swagger""" # noqa: E501 - self._token = None + self._reg_token = None self._password = None self.discriminator = None - if token is not None: - self.token = token + if reg_token is not None: + self.reg_token = reg_token if password is not None: self.password = password @property - def token(self): - """Gets the token of this RegisterBody. # noqa: E501 + def reg_token(self): + """Gets the reg_token of this RegisterBody. # noqa: E501 - :return: The token of this RegisterBody. # noqa: E501 + :return: The reg_token of this RegisterBody. # noqa: E501 :rtype: str """ - return self._token + return self._reg_token - @token.setter - def token(self, token): - """Sets the token of this RegisterBody. + @reg_token.setter + def reg_token(self, reg_token): + """Sets the reg_token of this RegisterBody. - :param token: The token of this RegisterBody. # noqa: E501 + :param reg_token: The reg_token of this RegisterBody. # noqa: E501 :type: str """ - self._token = token + self._reg_token = reg_token @property def password(self): diff --git a/specs/zrok.yml b/specs/zrok.yml index cf49c6ec..a52fe1b6 100644 --- a/specs/zrok.yml +++ b/specs/zrok.yml @@ -131,7 +131,7 @@ paths: in: body schema: properties: - token: + regToken: type: string password: type: string @@ -140,7 +140,7 @@ paths: description: account created schema: properties: - token: + accountToken: type: string 404: description: request not found diff --git a/ui/src/api/.openapi-generator/FILES b/ui/src/api/.openapi-generator/FILES index 6edc257e..39673d79 100644 --- a/ui/src/api/.openapi-generator/FILES +++ b/ui/src/api/.openapi-generator/FILES @@ -39,9 +39,9 @@ models/Overview.ts models/Principal.ts models/RegenerateAccountToken200Response.ts models/RegenerateAccountTokenRequest.ts -models/Register200Response.ts models/RegisterRequest.ts models/RemoveOrganizationMemberRequest.ts +models/ResetPasswordRequest.ts models/Share.ts models/ShareRequest.ts models/ShareResponse.ts @@ -51,5 +51,6 @@ models/UnshareRequest.ts models/UpdateFrontendRequest.ts models/UpdateShareRequest.ts models/Verify200Response.ts +models/VerifyRequest.ts models/index.ts runtime.ts diff --git a/ui/src/api/apis/AccountApi.ts b/ui/src/api/apis/AccountApi.ts index c77567bf..e18bfaa2 100644 --- a/ui/src/api/apis/AccountApi.ts +++ b/ui/src/api/apis/AccountApi.ts @@ -20,9 +20,10 @@ import type { LoginRequest, RegenerateAccountToken200Response, RegenerateAccountTokenRequest, - Register200Response, RegisterRequest, + ResetPasswordRequest, Verify200Response, + VerifyRequest, } from '../models/index'; import { ChangePasswordRequestFromJSON, @@ -35,12 +36,14 @@ import { RegenerateAccountToken200ResponseToJSON, RegenerateAccountTokenRequestFromJSON, RegenerateAccountTokenRequestToJSON, - Register200ResponseFromJSON, - Register200ResponseToJSON, RegisterRequestFromJSON, RegisterRequestToJSON, + ResetPasswordRequestFromJSON, + ResetPasswordRequestToJSON, Verify200ResponseFromJSON, Verify200ResponseToJSON, + VerifyRequestFromJSON, + VerifyRequestToJSON, } from '../models/index'; export interface ChangePasswordOperationRequest { @@ -63,16 +66,16 @@ export interface RegisterOperationRequest { body?: RegisterRequest; } -export interface ResetPasswordRequest { - body?: RegisterRequest; +export interface ResetPasswordOperationRequest { + body?: ResetPasswordRequest; } export interface ResetPasswordRequestRequest { body?: RegenerateAccountTokenRequest; } -export interface VerifyRequest { - body?: Register200Response; +export interface VerifyOperationRequest { + body?: VerifyRequest; } /** @@ -200,7 +203,7 @@ export class AccountApi extends runtime.BaseAPI { /** */ - async registerRaw(requestParameters: RegisterOperationRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { + async registerRaw(requestParameters: RegisterOperationRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { const queryParameters: any = {}; const headerParameters: runtime.HTTPHeaders = {}; @@ -215,19 +218,19 @@ export class AccountApi extends runtime.BaseAPI { body: RegisterRequestToJSON(requestParameters['body']), }, initOverrides); - return new runtime.JSONApiResponse(response, (jsonValue) => Register200ResponseFromJSON(jsonValue)); + return new runtime.JSONApiResponse(response, (jsonValue) => RegenerateAccountToken200ResponseFromJSON(jsonValue)); } /** */ - async register(requestParameters: RegisterOperationRequest = {}, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { + async register(requestParameters: RegisterOperationRequest = {}, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { const response = await this.registerRaw(requestParameters, initOverrides); return await response.value(); } /** */ - async resetPasswordRaw(requestParameters: ResetPasswordRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { + async resetPasswordRaw(requestParameters: ResetPasswordOperationRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { const queryParameters: any = {}; const headerParameters: runtime.HTTPHeaders = {}; @@ -239,7 +242,7 @@ export class AccountApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: RegisterRequestToJSON(requestParameters['body']), + body: ResetPasswordRequestToJSON(requestParameters['body']), }, initOverrides); return new runtime.VoidApiResponse(response); @@ -247,7 +250,7 @@ export class AccountApi extends runtime.BaseAPI { /** */ - async resetPassword(requestParameters: ResetPasswordRequest = {}, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { + async resetPassword(requestParameters: ResetPasswordOperationRequest = {}, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { await this.resetPasswordRaw(requestParameters, initOverrides); } @@ -279,7 +282,7 @@ export class AccountApi extends runtime.BaseAPI { /** */ - async verifyRaw(requestParameters: VerifyRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { + async verifyRaw(requestParameters: VerifyOperationRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { const queryParameters: any = {}; const headerParameters: runtime.HTTPHeaders = {}; @@ -291,7 +294,7 @@ export class AccountApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: Register200ResponseToJSON(requestParameters['body']), + body: VerifyRequestToJSON(requestParameters['body']), }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => Verify200ResponseFromJSON(jsonValue)); @@ -299,7 +302,7 @@ export class AccountApi extends runtime.BaseAPI { /** */ - async verify(requestParameters: VerifyRequest = {}, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { + async verify(requestParameters: VerifyOperationRequest = {}, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { const response = await this.verifyRaw(requestParameters, initOverrides); return await response.value(); } diff --git a/ui/src/api/apis/AdminApi.ts b/ui/src/api/apis/AdminApi.ts index bd7bffa2..7acd7dfb 100644 --- a/ui/src/api/apis/AdminApi.ts +++ b/ui/src/api/apis/AdminApi.ts @@ -26,10 +26,10 @@ import type { ListOrganizationMembers200Response, ListOrganizations200Response, LoginRequest, - Register200Response, RemoveOrganizationMemberRequest, UpdateFrontendRequest, Verify200Response, + VerifyRequest, } from '../models/index'; import { AddOrganizationMemberRequestFromJSON, @@ -54,14 +54,14 @@ import { ListOrganizations200ResponseToJSON, LoginRequestFromJSON, LoginRequestToJSON, - Register200ResponseFromJSON, - Register200ResponseToJSON, RemoveOrganizationMemberRequestFromJSON, RemoveOrganizationMemberRequestToJSON, UpdateFrontendRequestFromJSON, UpdateFrontendRequestToJSON, Verify200ResponseFromJSON, Verify200ResponseToJSON, + VerifyRequestFromJSON, + VerifyRequestToJSON, } from '../models/index'; export interface AddOrganizationMemberOperationRequest { @@ -89,7 +89,7 @@ export interface DeleteFrontendOperationRequest { } export interface DeleteOrganizationRequest { - body?: Register200Response; + body?: VerifyRequest; } export interface GrantsRequest { @@ -101,7 +101,7 @@ export interface InviteTokenGenerateOperationRequest { } export interface ListOrganizationMembersRequest { - body?: Register200Response; + body?: VerifyRequest; } export interface RemoveOrganizationMemberOperationRequest { @@ -149,7 +149,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,19 +168,19 @@ export class AdminApi extends runtime.BaseAPI { body: LoginRequestToJSON(requestParameters['body']), }, initOverrides); - return new runtime.JSONApiResponse(response, (jsonValue) => Register200ResponseFromJSON(jsonValue)); + return new runtime.JSONApiResponse(response, (jsonValue) => VerifyRequestFromJSON(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(); } /** */ - 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 = {}; @@ -199,12 +199,12 @@ export class AdminApi extends runtime.BaseAPI { body: CreateFrontendRequestToJSON(requestParameters['body']), }, initOverrides); - return new runtime.JSONApiResponse(response, (jsonValue) => Register200ResponseFromJSON(jsonValue)); + return new runtime.JSONApiResponse(response, (jsonValue) => VerifyRequestFromJSON(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(); } @@ -242,7 +242,7 @@ export class AdminApi extends runtime.BaseAPI { /** */ - async createOrganizationRaw(requestParameters: CreateOrganizationOperationRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { + async createOrganizationRaw(requestParameters: CreateOrganizationOperationRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { const queryParameters: any = {}; const headerParameters: runtime.HTTPHeaders = {}; @@ -261,12 +261,12 @@ export class AdminApi extends runtime.BaseAPI { body: CreateOrganizationRequestToJSON(requestParameters['body']), }, initOverrides); - return new runtime.JSONApiResponse(response, (jsonValue) => Register200ResponseFromJSON(jsonValue)); + return new runtime.JSONApiResponse(response, (jsonValue) => VerifyRequestFromJSON(jsonValue)); } /** */ - async createOrganization(requestParameters: CreateOrganizationOperationRequest = {}, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { + async createOrganization(requestParameters: CreateOrganizationOperationRequest = {}, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { const response = await this.createOrganizationRaw(requestParameters, initOverrides); return await response.value(); } @@ -319,7 +319,7 @@ export class AdminApi extends runtime.BaseAPI { method: 'DELETE', headers: headerParameters, query: queryParameters, - body: Register200ResponseToJSON(requestParameters['body']), + body: VerifyRequestToJSON(requestParameters['body']), }, initOverrides); return new runtime.VoidApiResponse(response); @@ -437,7 +437,7 @@ export class AdminApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: Register200ResponseToJSON(requestParameters['body']), + body: VerifyRequestToJSON(requestParameters['body']), }, initOverrides); return new runtime.JSONApiResponse(response, (jsonValue) => ListOrganizationMembers200ResponseFromJSON(jsonValue)); diff --git a/ui/src/api/models/RegisterRequest.ts b/ui/src/api/models/RegisterRequest.ts index 5bfb2af2..3109f318 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 */ - token?: string; + regToken?: string; /** * * @type {string} @@ -50,7 +50,7 @@ export function RegisterRequestFromJSONTyped(json: any, ignoreDiscriminator: boo } return { - 'token': json['token'] == null ? undefined : json['token'], + 'regToken': json['regToken'] == null ? undefined : json['regToken'], 'password': json['password'] == null ? undefined : json['password'], }; } @@ -61,7 +61,7 @@ export function RegisterRequestToJSON(value?: RegisterRequest | null): any { } return { - 'token': value['token'], + 'regToken': value['regToken'], 'password': value['password'], }; } diff --git a/ui/src/api/models/index.ts b/ui/src/api/models/index.ts index 951e9d15..89b219bd 100644 --- a/ui/src/api/models/index.ts +++ b/ui/src/api/models/index.ts @@ -34,9 +34,9 @@ export * from './Overview'; export * from './Principal'; export * from './RegenerateAccountToken200Response'; export * from './RegenerateAccountTokenRequest'; -export * from './Register200Response'; export * from './RegisterRequest'; export * from './RemoveOrganizationMemberRequest'; +export * from './ResetPasswordRequest'; export * from './Share'; export * from './ShareRequest'; export * from './ShareResponse'; @@ -46,3 +46,4 @@ export * from './UnshareRequest'; export * from './UpdateFrontendRequest'; export * from './UpdateShareRequest'; export * from './Verify200Response'; +export * from './VerifyRequest';