Fix issues due to resolving default arguments

Author: asloobq

tests/test_encryption.py

@@ -70,6 +70,8 @@ def validate_advertising_token(self, advertising_token_string, identity_scope, i
             self.assertEqual(-1, advertising_token_string.find("/"))
 
     def generate_uid2_token_v4(self, uid, master_key, site_id, site_key, params = Params(), identity_type = IdentityType.Email, identity_scope = IdentityScope.UID2):
+        if not isinstance(params.token_expiry, dt.datetime):
+            params.token_expiry = dt.datetime.now(tz=timezone.utc) + params.token_expiry
         advertising_token = UID2TokenGenerator.generate_uid2_token_v4(uid, master_key, site_id, site_key, params)
         self.validate_advertising_token(advertising_token, identity_scope, identity_type)
         return advertising_token
@@ -155,7 +157,7 @@ def test_decrypt_token_v4_no_site_key(self):
             result = decrypt(token, keys)
 
     def test_decrypt_token_v4_invalid_version(self):
-        params = Params(dt.timedelta(hours=1))
+        params = Params(dt.datetime.now(tz=timezone.utc) + dt.timedelta(hours=1))
         token = UID2TokenGenerator.generate_uid2_token_with_debug_info(_example_id, _master_key, _site_id, _site_key, params, 1)
 
         keys = EncryptionKeysCollection([_master_key, _site_key])
@@ -174,7 +176,8 @@ def test_decrypt_token_v4_expired(self):
             result = decrypt(token, keys)
 
     def _generate_v2_token(self, expires_in_seconds):
-        return UID2TokenGenerator.generate_uid2_token_v2(_example_id, _master_key, _site_id, _site_key, Params(expires_in_seconds))
+        return UID2TokenGenerator.generate_uid2_token_v2(_example_id, _master_key, _site_id, _site_key,
+                                                         Params(dt.datetime.now(tz=timezone.utc) + expires_in_seconds))
 
     def _generate_v4_token(self, expires_in_seconds):
         return self.generate_uid2_token_v4(_example_id, _master_key, _site_id, _site_key, Params(expires_in_seconds))
@@ -297,7 +300,7 @@ def test_decrypt_token_v3_no_site_key(self):
             result = decrypt(token, keys)
 
     def test_decrypt_token_v3_invalid_version(self):
-        params = Params(dt.timedelta(hours=1))
+        params = Params(dt.datetime.now(tz=timezone.utc) + dt.timedelta(hours=1))
         token = UID2TokenGenerator.generate_uid2_token_with_debug_info(_example_id, _master_key, _site_id, _site_key, params, 1)
 
         keys = EncryptionKeysCollection([_master_key, _site_key])
@@ -307,7 +310,7 @@ def test_decrypt_token_v3_invalid_version(self):
 
 
     def test_decrypt_token_v3_expired(self):
-        params = Params(dt.timedelta(seconds=-1))
+        params = Params(dt.datetime.now(tz=timezone.utc) + dt.timedelta(seconds=-1))
         token = UID2TokenGenerator.generate_uid2_token_v3(_example_id, _master_key, _site_id, _site_key, params)
 
         keys = EncryptionKeysCollection([_master_key, _site_key])
@@ -331,7 +334,7 @@ def test_decrypt_token_v3_custom_now(self):
 
 
     def test_decrypt_token_v3_invalid_payload(self):
-        params = Params(dt.timedelta(seconds=-1))
+        params = Params(dt.datetime.now(tz=timezone.utc) + dt.timedelta(seconds=-1))
         token = UID2TokenGenerator.generate_uid2_token_v3(_example_id, _master_key, _site_id, _site_key, params)
 
         keys = EncryptionKeysCollection([_master_key, _site_key])

uid2_client/auto_refresh.py

@@ -119,7 +119,7 @@ def cancel(self):
     def _try_refresh_keys(self):
         """Invoke UID2 client to refresh latest keys from the service."""
         try:
-            keys = self._client.refresh()
+            keys = self._client.refresh_keys()
             self._result = self._make_success_result(keys)
             return True
         except:

uid2_client/uid2_token_generator.py

@@ -50,25 +50,29 @@ def _encrypt_data_v1(data, key, iv):
 
 
 class Params:
-    def __init__(self, expiry=dt.datetime.now(tz=timezone.utc) + dt.timedelta(hours=1),
-                 identity_scope=IdentityScope.UID2.value, token_generated=dt.datetime.now(tz=timezone.utc),
-                 identity_established=dt.datetime.now(tz=timezone.utc)):
+    def __init__(self, expiry=None, identity_scope=IdentityScope.UID2.value, token_generated=None,
+                 identity_established=None):
+        now = dt.datetime.now(tz=timezone.utc)
+        if identity_established is None:
+            identity_established = now
+        if token_generated is None:
+            token_generated = now
+        if expiry is None:
+            expiry = now + dt.timedelta(hours=1)
+
+        self.identity_established = identity_established
+        self.token_generated = token_generated
         self.token_expiry = expiry
         self.identity_scope = identity_scope
-        self.token_generated = token_generated
-        self.identity_established = identity_established
-        if not isinstance(expiry, dt.datetime):
-            self.token_expiry = dt.datetime.now(tz=timezone.utc) + expiry
-
-
-def default_params():
-    return Params()
 
 
 class UID2TokenGenerator:
 
     @staticmethod
-    def generate_uid2_token_v2(id_str, master_key, site_id, site_key, params=default_params(), version=2):
+    def generate_uid2_token_v2(id_str, master_key, site_id, site_key, params=None, version=2):
+        if params is None:
+            params = Params()
+
         id = bytes(id_str, 'utf-8')
         identity = int.to_bytes(site_id, 4, 'big')
         identity += int.to_bytes(len(id), 4, 'big')
@@ -88,26 +92,19 @@ def generate_uid2_token_v2(id_str, master_key, site_id, site_key, params=default
         return base64.b64encode(token).decode('ascii')
 
     @staticmethod
-    def generate_uid2_token_v3(id_str, master_key, site_id, site_key, params=default_params()):
+    def generate_uid2_token_v3(id_str, master_key, site_id, site_key, params=None):
         return UID2TokenGenerator.generate_uid2_token_with_debug_info(id_str, master_key, site_id, site_key, params,
                                                     AdvertisingTokenVersion.ADVERTISING_TOKEN_V3.value)
 
     @staticmethod
-    def generate_uid2_token_v4(id_str, master_key, site_id, site_key, params=default_params()):
+    def generate_uid2_token_v4(id_str, master_key, site_id, site_key, params=None):
         return UID2TokenGenerator.generate_uid2_token_with_debug_info(id_str, master_key, site_id, site_key, params,
                                                     AdvertisingTokenVersion.ADVERTISING_TOKEN_V4.value)
 
     @staticmethod
     def generate_uid_token(id_str, master_key, site_id, site_key, identity_scope, token_version,
                            identity_established=None, token_generated=None, token_expiry=None):
-        params = default_params()
-        params.identity_scope = identity_scope
-        if identity_established is not None:
-            params.identity_established = identity_established
-        if token_generated is not None:
-            params.token_generated = token_generated
-        if token_expiry is not None:
-            params.token_expiry = token_expiry
+        params = Params(token_expiry, identity_scope, token_generated, identity_established)
         if token_version == AdvertisingTokenVersion.ADVERTISING_TOKEN_V2:
             return UID2TokenGenerator.generate_uid2_token_v2(id_str, master_key, site_id, site_key, params)
         elif token_version == AdvertisingTokenVersion.ADVERTISING_TOKEN_V3:
@@ -119,6 +116,8 @@ def generate_uid_token(id_str, master_key, site_id, site_key, identity_scope, to
 
     @staticmethod
     def generate_uid2_token_with_debug_info(id_str, master_key, site_id, site_key, params, version):
+        if params is None:
+            params = Params()
 
         # Publisher Data
         site_payload = int.to_bytes(site_id, length=4, byteorder='big')