tests: use lists of strings for Token.scope and AuthorizationCode.scope

yaal-coop · Nov 23, 2023 · c19199b · c19199b
1 parent 7494800
commit c19199b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 14 deletions.
diff --git a/tests/oidc/commands/test_clean.py b/tests/oidc/commands/test_clean.py
@@ -13,13 +13,12 @@ def test_clean_command(testclient, backend, client, user):
         subject=user,
         redirect_uri="https://foo.bar/callback",
         response_type="code",
-        scope="openid profile",
+        scope=["openid", "profile"],
         nonce="nonce",
         issue_date=datetime.datetime.now(datetime.timezone.utc).replace(microsecond=0),
         lifetime=3600,
         challenge="challenge",
         challenge_method="method",
-        revokation="",
     )
     valid_code.save()
     expired_code = models.AuthorizationCode(
@@ -29,7 +28,7 @@ def test_clean_command(testclient, backend, client, user):
         subject=user,
         redirect_uri="https://foo.bar/callback",
         response_type="code",
-        scope="openid profile",
+        scope=["openid", "profile"],
         nonce="nonce",
         issue_date=(
             datetime.datetime.now(datetime.timezone.utc).replace(microsecond=0)
@@ -38,7 +37,6 @@ def test_clean_command(testclient, backend, client, user):
         lifetime=3600,
         challenge="challenge",
         challenge_method="method",
-        revokation="",
     )
     expired_code.save()
 
@@ -48,7 +46,7 @@ def test_clean_command(testclient, backend, client, user):
         client=client,
         subject=user,
         refresh_token=gen_salt(48),
-        scope="openid profile",
+        scope=["openid", "profile"],
         issue_date=(
             datetime.datetime.now(datetime.timezone.utc).replace(microsecond=0)
         ),
@@ -61,7 +59,7 @@ def test_clean_command(testclient, backend, client, user):
         client=client,
         subject=user,
         refresh_token=gen_salt(48),
-        scope="openid profile",
+        scope=["openid", "profile"],
         issue_date=(
             datetime.datetime.now(datetime.timezone.utc).replace(microsecond=0)
             - datetime.timedelta(days=1)

diff --git a/tests/oidc/conftest.py b/tests/oidc/conftest.py
@@ -121,13 +121,12 @@ def authorization(testclient, user, client, backend):
         subject=user,
         redirect_uri="https://foo.bar/callback",
         response_type="code",
-        scope="openid profile",
+        scope=["openid", "profile"],
         nonce="nonce",
         issue_date=datetime.datetime(2020, 1, 1, tzinfo=datetime.timezone.utc),
         lifetime=3600,
         challenge="challenge",
         challenge_method="method",
-        revokation="",
     )
     a.save()
     yield a
@@ -144,7 +143,7 @@ def token(testclient, client, user, backend):
         subject=user,
         token_type=None,
         refresh_token=gen_salt(48),
-        scope="openid profile",
+        scope=["openid", "profile"],
         issue_date=datetime.datetime.now(datetime.timezone.utc),
         lifetime=3600,
     )

diff --git a/tests/oidc/test_token_admin.py b/tests/oidc/test_token_admin.py
@@ -29,7 +29,7 @@ def test_token_list_pagination(testclient, logged_admin, client):
             subject=logged_admin,
             type=None,
             refresh_token=gen_salt(48),
-            scope="openid profile",
+            scope=["openid", "profile"],
             issue_date=(
                 datetime.datetime.now(datetime.timezone.utc).replace(microsecond=0)
             ),
@@ -81,7 +81,7 @@ def test_token_list_search(testclient, logged_admin, client):
         subject=logged_admin,
         type=None,
         refresh_token=gen_salt(48),
-        scope="openid profile",
+        scope=["openid", "profile"],
         issue_date=(
             datetime.datetime.now(datetime.timezone.utc).replace(microsecond=0)
         ),
@@ -95,7 +95,7 @@ def test_token_list_search(testclient, logged_admin, client):
         subject=logged_admin,
         type=None,
         refresh_token=gen_salt(48),
-        scope="openid profile",
+        scope=["openid", "profile"],
         issue_date=(
             datetime.datetime.now(datetime.timezone.utc).replace(microsecond=0)
         ),

diff --git a/tests/oidc/test_userinfo.py b/tests/oidc/test_userinfo.py
@@ -265,7 +265,7 @@ def test_userinfo(testclient, token, user, foo_group):
 
 
 def test_generate_user_standard_claims_with_default_config(testclient, backend, user):
-    user.preferred_language = ["fr"]
+    user.preferred_language = "fr"
 
     data = generate_user_claims(user, STANDARD_CLAIMS, DEFAULT_JWT_MAPPING)
 
@@ -294,7 +294,7 @@ def test_custom_config_format_claim_is_well_formated(testclient, backend, user):
 def test_claim_is_omitted_if_empty(testclient, backend, user):
     # According to https://openid.net/specs/openid-connect-core-1_0.html#UserInfoResponse
     # it's better to not insert a null or empty string value
-    user.emails = ""
+    user.emails = []
     user.save()
 
     data = generate_user_claims(user, STANDARD_CLAIMS, DEFAULT_JWT_MAPPING)