From 192956464f8db7bf7144b855262c96e0d23021c6 Mon Sep 17 00:00:00 2001 From: "Lance A. Brown" Date: Fri, 2 Jun 2023 04:45:40 +0000 Subject: [PATCH 1/2] Fix access_token configuration logic in python client Don't overwrite the provided access_token property during configuration call in python client when the spec has bearer token security schema --- .../src/main/resources/python/configuration.mustache | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/python/configuration.mustache b/modules/openapi-generator/src/main/resources/python/configuration.mustache index 9707863a3839..8d96093851ba 100644 --- a/modules/openapi-generator/src/main/resources/python/configuration.mustache +++ b/modules/openapi-generator/src/main/resources/python/configuration.mustache @@ -183,9 +183,6 @@ conf = {{{packageName}}}.Configuration( self.password = password """Password for HTTP basic authentication """ - self.access_token = access_token - """Access token - """ {{#hasHttpSignatureMethods}} if signing_info is not None: signing_info.host = host @@ -200,7 +197,7 @@ conf = {{{packageName}}}.Configuration( {{/hasOAuthMethods}} {{^hasOAuthMethods}} {{#hasHttpBearerMethods}} - self.access_token = None + self.access_token = access_token """access token for OAuth/Bearer """ {{/hasHttpBearerMethods}} From 2e1ac5662a886b7d1d7ae7a34bc3a45b3e574896 Mon Sep 17 00:00:00 2001 From: "Lance A. Brown" Date: Fri, 2 Jun 2023 05:14:21 +0000 Subject: [PATCH 2/2] Remove access_token from petstore sample clients --- samples/client/echo_api/python/openapi_client/configuration.py | 3 --- .../petstore/python-aiohttp/petstore_api/configuration.py | 3 --- .../client/petstore/python/petstore_api/configuration.py | 3 --- 3 files changed, 9 deletions(-) diff --git a/samples/client/echo_api/python/openapi_client/configuration.py b/samples/client/echo_api/python/openapi_client/configuration.py index 8274fd4a5921..457dc1792ff7 100644 --- a/samples/client/echo_api/python/openapi_client/configuration.py +++ b/samples/client/echo_api/python/openapi_client/configuration.py @@ -102,9 +102,6 @@ def __init__(self, host=None, self.password = password """Password for HTTP basic authentication """ - self.access_token = access_token - """Access token - """ self.logger = {} """Logging Settings """ diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/configuration.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/configuration.py index a5c160638f90..4dcd23b3a23e 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/configuration.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/configuration.py @@ -178,9 +178,6 @@ def __init__(self, host=None, self.password = password """Password for HTTP basic authentication """ - self.access_token = access_token - """Access token - """ if signing_info is not None: signing_info.host = host self.signing_info = signing_info diff --git a/samples/openapi3/client/petstore/python/petstore_api/configuration.py b/samples/openapi3/client/petstore/python/petstore_api/configuration.py index 056f25f13e07..4cef248b7a1a 100755 --- a/samples/openapi3/client/petstore/python/petstore_api/configuration.py +++ b/samples/openapi3/client/petstore/python/petstore_api/configuration.py @@ -179,9 +179,6 @@ def __init__(self, host=None, self.password = password """Password for HTTP basic authentication """ - self.access_token = access_token - """Access token - """ if signing_info is not None: signing_info.host = host self.signing_info = signing_info