Merge branch 'develop' of https://github.com/IdentityPython/oidc-op into develop

peppelinux · peppelinux · commit ffeaefc113fc · 2021-10-26T22:27:22.000+02:00
diff --git a/docs/source/contents/conf.rst b/docs/source/contents/conf.rst
@@ -571,7 +571,7 @@ An example::
                 "phone_number",
                 "phone_number_verified"
               ],
-              "add_claim_by_scope": true,
+              "add_claims_by_scope": true,
               "aud": ["https://example.org/appl"]
            }
         },
diff --git a/example/flask_op/config.json b/example/flask_op/config.json
@@ -311,7 +311,7 @@
               "phone_number",
               "phone_number_verified"
             ],
-            "add_claim_by_scope": true,
+            "add_claims_by_scope": true,
             "aud": [
               "https://example.org/appl"
             ]
diff --git a/example/flask_op/config.yaml b/example/flask_op/config.yaml
@@ -88,7 +88,7 @@ op:
           - email_verified
           - phone_number
           - phone_number_verified
-        add_claim_by_scope: True
+        add_claims_by_scope: True
         aud:
           - https://example.org/appl
       refresh:
diff --git a/tests/op_config.json b/tests/op_config.json
@@ -216,7 +216,6 @@
       }
     }
   },
-  "stupid_fake_thing": "asdasd",
   "httpc_params": {
     "verify": false
   },
@@ -326,7 +325,7 @@
           "phone_number",
           "phone_number_verified"
         ],
-        "add_claim_by_scope": true,
+        "add_claims_by_scope": true,
         "aud": [
           "https://example.org/appl"
         ]
diff --git a/tests/op_config_defaults.py b/tests/op_config_defaults.py
@@ -133,7 +133,7 @@
             "kwargs": {
                 "lifetime": 3600,
                 "add_claims": ["email", "email_verified", "phone_number", "phone_number_verified",],
-                "add_claim_by_scope": True,
+                "add_claims_by_scope": True,
                 "aud": ["https://example.org/appl"],
             },
         },
diff --git a/tests/srv_config.yaml b/tests/srv_config.yaml
@@ -96,7 +96,7 @@ op:
           - email_verified
           - phone_number
           - phone_number_verified
-        add_claim_by_scope: True
+        add_claims_by_scope: True
         aud:
           - https://example.org/appl
       refresh:
diff --git a/tests/test_06_session_manager.py b/tests/test_06_session_manager.py
@@ -55,7 +55,7 @@ def create_session_manager(self):
                     "kwargs": {
                         "lifetime": 3600,
                         "add_claims": True,
-                        "add_claim_by_scope": True,
+                        "add_claims_by_scope": True,
                         "aud": ["https://example.org/appl"],
                     },
                 },
diff --git a/tests/test_08_session_life.py b/tests/test_08_session_life.py
@@ -267,7 +267,7 @@ def setup_session_manager(self):
                             "phone_number",
                             "phone_number_verified",
                         ],
-                        "add_claim_by_scope": True,
+                        "add_claims_by_scope": True,
                         "aud": ["https://example.org/appl"],
                     },
                 },
diff --git a/tests/test_40_oauth2_pushed_authorization.py b/tests/test_40_oauth2_pushed_authorization.py
@@ -95,7 +95,7 @@ def create_endpoint(self):
                             "phone_number",
                             "phone_number_verified",
                         ],
-                        "add_claim_by_scope": True,
+                        "add_claims_by_scope": True,
                         "aud": ["https://example.org/appl"],
                     },
                 },

Original file line number	Diff line number	Diff line change
`@@ -571,7 +571,7 @@ An example::`
`571`	`571`	`"phone_number",`
`572`	`572`	`"phone_number_verified"`
`573`	`573`	`],`
`574`		`- "add_claim_by_scope": true,`
	`574`	`+ "add_claims_by_scope": true,`
`575`	`575`	`"aud": ["https://example.org/appl"]`
`576`	`576`	`}`
`577`	`577`	`},`
Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,7 @@`
`311`	`311`	`"phone_number",`
`312`	`312`	`"phone_number_verified"`
`313`	`313`	`],`
`314`		`- "add_claim_by_scope": true,`
	`314`	`+ "add_claims_by_scope": true,`
`315`	`315`	`"aud": [`
`316`	`316`	`"https://example.org/appl"`
`317`	`317`	`]`
Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,6 @@`
`216`	`216`	`}`
`217`	`217`	`}`
`218`	`218`	`},`
`219`		`- "stupid_fake_thing": "asdasd",`
`220`	`219`	`"httpc_params": {`
`221`	`220`	`"verify": false`
`222`	`221`	`},`
`@@ -326,7 +325,7 @@`
`326`	`325`	`"phone_number",`
`327`	`326`	`"phone_number_verified"`
`328`	`327`	`],`
`329`		`- "add_claim_by_scope": true,`
	`328`	`+ "add_claims_by_scope": true,`
`330`	`329`	`"aud": [`
`331`	`330`	`"https://example.org/appl"`
`332`	`331`	`]`