Rename encryption status

Author: asloobq

tests/test_bidstream_client.py

@@ -249,7 +249,7 @@ def test_token_expiry_custom_decryption_time(self):  #TokenExpiryAndCustomNow
                                    created_at=created_at, expires_at=expires_at)
         result = self._client._decrypt_token_into_raw_uid(token, None, expires_at + dt.timedelta(seconds=1))
         self.assertFalse(result.success)
-        self.assertEqual(result.status, DecryptionStatus.TOKEN_EXPIRED)
+        self.assertEqual(result.status, DecryptionStatus.EXPIRED_TOKEN)
         self.assertEqual(result.expiry, expires_at)
 
         result = self._client._decrypt_token_into_raw_uid(token, None, expires_at - dt.timedelta(seconds=1))

tests/test_sharing_client.py

@@ -278,7 +278,7 @@ def test_expiry_in_token_matches_expiry_in_response(self):  # ExpiryInTokenMatch
 
         future_decryption_result = self._client._decrypt_token_into_raw_uid(encryption_data_response.encrypted_data, now + dt.timedelta(seconds=3))
         self.assertFalse(future_decryption_result.success)
-        self.assertEqual(DecryptionStatus.TOKEN_EXPIRED, future_decryption_result.status)
+        self.assertEqual(DecryptionStatus.EXPIRED_TOKEN, future_decryption_result.status)
         self.assertEqual(now + dt.timedelta(seconds=2), future_decryption_result.expiry)
 
     def test_encrypt_key_expired(self):  #EncryptKeyExpired

uid2_client/decryption_status.py

@@ -10,5 +10,5 @@ class DecryptionStatus(Enum):
     NOT_AUTHORIZED_FOR_MASTER_KEY = "not authorized for master key"
     NOT_INITIALIZED = "keys not initialized"
     SUCCESS = "success"
-    TOKEN_EXPIRED = "token expired"
+    EXPIRED_TOKEN = "token expired"
     VERSION_NOT_SUPPORTED = "token version not supported"

uid2_client/encryption.py

@@ -157,8 +157,8 @@ def _decrypt_token_v2(token_bytes, keys, domain_name, client_type, now):
     expires_ms = int.from_bytes(master_payload[:8], 'big')
     expires = dt.datetime.fromtimestamp(expires_ms / 1000.0, tz=timezone.utc)
     if expires < now:
-        return DecryptedToken(DecryptionStatus.TOKEN_EXPIRED, None, None, None, None,
-                          keys.get_identity_scope(), None, AdvertisingTokenVersion.ADVERTISING_TOKEN_V2, False, expires)
+        return DecryptedToken(DecryptionStatus.EXPIRED_TOKEN, None, None, None, None,
+                              keys.get_identity_scope(), None, AdvertisingTokenVersion.ADVERTISING_TOKEN_V2, False, expires)
 
     site_key_id = int.from_bytes(master_payload[8:12], 'big')
     site_key = keys.get(site_key_id)
@@ -209,8 +209,8 @@ def _decrypt_token_v3(token_bytes, keys, domain_name, client_type, now, token_ve
     expires_ms = int.from_bytes(master_payload[:8], 'big')
     expires = dt.datetime.fromtimestamp(expires_ms / 1000.0, tz=timezone.utc)
     if expires < now:
-        return DecryptedToken(DecryptionStatus.TOKEN_EXPIRED, None, None, None, None,
-                          keys.get_identity_scope(), identity_type, token_version, None, expires)
+        return DecryptedToken(DecryptionStatus.EXPIRED_TOKEN, None, None, None, None,
+                              keys.get_identity_scope(), identity_type, token_version, None, expires)
 
     # created 8:16
     # operator site id 16:20