From 90e25f6f4ce778576927ad57bee2c026e288ce87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=BDilvinas=20Urbonas?= Date: Fri, 5 Feb 2021 23:09:53 +0200 Subject: [PATCH] [BUG][Python] init access token for python client configuration (#7469) * fix: init access token for python client configuration * fix: remove duplicate initializations for access_token --- .../main/resources/python/configuration.mustache | 14 ++------------ .../python-asyncio/petstore_api/configuration.py | 5 ++--- .../python-tornado/petstore_api/configuration.py | 5 ++--- .../petstore/python/petstore_api/configuration.py | 5 ++--- .../petstore/python/petstore_api/configuration.py | 5 ++--- 5 files changed, 10 insertions(+), 24 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/python/configuration.mustache b/modules/openapi-generator/src/main/resources/python/configuration.mustache index 2f698db3feca..9ab0a8408997 100644 --- a/modules/openapi-generator/src/main/resources/python/configuration.mustache +++ b/modules/openapi-generator/src/main/resources/python/configuration.mustache @@ -163,6 +163,7 @@ conf = {{{packageName}}}.Configuration( def __init__(self, host=None, api_key=None, api_key_prefix=None, + access_token=None, username=None, password=None, discard_unknown_keys=False, disabled_client_side_validations="", @@ -190,6 +191,7 @@ conf = {{{packageName}}}.Configuration( """Temp file folder for downloading files """ # Authentication Settings + self.access_token = access_token self.api_key = {} if api_key: self.api_key = api_key @@ -218,18 +220,6 @@ conf = {{{packageName}}}.Configuration( """The HTTP signing configuration """ {{/hasHttpSignatureMethods}} -{{#hasOAuthMethods}} - self.access_token = None - """access token for OAuth/Bearer - """ -{{/hasOAuthMethods}} -{{^hasOAuthMethods}} -{{#hasBearerMethods}} - self.access_token = None - """access token for OAuth/Bearer - """ -{{/hasBearerMethods}} -{{/hasOAuthMethods}} self.logger = {} """Logging Settings """ diff --git a/samples/client/petstore/python-asyncio/petstore_api/configuration.py b/samples/client/petstore/python-asyncio/petstore_api/configuration.py index 16afbfa72789..d954e9f08ebc 100644 --- a/samples/client/petstore/python-asyncio/petstore_api/configuration.py +++ b/samples/client/petstore/python-asyncio/petstore_api/configuration.py @@ -122,6 +122,7 @@ conf = petstore_api.Configuration( def __init__(self, host=None, api_key=None, api_key_prefix=None, + access_token=None, username=None, password=None, discard_unknown_keys=False, disabled_client_side_validations="", @@ -146,6 +147,7 @@ conf = petstore_api.Configuration( """Temp file folder for downloading files """ # Authentication Settings + self.access_token = access_token self.api_key = {} if api_key: self.api_key = api_key @@ -167,9 +169,6 @@ conf = petstore_api.Configuration( """ self.discard_unknown_keys = discard_unknown_keys self.disabled_client_side_validations = disabled_client_side_validations - self.access_token = None - """access token for OAuth/Bearer - """ self.logger = {} """Logging Settings """ diff --git a/samples/client/petstore/python-tornado/petstore_api/configuration.py b/samples/client/petstore/python-tornado/petstore_api/configuration.py index d5fc19dc02fb..43bd4f48ed2f 100644 --- a/samples/client/petstore/python-tornado/petstore_api/configuration.py +++ b/samples/client/petstore/python-tornado/petstore_api/configuration.py @@ -123,6 +123,7 @@ conf = petstore_api.Configuration( def __init__(self, host=None, api_key=None, api_key_prefix=None, + access_token=None, username=None, password=None, discard_unknown_keys=False, disabled_client_side_validations="", @@ -147,6 +148,7 @@ conf = petstore_api.Configuration( """Temp file folder for downloading files """ # Authentication Settings + self.access_token = access_token self.api_key = {} if api_key: self.api_key = api_key @@ -168,9 +170,6 @@ conf = petstore_api.Configuration( """ self.discard_unknown_keys = discard_unknown_keys self.disabled_client_side_validations = disabled_client_side_validations - self.access_token = None - """access token for OAuth/Bearer - """ self.logger = {} """Logging Settings """ diff --git a/samples/client/petstore/python/petstore_api/configuration.py b/samples/client/petstore/python/petstore_api/configuration.py index 96969fe23250..ccd984b7f5f8 100644 --- a/samples/client/petstore/python/petstore_api/configuration.py +++ b/samples/client/petstore/python/petstore_api/configuration.py @@ -118,6 +118,7 @@ conf = petstore_api.Configuration( def __init__(self, host=None, api_key=None, api_key_prefix=None, + access_token=None, username=None, password=None, discard_unknown_keys=False, disabled_client_side_validations="", @@ -142,6 +143,7 @@ conf = petstore_api.Configuration( """Temp file folder for downloading files """ # Authentication Settings + self.access_token = access_token self.api_key = {} if api_key: self.api_key = api_key @@ -163,9 +165,6 @@ conf = petstore_api.Configuration( """ self.discard_unknown_keys = discard_unknown_keys self.disabled_client_side_validations = disabled_client_side_validations - self.access_token = None - """access token for OAuth/Bearer - """ self.logger = {} """Logging Settings """ diff --git a/samples/openapi3/client/petstore/python/petstore_api/configuration.py b/samples/openapi3/client/petstore/python/petstore_api/configuration.py index a12d2c733313..99b40326211a 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/configuration.py +++ b/samples/openapi3/client/petstore/python/petstore_api/configuration.py @@ -159,6 +159,7 @@ conf = petstore_api.Configuration( def __init__(self, host=None, api_key=None, api_key_prefix=None, + access_token=None, username=None, password=None, discard_unknown_keys=False, disabled_client_side_validations="", @@ -184,6 +185,7 @@ conf = petstore_api.Configuration( """Temp file folder for downloading files """ # Authentication Settings + self.access_token = access_token self.api_key = {} if api_key: self.api_key = api_key @@ -210,9 +212,6 @@ conf = petstore_api.Configuration( self.signing_info = signing_info """The HTTP signing configuration """ - self.access_token = None - """access token for OAuth/Bearer - """ self.logger = {} """Logging Settings """