Rename fields to align with other SDKs

Author: asloobq

tests/test_encryption.py

@@ -418,7 +418,7 @@ def test_smoke_token_v3(self):
         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()))
         result = UID2TokenGenerator.generate_uid2_token_v3(uid2, _master_key, _site_id, _site_key,
-                                                           Params(expiry=token_expiry, token_created_at=now))
+                                                           Params(expiry=token_expiry, token_generated_at=now))
         final = decrypt(result, keys, now=now)
 
         self.assertEqual(uid2, final.uid)

uid2_client/encryption.py

@@ -286,7 +286,7 @@ def encrypt(uid2, identity_scope, keys, keyset_id=None, **kwargs):
     if identity_scope is None:
         identity_scope = keys.get_identity_scope()
     try:
-        params = Params(expiry=token_expiry, identity_scope=identity_scope, token_created_at=now)
+        params = Params(expiry=token_expiry, identity_scope=identity_scope, token_generated_at=now)
         return EncryptionDataResponse.make_success(UID2TokenGenerator.generate_uid2_token_v4(uid2, master_key, site_id, key, params))
     except Exception:
         return EncryptionDataResponse.make_error(EncryptionStatus.ENCRYPTION_FAILURE)

uid2_client/uid2_token_generator.py

@@ -51,10 +51,10 @@ 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_created_at=dt.datetime.now(tz=timezone.utc)):
+                 identity_scope=IdentityScope.UID2.value, token_generated_at=dt.datetime.now(tz=timezone.utc)):
         self.identity_scope = identity_scope
         self.token_expiry = expiry
-        self.token_created_at = token_created_at
+        self.token_generated_at = token_generated_at
         if not isinstance(expiry, dt.datetime):
             self.token_expiry = dt.datetime.now(tz=timezone.utc) + expiry
 
@@ -73,7 +73,7 @@ def generate_uid2_token_v2(id_str, master_key, site_id, site_key, params = defau
         identity += id
         # old privacy_bits
         identity += int.to_bytes(0, 4, 'big')
-        created = params.token_created_at
+        created = params.token_generated_at
         identity += int.to_bytes(int(created.timestamp()) * 1000, 8, 'big')
         identity_iv = bytes([10, 11, 12, 13, 14, 15, 16, 1, 2, 3, 4, 5, 6, 7, 8, 9])
         expiry = params.token_expiry
@@ -102,7 +102,7 @@ def generate_uid_token(id_str, master_key, site_id, site_key, identity_scope, to
         params = default_params()
         params.identity_scope = identity_scope
         if created_at is not None:
-            params.token_created_at = created_at
+            params.token_generated_at = created_at
         if expires_at is not None:
             params.token_expiry = expires_at
         if token_version == AdvertisingTokenVersion.ADVERTISING_TOKEN_V2:
@@ -123,7 +123,7 @@ def generate_uid2_token_with_debug_info(id_str, master_key, site_id, site_key, p
         site_payload += int.to_bytes(0, 4, 'big')  # client key id
 
         site_payload += int.to_bytes(0, 4, 'big')  # privacy bits
-        created = params.token_created_at
+        created = params.token_generated_at
         site_payload += int.to_bytes(int(created.timestamp()) * 1000, 8, 'big')  # established
         site_payload += int.to_bytes(int(created.timestamp()) * 1000, 8, 'big')  # refreshed
         site_payload += id