Class attributes instead of member of self.args.

Author: rohe

src/oidcendpoint/jwt_token.py

@@ -13,6 +13,12 @@
 
 
 class JWTToken(Token):
+    init_args = {
+        'add_claims_by_scope': False,
+        'enable_claims_per_client': False,
+        "add_claims": {}
+    }
+
     def __init__(
         self,
         typ,
@@ -28,7 +34,7 @@ def __init__(
         Token.__init__(self, typ, **kwargs)
         self.token_type = token_type
         self.lifetime = lifetime
-        self.args = kwargs
+        self.args = {(k,v) for k, v in kwargs.items() if k not in self.init_args.keys()}
 
         self.key_jar = keyjar or ec.keyjar
         self.issuer = issuer or ec.issuer
@@ -37,11 +43,15 @@ def __init__(
         self.def_aud = aud or []
         self.alg = alg
         self.scope_claims_map = kwargs.get("scope_claims_map", ec.scope2claims)
-        self.enable_claims_per_client = kwargs.get(
-            "enable_claims_per_client", False
-        )
 
-    def add_claims(self, payload, uinfo, claims):
+        self.add_claims = self.init_args['add_claims']
+        self.add_claims_by_scope = self.init_args['add_claims_by_scope']
+        self.enable_claims_per_client = self.init_args["enable_claims_per_client"]
+
+        for param, default in self.init_args.items():
+            setattr(self, param, kwargs.get(param, default))
+
+    def do_add_claims(self, payload, uinfo, claims):
         for attr in claims:
             if attr == "sub":
                 continue
@@ -65,10 +75,10 @@ def __call__(
         """
         payload = {"sid": sid, "ttype": self.type, "sub": sinfo["sub"]}
 
-        if "add_claims" in self.args:
-            self.add_claims(payload, uinfo, self.args["add_claims"])
-        if self.args.get("add_claims_by_scope", False):
-            self.add_claims(
+        if self.add_claims:
+            self.do_add_claims(payload, uinfo, self.add_claims)
+        if self.add_claims_by_scope:
+            self.do_add_claims(
                 payload,
                 uinfo,
                 scope2claims(
@@ -80,7 +90,7 @@ def __call__(
             client = self.cdb.get(client_id, {})
             client_claims = client.get("access_token_claims")
             if client_claims:
-                self.add_claims(payload, uinfo, client_claims)
+                self.do_add_claims(payload, uinfo, client_claims)
 
         payload.update(kwargs)
         signer = JWT(