Merge branch 'master' into ian-UID2-970-publisher-sdk

Author: Ian-Nara

examples/sample_auto_refresh.py

@@ -20,9 +20,9 @@ def _usage():
 secret_key = sys.argv[3]
 ad_token = sys.argv[4]
 
-# for EUID
-client = EuidClientFactory.create(base_url, auth_key, secret_key)
-# for UID2
+# for EUID use:
+# client = EuidClientFactory.create(base_url, auth_key, secret_key)
+# for UID2 use:
 client = Uid2ClientFactory.create(base_url, auth_key, secret_key)
 with EncryptionKeysAutoRefresher(client, dt.timedelta(seconds=4), dt.timedelta(seconds=7)) as refresher:
     for i in range(0, 20):

examples/sample_client.py

@@ -20,9 +20,9 @@ def _usage():
 secret_key = sys.argv[3]
 ad_token = sys.argv[4]
 
-# for EUID
-client = EuidClientFactory.create(base_url, auth_key, secret_key)
-# for UID2
+# for EUID use:
+# client = EuidClientFactory.create(base_url, auth_key, secret_key)
+# for UID2 use:
 client = Uid2ClientFactory.create(base_url, auth_key, secret_key)
 client.refresh_keys()
 decrypt_result = client.decrypt(ad_token)

examples/sample_sharing.py

@@ -20,9 +20,9 @@ def _usage():
 secret_key = sys.argv[3]
 raw_uid = sys.argv[4]
 
-# for EUID
-client = EuidClientFactory.create(base_url, auth_key, secret_key)
-# for UID2
+# for EUID use:
+# client = EuidClientFactory.create(base_url, auth_key, secret_key)
+# for UID2 use:
 client = Uid2ClientFactory.create(base_url, auth_key, secret_key)
 client.refresh_keys()
 new_ad_token = client.encrypt(raw_uid)

pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "uid2_client"
-version = "2.0.3"
+version = "2.1.0"
 authors = [
     { name = "UID2 team", email = "[email protected]" }
 ]

tests/test_client.py

@@ -215,7 +215,7 @@ def get_post_refresh_keys_response_with_token_expiry(base_url, path, headers, da
 
         with patch('uid2_client.encryption._decrypt_token_v3') as mock_decrypt:
             def decrypt_side_effect(token_bytes, keys, now):
-                return real_decrypt_v3(token_bytes, keys, now + dt.timedelta(seconds=2))
+                return real_decrypt_v3(token_bytes, keys, now + dt.timedelta(seconds=3))
 
             mock_decrypt.side_effect = decrypt_side_effect
 

tests/test_encryption.py

@@ -2,6 +2,7 @@
 
 from tests.uid2_token_generator import UID2TokenGenerator, Params
 from uid2_client import *
+from uid2_client.encryption import _encrypt_token
 from uid2_client.identity_scope import IdentityScope
 from uid2_client.identity_type import IdentityType
 from uid2_client.keys import *
@@ -337,6 +338,22 @@ def test_decrypt_token_v2_custom_now(self):
         result = decrypt(token, keys, now=expiry - dt.timedelta(seconds=1))
         self.assertEqual(_example_id, result.uid2)
 
+    def test_smoke_token_v3(self):
+        uid2 = _example_id
+        identity_scope = IdentityScope.UID2
+        now = dt.datetime.now(tz=timezone.utc)
+
+        keys = EncryptionKeysCollection([_master_key, _site_key, _keyset_key], default_keyset_id=20,
+                                        master_keyset_id=9999, caller_site_id=20)
+
+        result = _encrypt_token(uid2, identity_scope, _master_key, _site_key, _site_id, now=now,
+                                token_expiry=now + dt.timedelta(days=30) if keys.get_token_expiry_seconds() is None \
+                                    else now + dt.timedelta(seconds=int(keys.get_token_expiry_seconds())),
+                         ad_token_version=AdvertisingTokenVersion.ADVERTISING_TOKEN_V3)
+        final = decrypt(result, keys, now=now)
+
+        self.assertEqual(uid2, final.uid2)
+
     def test_smoke_token_v4(self):
         uid2 = _example_id
         identity_scope = IdentityScope.UID2

uid2_client/request_response_util.py

@@ -12,8 +12,13 @@ def _make_url(base_url, path):
 
 
 def auth_headers(auth_key):
+    try:
+        version = pkg_resources.get_distribution("uid2_client").version
+    except Exception:
+        version = "non-packaged-mode"
+
     return {'Authorization': 'Bearer ' + auth_key,
-            "X-UID2-Client-Version": "uid2-client-python-" + pkg_resources.get_distribution("uid2_client").version}
+            "X-UID2-Client-Version": "uid2-client-python-" + version}
 
 
 def make_v2_request(secret_key, now, data=None):