Skip to content

Commit 85455c8

Browse files
committed
Merge branch oauth2cli into oauth2
2 parents 02030e9 + c2ea9a1 commit 85455c8

File tree

3 files changed

+4
-161
lines changed

3 files changed

+4
-161
lines changed

msal/oauth2cli/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
__version__ = "0.0.1"
1+
__version__ = "0.1.0"
22

33
from .oauth2 import Client
4+
from .assertion import JwtSigner
45

msal/oauth2cli/oauth2rt.py

Lines changed: 0 additions & 158 deletions
This file was deleted.

tests/test_client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def load_conf(filename):
2626
2727
{
2828
"Note": "the OpenID Discovery will be updated by following optional content",
29-
"openid_configuration": {
29+
"additional_openid_configuration": {
3030
"authorization_endpoint": "https://example.com/tenant/oauth2/authorize",
3131
"token_endpoint": "https://example.com/tenant/oauth2/token",
3232
"device_authorization_endpoint": "device_authorization"
@@ -60,7 +60,7 @@ def load_conf(filename):
6060
openid_configuration.update(requests.get(discovery_uri).json())
6161
except:
6262
logger.warning("openid-configuration uri not accesible: %s", discovery_uri)
63-
openid_configuration.update(conf.get("openid_configuration", {}))
63+
openid_configuration.update(conf.get("additional_openid_configuration", {}))
6464
if openid_configuration.get("device_authorization_endpoint"):
6565
# The following urljoin(..., ...) trick allows a "path_name" shorthand
6666
openid_configuration["device_authorization_endpoint"] = urljoin(

0 commit comments

Comments
 (0)