refactoring and adding tests

Author: Ian-Nara

examples/sample_auto_refresh.py

@@ -2,9 +2,9 @@
 import sys
 import time
 
-from uid2_client import EncryptionKeysAutoRefresher, IdentityScope
-from uid2_client import Uid2Client
-from uid2_client import decrypt
+from uid2_client import EncryptionKeysAutoRefresher
+from uid2_client.euid_client_factory import EuidClientFactory
+from uid2_client.uid2_client_factory import Uid2ClientFactory
 
 
 def _usage():
@@ -20,13 +20,16 @@ def _usage():
 secret_key = sys.argv[3]
 ad_token = sys.argv[4]
 
-client = Uid2Client(base_url, auth_key, secret_key, IdentityScope.UID2)
+# for EUID
+client = EuidClientFactory.create(base_url, auth_key, secret_key)
+# for UID2
+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):
         refresh_result = refresher.current_result()
         if refresh_result.ready:
             print('Keys are ready, last refreshed (UTC):', refresh_result.last_success_time, flush=True)
-            result = decrypt(ad_token, refresh_result.keys)
+            result = client.decrypt(ad_token)
             print('UID2 =', result.uid2, flush=True)
         else:
             print('Keys are not ready yet, last error:', refresh_result.last_error[1], flush=True)

examples/sample_client.py

@@ -1,9 +1,8 @@
 import sys
 
-from uid2_client import Uid2Client
-from uid2_client import decrypt
-from uid2_client import encrypt
-from uid2_client.identity_scope import IdentityScope
+from uid2_client.euid_client_factory import EuidClientFactory
+from uid2_client.uid2_client_factory import Uid2ClientFactory
+
 
 # this sample client decrypts an advertising token into a raw UID2
 # to demonstrate decryption for DSPs
@@ -21,11 +20,14 @@ def _usage():
 secret_key = sys.argv[3]
 ad_token = sys.argv[4]
 
-client = Uid2Client(base_url, auth_key, secret_key, IdentityScope.UID2)
-keys = client.refresh_keys()
-decrypt_result = client.decrypt(ad_token, keys)
+# for EUID
+client = EuidClientFactory.create(base_url, auth_key, secret_key)
+# for UID2
+client = Uid2ClientFactory.create(base_url, auth_key, secret_key)
+client.refresh_keys()
+decrypt_result = client.decrypt(ad_token)
 
 print('UID2 =', decrypt_result.uid2)
 print('Established =', decrypt_result.established)
 print('Site ID =', decrypt_result.site_id)
-print('Site Key Site ID =', decrypt_result.site_key_site_id)
+print('Site Key Site ID =', decrypt_result.site_key_site_id)

examples/sample_sharing.py

@@ -1,9 +1,8 @@
 import sys
 
-from uid2_client import Uid2Client
-from uid2_client import decrypt
-from uid2_client import encrypt
-from uid2_client.identity_scope import IdentityScope
+from uid2_client.euid_client_factory import EuidClientFactory
+from uid2_client.uid2_client_factory import Uid2ClientFactory
+
 
 # this sample client encrypts and decrypts a uid2 to a sharing token
 # to demonstrate encryption and decryption for sharers
@@ -21,13 +20,16 @@ def _usage():
 secret_key = sys.argv[3]
 raw_uid = sys.argv[4]
 
-client = Uid2Client(base_url, auth_key, secret_key, IdentityScope.UID2)
-keys = client.refresh_keys()
-new_ad_token = client.encrypt(raw_uid, keys)
+# for EUID
+client = EuidClientFactory.create(base_url, auth_key, secret_key)
+# for UID2
+client = Uid2ClientFactory.create(base_url, auth_key, secret_key)
+client.refresh_keys()
+new_ad_token = client.encrypt(raw_uid)
 
 print('New Ad Token =', new_ad_token)
 
-decrypt_result = client.decrypt(new_ad_token, keys)
+decrypt_result = client.decrypt(new_ad_token)
 
 print('Decrypted UID2 =', decrypt_result.uid2)
 print('Established =', decrypt_result.established)