Address the comments

Author: caroline-ttd

examples/sample_identity_map_client.py

@@ -3,11 +3,11 @@
 from uid2_client import IdentityMapClient, IdentityMapInput
 
 
-# this sample client takes email addresses or phone numbers as input and generates an IdentityMapResponse object
-# which contains raw uid or the reason why it is unmapped
+# this sample client takes email addresses or phone numbers or hashed versions of either as input and generates
+# an IdentityMapResponse object which contains raw uid or the reason why it is unmapped
 
 def _usage():
-    print('Usage: python3 sample_sharing_client.py <base_url> <api_key> <client_secret> <email_1> <email_2> ... <email_n>'
+    print('Usage: python3 sample_identity_map_client.py <base_url> <api_key> <client_secret> <email_1> <email_2> ... <email_n>'
           , file=sys.stderr)
     sys.exit(1)
 

tests/test_identity_map_client.py

@@ -18,8 +18,6 @@ def setUpClass(cls):
         cls.UID2_API_KEY = os.getenv("UID2_API_KEY")
         cls.UID2_SECRET_KEY = os.getenv("UID2_SECRET_KEY")
 
-        print(cls.UID2_BASE_URL, cls.UID2_API_KEY, cls.UID2_SECRET_KEY)
-
         if cls.UID2_BASE_URL and cls.UID2_API_KEY and cls.UID2_SECRET_KEY:
             cls.identity_map_client = IdentityMapClient(cls.UID2_BASE_URL, cls.UID2_API_KEY, cls.UID2_SECRET_KEY)
         else:

uid2_client/identity_map_input.py

@@ -1,7 +1,6 @@
 import json
 
-from uid2_client import IdentityType, normalize_email_string, get_base64_encoded_hash, is_phone_number_normalized, \
-    normalize_and_hash_email, normalize_and_hash_phone
+from uid2_client import IdentityType, normalize_and_hash_email, normalize_and_hash_phone
 
 
 class IdentityMapInput:
@@ -13,19 +12,19 @@ def __init__(self, identity_type, emails_or_phones, already_hashed):
         self.hashed_normalized_phones = None
         if identity_type == IdentityType.Email:
             self.hashed_normalized_emails = []
-            for email in emails_or_phones:
-                if already_hashed:
-                    self.hashed_normalized_emails.append(email)
-                else:
+            if already_hashed:
+                self.hashed_normalized_emails = emails_or_phones
+            else:
+                for email in emails_or_phones:
                     hashed_normalized_email = normalize_and_hash_email(email)
                     self._add_hashed_to_raw_dii_mapping(hashed_normalized_email, email)
                     self.hashed_normalized_emails.append(hashed_normalized_email)
         else:  # phone
             self.hashed_normalized_phones = []
-            for phone in emails_or_phones:
-                if already_hashed:
-                    self.hashed_normalized_phones.append(phone)
-                else:
+            if already_hashed:
+                self.hashed_normalized_phones = emails_or_phones
+            else:
+                for phone in emails_or_phones:
                     hashed_normalized_phone = normalize_and_hash_phone(phone)
                     self._add_hashed_to_raw_dii_mapping(hashed_normalized_phone, phone)
                     self.hashed_normalized_phones.append(hashed_normalized_phone)

uid2_client/identity_map_response.py

@@ -3,39 +3,47 @@
 
 class IdentityMapResponse:
     def __init__(self, response, identity_map_input):
-        self.mapped_identities = {}
-        self.unmapped_identities = {}
+        self._mapped_identities = {}
+        self._unmapped_identities = {}
         response_json = json.loads(response)
-        self.status = response_json["status"]
+        self._status = response_json["status"]
 
         if not self.is_success():
-            raise ValueError("Got unexpected identity map status: " + self.status)
+            raise ValueError("Got unexpected identity map status: " + self._status)
 
-        body = self._get_body_as_json(response_json)
+        body = response_json["body"]
 
         for identity in body.get("mapped", []):
             raw_diis = self._get_raw_diis(identity, identity_map_input)
             mapped_identity = MappedIdentity.from_json(identity)
             for raw_dii in raw_diis:
-                self.mapped_identities[raw_dii] = mapped_identity
+                self._mapped_identities[raw_dii] = mapped_identity
 
         for identity in body.get("unmapped", []):
             raw_diis = self._get_raw_diis(identity, identity_map_input)
             unmapped_identity = UnmappedIdentity.from_json(identity)
             for raw_dii in raw_diis:
-                self.unmapped_identities[raw_dii] = unmapped_identity
-
-    @staticmethod
-    def _get_body_as_json(json_response):
-        return json_response["body"]
+                self._unmapped_identities[raw_dii] = unmapped_identity
 
     @staticmethod
     def _get_raw_diis(identity, identity_map_input):
         identifier = identity["identifier"]
         return identity_map_input.get_raw_diis(identifier)
 
     def is_success(self):
-        return self.status == "success"
+        return self._status == "success"
+
+    @property
+    def mapped_identities(self):
+        return self._mapped_identities
+
+    @property
+    def unmapped_identities(self):
+        return self._unmapped_identities
+
+    @property
+    def status(self):
+        return self._status
 
 
 class MappedIdentity: