Skip to content

Commit

Permalink
Make load_server_metadata method public
Browse files Browse the repository at this point in the history
  • Loading branch information
lepture committed Feb 11, 2020
1 parent 2a52d1e commit 2048334
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
12 changes: 6 additions & 6 deletions authlib/integrations/base_client/async_app.py
Expand Up @@ -15,7 +15,7 @@


class AsyncRemoteApp(BaseApp):
async def _load_server_metadata(self):
async def load_server_metadata(self):
if self._server_metadata_url and '_loaded_at' not in self.server_metadata:
metadata = await self._fetch_server_metadata(self._server_metadata_url)
metadata['_loaded_at'] = time.time()
Expand Down Expand Up @@ -48,7 +48,7 @@ async def create_authorization_url(self, redirect_uri=None, **kwargs):
:param kwargs: Extra parameters to include.
:return: dict
"""
metadata = await self._load_server_metadata()
metadata = await self.load_server_metadata()
authorization_endpoint = self.authorize_url
if not authorization_endpoint and not self.request_token_url:
authorization_endpoint = metadata.get('authorization_endpoint')
Expand Down Expand Up @@ -78,7 +78,7 @@ async def fetch_access_token(self, redirect_uri=None, request_token=None, **para
:param params: Extra parameters to fetch access token.
:return: A token dict.
"""
metadata = await self._load_server_metadata()
metadata = await self.load_server_metadata()
token_endpoint = self.access_token_url
if not token_endpoint and not self.request_token_url:
token_endpoint = metadata.get('token_endpoint')
Expand Down Expand Up @@ -126,7 +126,7 @@ async def request(self, method, url, token=None, **kwargs):

async def userinfo(self, **kwargs):
"""Fetch user info from ``userinfo_endpoint``."""
metadata = await self._load_server_metadata()
metadata = await self.load_server_metadata()
resp = await self.get(metadata['userinfo_endpoint'], **kwargs)
data = resp.json()

Expand All @@ -147,7 +147,7 @@ async def _parse_id_token(self, token, nonce, claims_options=None):
else:
claims_cls = ImplicitIDToken

metadata = await self._load_server_metadata()
metadata = await self.load_server_metadata()
if claims_options is None and 'issuer' in metadata:
claims_options = {'iss': {'values': [metadata['issuer']]}}

Expand Down Expand Up @@ -178,7 +178,7 @@ async def _parse_id_token(self, token, nonce, claims_options=None):
return UserInfo(claims)

async def _fetch_jwk_set(self, force=False):
metadata = await self._load_server_metadata()
metadata = await self.load_server_metadata()
jwk_set = metadata.get('jwks')
if jwk_set and not force:
return jwk_set
Expand Down
12 changes: 6 additions & 6 deletions authlib/integrations/base_client/remote_app.py
Expand Up @@ -15,7 +15,7 @@


class RemoteApp(BaseApp):
def _load_server_metadata(self):
def load_server_metadata(self):
if self._server_metadata_url and '_loaded_at' not in self.server_metadata:
metadata = self._fetch_server_metadata(self._server_metadata_url)
metadata['_loaded_at'] = time.time()
Expand Down Expand Up @@ -53,7 +53,7 @@ def create_authorization_url(self, redirect_uri=None, **kwargs):
:param kwargs: Extra parameters to include.
:return: dict
"""
metadata = self._load_server_metadata()
metadata = self.load_server_metadata()
authorization_endpoint = self.authorize_url
if not authorization_endpoint and not self.request_token_url:
authorization_endpoint = metadata.get('authorization_endpoint')
Expand Down Expand Up @@ -83,7 +83,7 @@ def fetch_access_token(self, redirect_uri=None, request_token=None, **params):
:param params: Extra parameters to fetch access token.
:return: A token dict.
"""
metadata = self._load_server_metadata()
metadata = self.load_server_metadata()
token_endpoint = self.access_token_url
if not token_endpoint and not self.request_token_url:
token_endpoint = metadata.get('token_endpoint')
Expand Down Expand Up @@ -128,7 +128,7 @@ def request(self, method, url, token=None, **kwargs):
return session.request(method, url, **kwargs)

def fetch_jwk_set(self, force=False):
metadata = self._load_server_metadata()
metadata = self.load_server_metadata()
jwk_set = metadata.get('jwks')
if jwk_set and not force:
return jwk_set
Expand All @@ -142,7 +142,7 @@ def fetch_jwk_set(self, force=False):

def userinfo(self, **kwargs):
"""Fetch user info from ``userinfo_endpoint``."""
metadata = self._load_server_metadata()
metadata = self.load_server_metadata()
resp = self.get(metadata['userinfo_endpoint'], **kwargs)
data = resp.json()

Expand Down Expand Up @@ -176,7 +176,7 @@ def load_key(header, payload):
else:
claims_cls = ImplicitIDToken

metadata = self._load_server_metadata()
metadata = self.load_server_metadata()
if claims_options is None and 'issuer' in metadata:
claims_options = {'iss': {'values': [metadata['issuer']]}}

Expand Down

0 comments on commit 2048334

Please sign in to comment.