diff options
| author | Pieter Ennes <pieter@ennes.nl> | 2018-09-20 23:10:17 +0100 |
|---|---|---|
| committer | Omer Katz <omer.drow@gmail.com> | 2018-09-21 01:10:17 +0300 |
| commit | 326456cb78eb6b50e6f44f01cb0eaccc7652cf1f (patch) | |
| tree | b524b1528b814e866e0276da7e608312057eecb4 /oauthlib | |
| parent | 7fb3bd4eb20959b4c7e4615974b0f87456d05939 (diff) | |
| download | oauthlib-326456cb78eb6b50e6f44f01cb0eaccc7652cf1f.tar.gz | |
Fix OIDC tests (#565)
* Unmute ignored OIDC tests.
* Fix more import errors.
* Remove recently invalidated test for id_token_hint.
* Fix tested grants.
* Fix import on py27.
Diffstat (limited to 'oauthlib')
| -rw-r--r-- | oauthlib/openid/connect/core/endpoints/__init__.py | 0 | ||||
| -rw-r--r-- | oauthlib/openid/connect/core/endpoints/pre_configured.py | 30 | ||||
| -rw-r--r-- | oauthlib/openid/connect/core/grant_types/__init__.py | 6 |
3 files changed, 19 insertions, 17 deletions
diff --git a/oauthlib/openid/connect/core/endpoints/__init__.py b/oauthlib/openid/connect/core/endpoints/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/oauthlib/openid/connect/core/endpoints/__init__.py diff --git a/oauthlib/openid/connect/core/endpoints/pre_configured.py b/oauthlib/openid/connect/core/endpoints/pre_configured.py index 3bcd24d..04bd628 100644 --- a/oauthlib/openid/connect/core/endpoints/pre_configured.py +++ b/oauthlib/openid/connect/core/endpoints/pre_configured.py @@ -8,29 +8,31 @@ for providing OpenID Connect servers. """ from __future__ import absolute_import, unicode_literals -from ..grant_types import ( +from oauthlib.oauth2.rfc6749.endpoints import ( + AuthorizationEndpoint, + ResourceEndpoint, + RevocationEndpoint, + TokenEndpoint +) +from oauthlib.oauth2.rfc6749.grant_types import ( AuthorizationCodeGrant as OAuth2AuthorizationCodeGrant, - ClientCredentialsGrant, ImplicitGrant as OAuth2ImplicitGrant, + ClientCredentialsGrant, RefreshTokenGrant, ResourceOwnerPasswordCredentialsGrant ) - -from oauthlib.openid.connect.core.grant_types.authorization_code import AuthorizationCodeGrant -from oauthlib.openid.connect.core.grant_types.dispatchers import ( +from oauthlib.oauth2.rfc6749.tokens import BearerToken +from ..grant_types import ( + AuthorizationCodeGrant, + ImplicitGrant, + HybridGrant, +) +from ..grant_types.dispatchers import ( AuthorizationCodeGrantDispatcher, ImplicitTokenGrantDispatcher, AuthorizationTokenGrantDispatcher ) -from oauthlib.openid.connect.core.grant_types.implicit import ImplicitGrant -from oauthlib.openid.connect.core.grant_types.hybrid import HybridGrant -from oauthlib.openid.connect.core.tokens import JWTToken - -from ..tokens import BearerToken -from .authorization import AuthorizationEndpoint -from .resource import ResourceEndpoint -from .revocation import RevocationEndpoint -from .token import TokenEndpoint +from ..tokens import JWTToken class Server(AuthorizationEndpoint, TokenEndpoint, ResourceEndpoint, diff --git a/oauthlib/openid/connect/core/grant_types/__init__.py b/oauthlib/openid/connect/core/grant_types/__init__.py index 7fc183d..63f30ac 100644 --- a/oauthlib/openid/connect/core/grant_types/__init__.py +++ b/oauthlib/openid/connect/core/grant_types/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """ -oauthlib.oauth2.rfc6749.grant_types -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +oauthlib.openid.connect.core.grant_types +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ """ from __future__ import unicode_literals, absolute_import @@ -10,7 +10,7 @@ from .implicit import ImplicitGrant from .base import GrantTypeBase from .hybrid import HybridGrant from .exceptions import OIDCNoPrompt -from oauthlib.openid.connect.core.grant_types.dispatchers import ( +from .dispatchers import ( AuthorizationCodeGrantDispatcher, ImplicitTokenGrantDispatcher, AuthorizationTokenGrantDispatcher |