Skip to content

Commit e171d03

Browse files
authored
Merge pull request #9942 from swagger-api/houqp-python-auth
Houqp python auth
2 parents 6a9830b + 9af33b0 commit e171d03

File tree

4 files changed

+33
-22
lines changed

4 files changed

+33
-22
lines changed

modules/swagger-codegen/src/main/resources/python/configuration.mustache

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -196,14 +196,17 @@ class Configuration(object):
196196
:param identifier: The identifier of apiKey.
197197
:return: The token for api key authentication.
198198
"""
199+
199200
if self.refresh_api_key_hook:
200201
self.refresh_api_key_hook(self)
201-
202-
if (self.api_key.get(identifier) and
203-
self.api_key_prefix.get(identifier)):
204-
return self.api_key_prefix[identifier] + ' ' + self.api_key[identifier] # noqa: E501
205-
elif self.api_key.get(identifier):
206-
return self.api_key[identifier]
202+
203+
key = self.api_key.get(identifier)
204+
if key:
205+
prefix = self.api_key_prefix.get(identifier)
206+
if prefix:
207+
return "%s %s" % (prefix, key)
208+
else:
209+
return key
207210

208211
def get_basic_auth_token(self):
209212
"""Gets HTTP basic authentication header (string).

samples/client/petstore/python-asyncio/petstore_api/configuration.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -208,11 +208,13 @@ def get_api_key_with_prefix(self, identifier):
208208
if self.refresh_api_key_hook:
209209
self.refresh_api_key_hook(self)
210210

211-
if (self.api_key.get(identifier) and
212-
self.api_key_prefix.get(identifier)):
213-
return self.api_key_prefix[identifier] + ' ' + self.api_key[identifier] # noqa: E501
214-
elif self.api_key.get(identifier):
215-
return self.api_key[identifier]
211+
key = self.api_key.get(identifier)
212+
if key:
213+
prefix = self.api_key_prefix.get(identifier)
214+
if prefix:
215+
return "%s %s" % (prefix, key)
216+
else:
217+
return key
216218

217219
def get_basic_auth_token(self):
218220
"""Gets HTTP basic authentication header (string).

samples/client/petstore/python-tornado/petstore_api/configuration.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -205,14 +205,17 @@ def get_api_key_with_prefix(self, identifier):
205205
:param identifier: The identifier of apiKey.
206206
:return: The token for api key authentication.
207207
"""
208+
208209
if self.refresh_api_key_hook:
209210
self.refresh_api_key_hook(self)
210-
211-
if (self.api_key.get(identifier) and
212-
self.api_key_prefix.get(identifier)):
213-
return self.api_key_prefix[identifier] + ' ' + self.api_key[identifier] # noqa: E501
214-
elif self.api_key.get(identifier):
215-
return self.api_key[identifier]
211+
212+
key = self.api_key.get(identifier)
213+
if key:
214+
prefix = self.api_key_prefix.get(identifier)
215+
if prefix:
216+
return "%s %s" % (prefix, key)
217+
else:
218+
return key
216219

217220
def get_basic_auth_token(self):
218221
"""Gets HTTP basic authentication header (string).

samples/client/petstore/python/petstore_api/configuration.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -205,14 +205,17 @@ def get_api_key_with_prefix(self, identifier):
205205
:param identifier: The identifier of apiKey.
206206
:return: The token for api key authentication.
207207
"""
208+
208209
if self.refresh_api_key_hook:
209210
self.refresh_api_key_hook(self)
210211

211-
if (self.api_key.get(identifier) and
212-
self.api_key_prefix.get(identifier)):
213-
return self.api_key_prefix[identifier] + ' ' + self.api_key[identifier] # noqa: E501
214-
elif self.api_key.get(identifier):
215-
return self.api_key[identifier]
212+
key = self.api_key.get(identifier)
213+
if key:
214+
prefix = self.api_key_prefix.get(identifier)
215+
if prefix:
216+
return "%s %s" % (prefix, key)
217+
else:
218+
return key
216219

217220
def get_basic_auth_token(self):
218221
"""Gets HTTP basic authentication header (string).

0 commit comments

Comments
 (0)