Merge pull request #30 from nsklikas/master

Use the scope2claims dict in JWTToken

Author: rohe

src/oidcendpoint/endpoint_context.py

@@ -122,6 +122,7 @@ def __init__(
         self.login_hint_lookup = None
         self.login_hint2acrs = None
         self.userinfo = None
+        self.scope2claims = SCOPE2CLAIMS
         # arguments for endpoints add-ons
         self.args = {}
 
@@ -140,8 +141,6 @@ def __init__(
         else:
             self.set_session_db(sso_db)
 
-        self.scope2claims = SCOPE2CLAIMS
-
         if cookie_name:
             self.cookie_name = cookie_name
         elif "cookie_name" in conf:

src/oidcendpoint/jwt_token.py

@@ -34,10 +34,7 @@ def __init__(
 
         self.def_aud = aud or []
         self.alg = alg
-        if 'scope_claims_map' in kwargs:
-            self.scope_claims_map = kwargs['scope_claims_map']
-        else:
-            self.scope_claims_map = None
+        self.scope_claims_map = kwargs.get('scope_claims_map', ec.scope2claims)
 
     def add_claims(self, payload, uinfo, claims):
         for attr in claims: