Skip to content

Commit 6965caf

Browse files
author
mganisin
authored
Merge pull request 3scale-qe#98 from JaurbanRH/auth_resources
Add auth resources for existing clients
2 parents 7c31c8f + d5d4061 commit 6965caf

File tree

2 files changed

+20
-8
lines changed

2 files changed

+20
-8
lines changed

threescale_api/client.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,10 @@ def __init__(self, url: str, token: str, throws: bool = True, ssl_verify: bool =
3434
self._active_docs = resources.ActiveDocs(self, instance_klass=resources.ActiveDoc)
3535
self._account_plans = resources.AccountPlans(self, instance_klass=resources.AccountPlan)
3636
self._settings = resources.SettingsClient(self)
37-
self._admin_portal_auth_provider = resources.AdminPortalAuthenticationProvider(self)
38-
self._dev_portal_auth_provider = resources.DevPortalAuthenticationProvider(self)
37+
self._admin_portal_auth_providers = resources.AdminPortalAuthProviders(
38+
self, instance_klass=resources.AdminPortalAuthProvider)
39+
self._dev_portal_auth_providers = resources.DevPortalAuthProviders(
40+
self, instance_klass=resources.DevPortalAuthProvider)
3941
self._policy_registry = resources.PoliciesRegistry(self,
4042
instance_klass=resources.PolicyRegistry)
4143
self._backends = resources.Backends(self, instance_klass=resources.Backend)
@@ -190,12 +192,12 @@ def backends(self) -> resources.Backends:
190192
return self._backends
191193

192194
@property
193-
def dev_portal_auth_provider(self) -> resources.DevPortalAuthenticationProvider:
194-
return self._dev_portal_auth_provider
195+
def dev_portal_auth_providers(self) -> resources.DevPortalAuthProviders:
196+
return self._dev_portal_auth_providers
195197

196198
@property
197-
def admin_portal_auth_provider(self) -> resources.AdminPortalAuthenticationProvider:
198-
return self._admin_portal_auth_provider
199+
def admin_portal_auth_providers(self) -> resources.AdminPortalAuthProviders:
200+
return self._admin_portal_auth_providers
199201

200202
@property
201203
def policy_registry(self) -> resources.PolicyRegistry:

threescale_api/resources.py

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ def resume(self, entity_id: int, **kwargs):
282282
self.set_state(entity_id=entity_id, state='resume', **kwargs)
283283

284284

285-
class DevPortalAuthenticationProvider(DefaultClient):
285+
class DevPortalAuthProviders(DefaultClient):
286286
def __init__(self, *args, entity_name='authentication_provider',
287287
entity_collection='authentication_providers', **kwargs):
288288
super().__init__(*args, entity_name=entity_name,
@@ -482,7 +482,7 @@ def url(self) -> str:
482482
return self.threescale_client.admin_api_url + '/settings'
483483

484484

485-
class AdminPortalAuthenticationProvider(DefaultClient):
485+
class AdminPortalAuthProviders(DefaultClient):
486486
def __init__(self, *args, entity_name='authentication_provider',
487487
entity_collection='authentication_providers', **kwargs):
488488
super().__init__(*args, entity_name=entity_name,
@@ -1334,3 +1334,13 @@ def state_update(self, state: InvoiceState):
13341334

13351335
def charge(self):
13361336
return self.client.charge(entity_id=self.entity_id)
1337+
1338+
1339+
class AdminPortalAuthProvider(DefaultResource):
1340+
def __init__(self, entity_name='name', **kwargs):
1341+
super().__init__(entity_name=entity_name, **kwargs)
1342+
1343+
1344+
class DevPortalAuthProvider(DefaultResource):
1345+
def __init__(self, entity_name='name', **kwargs):
1346+
super().__init__(entity_name=entity_name, **kwargs)

0 commit comments

Comments
 (0)