reset -> regenerate (#191)

This commit is contained in:
Michael Quigley
2024-02-20 11:40:11 -05:00
parent 778e50c056
commit a7194aecf6
25 changed files with 1042 additions and 1045 deletions

View File

@ -1 +1 @@
3.0.52
3.0.51

View File

@ -55,11 +55,11 @@ from zrok_api.models.password_requirements import PasswordRequirements
from zrok_api.models.principal import Principal
from zrok_api.models.public_frontend import PublicFrontend
from zrok_api.models.public_frontend_list import PublicFrontendList
from zrok_api.models.regenerate_token_body import RegenerateTokenBody
from zrok_api.models.register_request import RegisterRequest
from zrok_api.models.register_response import RegisterResponse
from zrok_api.models.reset_password_request import ResetPasswordRequest
from zrok_api.models.reset_password_request_body import ResetPasswordRequestBody
from zrok_api.models.reset_token_body import ResetTokenBody
from zrok_api.models.share import Share
from zrok_api.models.share_request import ShareRequest
from zrok_api.models.share_response import ShareResponse

View File

@ -311,6 +311,99 @@ class AccountApi(object):
_request_timeout=params.get('_request_timeout'),
collection_formats=collection_formats)
def regenerate_token(self, **kwargs): # noqa: E501
"""regenerate_token # noqa: E501
This method makes a synchronous HTTP request by default. To make an
asynchronous HTTP request, please pass async_req=True
>>> thread = api.regenerate_token(async_req=True)
>>> result = thread.get()
:param async_req bool
:param RegenerateTokenBody body:
:return: InlineResponse200
If the method is called asynchronously,
returns the request thread.
"""
kwargs['_return_http_data_only'] = True
if kwargs.get('async_req'):
return self.regenerate_token_with_http_info(**kwargs) # noqa: E501
else:
(data) = self.regenerate_token_with_http_info(**kwargs) # noqa: E501
return data
def regenerate_token_with_http_info(self, **kwargs): # noqa: E501
"""regenerate_token # noqa: E501
This method makes a synchronous HTTP request by default. To make an
asynchronous HTTP request, please pass async_req=True
>>> thread = api.regenerate_token_with_http_info(async_req=True)
>>> result = thread.get()
:param async_req bool
:param RegenerateTokenBody body:
:return: InlineResponse200
If the method is called asynchronously,
returns the request thread.
"""
all_params = ['body'] # noqa: E501
all_params.append('async_req')
all_params.append('_return_http_data_only')
all_params.append('_preload_content')
all_params.append('_request_timeout')
params = locals()
for key, val in six.iteritems(params['kwargs']):
if key not in all_params:
raise TypeError(
"Got an unexpected keyword argument '%s'"
" to method regenerate_token" % key
)
params[key] = val
del params['kwargs']
collection_formats = {}
path_params = {}
query_params = []
header_params = {}
form_params = []
local_var_files = {}
body_params = None
if 'body' in params:
body_params = params['body']
# HTTP header `Accept`
header_params['Accept'] = self.api_client.select_header_accept(
['application/zrok.v1+json']) # noqa: E501
# HTTP header `Content-Type`
header_params['Content-Type'] = self.api_client.select_header_content_type( # noqa: E501
['application/zrok.v1+json']) # noqa: E501
# Authentication setting
auth_settings = ['key'] # noqa: E501
return self.api_client.call_api(
'/regenerateToken', 'POST',
path_params,
query_params,
header_params,
body=body_params,
post_params=form_params,
files=local_var_files,
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'),
_preload_content=params.get('_preload_content', True),
_request_timeout=params.get('_request_timeout'),
collection_formats=collection_formats)
def register(self, **kwargs): # noqa: E501
"""register # noqa: E501
@ -586,99 +679,6 @@ class AccountApi(object):
_request_timeout=params.get('_request_timeout'),
collection_formats=collection_formats)
def reset_token(self, **kwargs): # noqa: E501
"""reset_token # noqa: E501
This method makes a synchronous HTTP request by default. To make an
asynchronous HTTP request, please pass async_req=True
>>> thread = api.reset_token(async_req=True)
>>> result = thread.get()
:param async_req bool
:param ResetTokenBody body:
:return: InlineResponse200
If the method is called asynchronously,
returns the request thread.
"""
kwargs['_return_http_data_only'] = True
if kwargs.get('async_req'):
return self.reset_token_with_http_info(**kwargs) # noqa: E501
else:
(data) = self.reset_token_with_http_info(**kwargs) # noqa: E501
return data
def reset_token_with_http_info(self, **kwargs): # noqa: E501
"""reset_token # noqa: E501
This method makes a synchronous HTTP request by default. To make an
asynchronous HTTP request, please pass async_req=True
>>> thread = api.reset_token_with_http_info(async_req=True)
>>> result = thread.get()
:param async_req bool
:param ResetTokenBody body:
:return: InlineResponse200
If the method is called asynchronously,
returns the request thread.
"""
all_params = ['body'] # noqa: E501
all_params.append('async_req')
all_params.append('_return_http_data_only')
all_params.append('_preload_content')
all_params.append('_request_timeout')
params = locals()
for key, val in six.iteritems(params['kwargs']):
if key not in all_params:
raise TypeError(
"Got an unexpected keyword argument '%s'"
" to method reset_token" % key
)
params[key] = val
del params['kwargs']
collection_formats = {}
path_params = {}
query_params = []
header_params = {}
form_params = []
local_var_files = {}
body_params = None
if 'body' in params:
body_params = params['body']
# HTTP header `Accept`
header_params['Accept'] = self.api_client.select_header_accept(
['application/zrok.v1+json']) # noqa: E501
# HTTP header `Content-Type`
header_params['Content-Type'] = self.api_client.select_header_content_type( # noqa: E501
['application/zrok.v1+json']) # noqa: E501
# Authentication setting
auth_settings = ['key'] # noqa: E501
return self.api_client.call_api(
'/resetToken', 'POST',
path_params,
query_params,
header_params,
body=body_params,
post_params=form_params,
files=local_var_files,
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'),
_preload_content=params.get('_preload_content', True),
_request_timeout=params.get('_request_timeout'),
collection_formats=collection_formats)
def verify(self, **kwargs): # noqa: E501
"""verify # noqa: E501

View File

@ -219,12 +219,9 @@ class Configuration(six.with_metaclass(TypeWithDefault, object)):
:return: The token for basic HTTP authentication.
"""
token = ""
if self.username or self.password:
token = urllib3.util.make_headers(
basic_auth=self.username + ':' + self.password
).get('authorization')
return token
return urllib3.util.make_headers(
basic_auth=self.username + ':' + self.password
).get('authorization')
def auth_settings(self):
"""Gets Auth Settings dict for api client.

View File

@ -45,11 +45,11 @@ from zrok_api.models.password_requirements import PasswordRequirements
from zrok_api.models.principal import Principal
from zrok_api.models.public_frontend import PublicFrontend
from zrok_api.models.public_frontend_list import PublicFrontendList
from zrok_api.models.regenerate_token_body import RegenerateTokenBody
from zrok_api.models.register_request import RegisterRequest
from zrok_api.models.register_response import RegisterResponse
from zrok_api.models.reset_password_request import ResetPasswordRequest
from zrok_api.models.reset_password_request_body import ResetPasswordRequestBody
from zrok_api.models.reset_token_body import ResetTokenBody
from zrok_api.models.share import Share
from zrok_api.models.share_request import ShareRequest
from zrok_api.models.share_response import ShareResponse

View File

@ -15,7 +15,7 @@ import re # noqa: F401
import six
class ResetTokenBody(object):
class RegenerateTokenBody(object):
"""NOTE: This class is auto generated by the swagger code generator program.
Do not edit the class manually.
@ -36,7 +36,7 @@ class ResetTokenBody(object):
}
def __init__(self, email_address=None): # noqa: E501
"""ResetTokenBody - a model defined in Swagger""" # noqa: E501
"""RegenerateTokenBody - a model defined in Swagger""" # noqa: E501
self._email_address = None
self.discriminator = None
if email_address is not None:
@ -44,20 +44,20 @@ class ResetTokenBody(object):
@property
def email_address(self):
"""Gets the email_address of this ResetTokenBody. # noqa: E501
"""Gets the email_address of this RegenerateTokenBody. # noqa: E501
:return: The email_address of this ResetTokenBody. # noqa: E501
:return: The email_address of this RegenerateTokenBody. # noqa: E501
:rtype: str
"""
return self._email_address
@email_address.setter
def email_address(self, email_address):
"""Sets the email_address of this ResetTokenBody.
"""Sets the email_address of this RegenerateTokenBody.
:param email_address: The email_address of this ResetTokenBody. # noqa: E501
:param email_address: The email_address of this RegenerateTokenBody. # noqa: E501
:type: str
"""
@ -84,7 +84,7 @@ class ResetTokenBody(object):
))
else:
result[attr] = value
if issubclass(ResetTokenBody, dict):
if issubclass(RegenerateTokenBody, dict):
for key, value in self.items():
result[key] = value
@ -100,7 +100,7 @@ class ResetTokenBody(object):
def __eq__(self, other):
"""Returns true if both objects are equal"""
if not isinstance(other, ResetTokenBody):
if not isinstance(other, RegenerateTokenBody):
return False
return self.__dict__ == other.__dict__

View File

@ -42,11 +42,11 @@ class RESTResponse(io.IOBase):
def getheaders(self):
"""Returns a dictionary of the response headers."""
return self.urllib3_response.headers
return self.urllib3_response.getheaders()
def getheader(self, name, default=None):
"""Returns a given response header."""
return self.urllib3_response.headers.get(name, default)
return self.urllib3_response.getheader(name, default)
class RESTClientObject(object):