Some cleanup

Author: asloobq

tests/test_client.py

@@ -132,7 +132,7 @@ def get_post_refresh_keys_response_with_no_default_keyset_key():
 
         with self.assertRaises(EncryptionError) as context:
             client.encrypt(example_uid)
-        self.assertEqual("('No Keyset Key Found',)", str(context.exception))
+        self.assertEqual("No Keyset Key Found", str(context.exception))
 
     def test_cannot_encrypt_if_theres_no_default_keyset_header(self, mock_refresh_keys_util):
         def get_post_refresh_keys_response_with_no_default_keyset_header():
@@ -146,7 +146,7 @@ def get_post_refresh_keys_response_with_no_default_keyset_header():
 
         with self.assertRaises(EncryptionError) as context:
             client.encrypt(example_uid)
-        self.assertEqual("('No Keyset Key Found',)", str(context.exception))
+        self.assertEqual("No Keyset Key Found", str(context.exception))
 
     def test_expiry_in_token_matches_expiry_in_response(self, mock_refresh_keys_util):
         def get_post_refresh_keys_response_with_token_expiry():
@@ -185,7 +185,7 @@ def get_post_refresh_keys_response_with_key_inactive():
 
         with self.assertRaises(EncryptionError) as context:
             client.encrypt(example_uid)
-        self.assertEqual("('No Keyset Key Found',)", str(context.exception))
+        self.assertEqual("No Keyset Key Found", str(context.exception))
 
     def test_encrypt_key_expired(self, mock_refresh_keys_util):
         def get_post_refresh_keys_response_with_key_expired():
@@ -199,4 +199,4 @@ def get_post_refresh_keys_response_with_key_expired():
 
         with self.assertRaises(EncryptionError) as context:
             client.encrypt(example_uid)
-        self.assertEqual("('No Keyset Key Found',)", str(context.exception))
+        self.assertEqual("No Keyset Key Found", str(context.exception))

uid2_client/decryption_status.py

@@ -2,16 +2,13 @@
 
 
 class DecryptionStatus(Enum):
-    DOMAIN_NAME_CHECK_FAILED = "domain_name_check_failed"
+    DOMAIN_NAME_CHECK_FAILED = "domain name check failed"
     INVALID_PAYLOAD = "invalid payload"
-    INVALID_TOKEN_LIFETIME = "invalid_token_lifetime"
+    INVALID_TOKEN_LIFETIME = "invalid token lifetime"
     KEYS_NOT_SYNCED = "no keys available or all keys have expired; refresh the latest keys from UID2 service"
-    NOT_AUTHORIZED_FOR_KEY = "not_authorized_for_key"
-    NOT_AUTHORIZED_FOR_MASTER_KEY = "not_authorized_for_master_key"
+    NOT_AUTHORIZED_FOR_KEY = "not authorized for key"
+    NOT_AUTHORIZED_FOR_MASTER_KEY = "not authorized for master key"
     NOT_INITIALIZED = "keys not initialized"
     SUCCESS = "success"
     TOKEN_EXPIRED = "token expired"
     VERSION_NOT_SUPPORTED = "token version not supported"
-    # TOKEN_DECRYPT_FAILURE = "token_decrypt_failure",
-    # KEY_INACTIVE = "key_inactive",
-    # ENCRYPTION_FAILURE = "encryption_failure"

uid2_client/encryption_status.py

@@ -2,11 +2,5 @@
 
 
 class EncryptionStatus(Enum):
-    SUCCESS = "success",
-    NOT_AUTHORIZED_FOR_KEY = "No Keyset Key Found",
-    # NOT_AUTHORIZED_FOR_MASTER_KEY = "not_authorized_for_master_key",
-    # NOT_INITIALIZED = "not_initialized",
-    # KEYS_NOT_SYNCED = "keys_not_synced",
-    # TOKEN_DECRYPT_FAILURE = "token_decrypt_failure",
-    # KEY_INACTIVE = "key_inactive",
-    # ENCRYPTION_FAILURE = "encryption_failure"
+    SUCCESS = "success"
+    NOT_AUTHORIZED_FOR_KEY = "No Keyset Key Found"