|
2 | 2 | import logging |
3 | 3 | import sys |
4 | 4 | import traceback |
5 | | -from importlib import import_module |
6 | 5 |
|
7 | | -from cryptojwt.utils import as_bytes, as_unicode |
8 | | -from oidcmsg.exception import MessageException, NotForMe |
| 6 | +from cryptojwt.utils import as_bytes |
| 7 | +from cryptojwt.utils import as_unicode |
| 8 | +from oidcmsg.exception import MessageException |
| 9 | +from oidcmsg.exception import NotForMe |
9 | 10 | from oidcmsg.oauth2 import ResponseMessage |
10 | 11 | from oidcmsg.oauth2 import is_error_message |
11 | | -from oidcmsg.oidc import AccessTokenResponse, verified_claim_name |
| 12 | +from oidcmsg.oidc import AccessTokenResponse |
12 | 13 | from oidcmsg.oidc import AuthorizationRequest |
13 | 14 | from oidcmsg.oidc import AuthorizationResponse |
14 | 15 | from oidcmsg.oidc import OpenIDSchema |
| 16 | +from oidcmsg.oidc import verified_claim_name |
15 | 17 | from oidcmsg.oidc.session import BackChannelLogoutRequest |
16 | 18 | from oidcmsg.time_util import time_sans_frac |
17 | 19 | from oidcservice import rndstr |
|
24 | 26 | from oidcrp import provider |
25 | 27 |
|
26 | 28 | __author__ = 'Roland Hedberg' |
27 | | -__version__ = '0.6.1' |
| 29 | +__version__ = '0.6.2' |
28 | 30 |
|
29 | 31 | logger = logging.getLogger(__name__) |
30 | 32 |
|
@@ -904,45 +906,3 @@ def backchannel_logout(client, request='', request_args=None): |
904 | 906 |
|
905 | 907 | return _state |
906 | 908 |
|
907 | | - |
908 | | -# def get_provider_specific_service(service_provider, service, **kwargs): |
909 | | -# """ |
910 | | -# Get a class instance of a :py:class:`oidcservice.service.Service` subclass |
911 | | -# specific to a specified service provider. |
912 | | -# |
913 | | -# :param service_provider: The name of the service provider |
914 | | -# :param service: The name of the service |
915 | | -# :param kwargs: Arguments provided when initiating the class |
916 | | -# :return: An initiated subclass of :py:class:`oidcservice.service.Service` |
917 | | -# or None if the service or the service provider could not be found. |
918 | | -# """ |
919 | | -# if service_provider in provider.__all__: |
920 | | -# mod = import_module('oidcrp.provider.' + service_provider) |
921 | | -# cls = getattr(mod, service) |
922 | | -# return cls(**kwargs) |
923 | | -# |
924 | | -# return None |
925 | | -# |
926 | | -# |
927 | | -# def factory(service_name, ignore, **kwargs): |
928 | | -# """ |
929 | | -# A factory the given a service name will return a |
930 | | -# :py:class:`oidcservice.service.Service` instance if a service matching the |
931 | | -# name could be found. |
932 | | -# |
933 | | -# :param service_name: A service name, could be either of the format |
934 | | -# 'group.name' or 'name'. |
935 | | -# :param kwargs: A set of key word arguments to be used when initiating the |
936 | | -# Service class |
937 | | -# :return: A :py:class:`oidcservice.service.Service` instance or None |
938 | | -# """ |
939 | | -# if '.' in service_name: |
940 | | -# group, name = service_name.split('.') |
941 | | -# if group == 'oauth2': |
942 | | -# service_factory(service_name[1], ['oauth2'], **kwargs) |
943 | | -# elif group == 'oidc': |
944 | | -# service_factory(service_name[1], ['oidc'], **kwargs) |
945 | | -# else: |
946 | | -# return get_provider_specific_service(group, name, **kwargs) |
947 | | -# else: |
948 | | -# return service_factory(service_name, ['oidc', 'oauth2'], **kwargs) |
0 commit comments