Skip to content

Commit e11d014

Browse files
roherohe
committed
Make server side also use WorkEnvironment
1 parent 2a60d20 commit e11d014

32 files changed

Lines changed: 543 additions & 861 deletions

‎src/idpyoidc/client/oauth2/access_token.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
from idpyoidc.client.oauth2.utils import get_state_parameter
66
from idpyoidc.client.service import Service
77
from idpyoidc.client.work_environment import get_client_authn_methods
8-
from idpyoidc.client.work_environment import get_signing_algs
98
from idpyoidc.message import oauth2
109
from idpyoidc.message.oauth2 import ResponseMessage
1110
from idpyoidc.time_util import time_sans_frac
11+
from idpyoidc.work_environment import get_signing_algs
1212

1313
LOGGER = logging.getLogger(__name__)
1414

‎src/idpyoidc/client/oidc/access_token.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from idpyoidc.client.oauth2 import access_token
77
from idpyoidc.client.oidc import IDT2REG
88
from idpyoidc.client.work_environment import get_client_authn_methods
9-
from idpyoidc.client.work_environment import get_signing_algs
9+
from idpyoidc.work_environment import get_signing_algs
1010
from idpyoidc.message import Message
1111
from idpyoidc.message import oidc
1212
from idpyoidc.message.oidc import verified_claim_name

‎src/idpyoidc/client/oidc/authorization.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from typing import Optional
44
from typing import Union
55

6-
from idpyoidc.client import work_environment
6+
from idpyoidc import work_environment
77
from idpyoidc.client.oauth2 import authorization
88
from idpyoidc.client.oauth2.utils import pre_construct_pick_redirect_uri
99
from idpyoidc.client.oidc import IDT2REG

‎src/idpyoidc/client/oidc/userinfo.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
from idpyoidc import verified_claim_name
66
from idpyoidc.client.oauth2.utils import get_state_parameter
77
from idpyoidc.client.service import Service
8-
from idpyoidc.client.work_environment import get_encryption_algs
9-
from idpyoidc.client.work_environment import get_encryption_encs
10-
from idpyoidc.client.work_environment import get_signing_algs
8+
from idpyoidc.work_environment import get_encryption_algs
9+
from idpyoidc.work_environment import get_encryption_encs
10+
from idpyoidc.work_environment import get_signing_algs
1111
from idpyoidc.exception import MissingSigningKey
1212
from idpyoidc.message import Message
1313
from idpyoidc.message import oidc

‎src/idpyoidc/client/provider/github.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
from idpyoidc.client.oauth2 import access_token
22
from idpyoidc.client.oidc import userinfo
33
from idpyoidc.client.work_environment import get_client_authn_methods
4-
from idpyoidc.client.work_environment import get_signing_algs
4+
from idpyoidc.message import Message
55
from idpyoidc.message import SINGLE_OPTIONAL_STRING
66
from idpyoidc.message import SINGLE_REQUIRED_STRING
7-
from idpyoidc.message import Message
87
from idpyoidc.message import oauth2
98
from idpyoidc.message.oauth2 import ResponseMessage
9+
from idpyoidc.work_environment import get_signing_algs
1010

1111

1212
class AccessTokenResponse(Message):

‎src/idpyoidc/client/provider/linkedin.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
from idpyoidc.client.oauth2 import access_token
22
from idpyoidc.client.oidc import userinfo
33
from idpyoidc.client.work_environment import get_client_authn_methods
4-
from idpyoidc.client.work_environment import get_signing_algs
4+
from idpyoidc.message import Message
55
from idpyoidc.message import SINGLE_OPTIONAL_JSON
66
from idpyoidc.message import SINGLE_OPTIONAL_STRING
77
from idpyoidc.message import SINGLE_REQUIRED_INT
88
from idpyoidc.message import SINGLE_REQUIRED_STRING
9-
from idpyoidc.message import Message
109
from idpyoidc.message import oauth2
10+
from idpyoidc.work_environment import get_signing_algs
1111

1212

1313
class AccessTokenResponse(Message):

‎src/idpyoidc/client/service_context.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
from idpyoidc.client.work_environment.oauth2 import WorkEnvironment as OAUTH2_Specs
2020
from idpyoidc.client.work_environment.oidc import WorkEnvironment as OIDC_Specs
2121
from idpyoidc.util import rndstr
22+
from idpyoidc.work_environment import WorkEnvironment
23+
from idpyoidc.work_environment import work_environment_dump
24+
from idpyoidc.work_environment import work_environment_load
2225
from .configure import get_configuration
2326
from .current import Current
24-
from .work_environment import WorkEnvironment
25-
from .work_environment import work_environment_dump
26-
from .work_environment import work_environment_load
2727
from .work_environment.transform import preferred_to_registered
2828
from .work_environment.transform import supported_to_preferred
2929
from ..impexp import ImpExp
@@ -167,7 +167,7 @@ def __init__(self,
167167
setattr(self, key, val)
168168

169169
self.keyjar = self.work_environment.load_conf(config.conf, supports=self.supports(),
170-
keyjar=keyjar)
170+
keyjar=keyjar)
171171

172172
_response_types = self.get_preference(
173173
'response_types_supported',
@@ -343,9 +343,9 @@ def prefer_or_support(self, claim):
343343

344344
def map_supported_to_preferred(self, info: Optional[dict] = None):
345345
self.work_environment.prefer = supported_to_preferred(self.supports(),
346-
self.work_environment.prefer,
347-
base_url=self.base_url,
348-
info=info)
346+
self.work_environment.prefer,
347+
base_url=self.base_url,
348+
info=info)
349349
return self.work_environment.prefer
350350

351351
def map_preferred_to_registered(self, registration_response: Optional[dict] = None):

0 commit comments

Comments
 (0)