Address comments

Author: caroline-ttd

examples/sample_identity_map_client.py

@@ -7,7 +7,7 @@
 # which contains raw uid or the reason why it is unmapped
 
 def _usage():
-    print('Usage: python3 sample_sharing_client.py <base_url> <auth_key> <secret_key> <email_1> <email_2> ... <email_n>'
+    print('Usage: python3 sample_sharing_client.py <base_url> <api_key> <client_secret> <email_1> <email_2> ... <email_n>'
           , file=sys.stderr)
     sys.exit(1)
 
@@ -16,12 +16,12 @@ def _usage():
     _usage()
 
 base_url = sys.argv[1]
-auth_key = sys.argv[2]
-secret_key = sys.argv[3]
+api_key = sys.argv[2]
+client_secret = sys.argv[3]
 email_list = sys.argv[4:]
 first_email = sys.argv[4]
 
-client = IdentityMapClient(base_url, auth_key, secret_key)
+client = IdentityMapClient(base_url, api_key, client_secret)
 
 identity_map_response = client.generate_identity_map(IdentityMapInput.from_emails(email_list))
 
@@ -30,7 +30,7 @@ def _usage():
 
 mapped_identity = mapped_identities.get(first_email)
 if mapped_identity is not None:
-    raw_uid = mapped_identity.get_raw_id()
+    raw_uid = mapped_identity.get_raw_uid()
     print('raw_uid =', raw_uid)
 else:
     unmapped_identity = unmapped_identities.get(first_email)

tests/test_identity_map_client.py

@@ -86,10 +86,10 @@ def test_identity_map_duplicate_emails(self):
         mapped_identities = response.mapped_identities
         self.assertEqual(4, len(mapped_identities))
 
-        raw_uid = mapped_identities.get("[email protected]").get_raw_id()
-        self.assertEqual(raw_uid, mapped_identities.get("[email protected]").get_raw_id())
-        self.assertEqual(raw_uid, mapped_identities.get("[email protected]").get_raw_id())
-        self.assertEqual(raw_uid, mapped_identities.get("[email protected]").get_raw_id())
+        raw_uid = mapped_identities.get("[email protected]").get_raw_uid()
+        self.assertEqual(raw_uid, mapped_identities.get("[email protected]").get_raw_uid())
+        self.assertEqual(raw_uid, mapped_identities.get("[email protected]").get_raw_uid())
+        self.assertEqual(raw_uid, mapped_identities.get("[email protected]").get_raw_uid())
 
     def test_identity_map_duplicate_hashed_emails(self):
         hashed_email = normalize_and_hash_email("[email protected]")
@@ -154,7 +154,7 @@ def test_identity_map_bad_secret(self):
     def assert_mapped(self, response, ddi):
         mapped_identity = response.mapped_identities.get(ddi)
         self.assertIsNotNone(mapped_identity)
-        self.assertIsNotNone(mapped_identity.get_raw_id())
+        self.assertIsNotNone(mapped_identity.get_raw_uid())
         self.assertIsNotNone(mapped_identity.get_bucket_id())
 
         unmapped_identity = response.unmapped_identities.get(ddi)

uid2_client/identity_map_client.py

@@ -17,24 +17,24 @@ class IdentityMapClient:
             generate_identity_map: Generate identity map
     """
 
-    def __init__(self, base_url, auth_key, secret_key):
+    def __init__(self, base_url, api_key, client_secret):
         """Create a new IdentityMapClient client.
 
         Args:
             base_url (str): base URL for all requests to UID services (e.g. 'https://prod.uidapi.com')
-            auth_key (str): authorization key for consuming the UID services
-            secret_key (str): secret key for consuming the UID services
+            api_key (str): api key for consuming the UID services
+            client_secret (str): client secret for consuming the UID services
 
         Note:
             Your authorization key will determine which UID services you are allowed to use.
         """
         self._base_url = base_url
-        self._auth_key = auth_key
-        self._secret_key = base64.b64decode(secret_key)
+        self._api_key = api_key
+        self._client_secret = base64.b64decode(client_secret)
 
     def generate_identity_map(self, identity_map_input):
-        req, nonce = make_v2_request(self._secret_key, dt.datetime.now(tz=timezone.utc),
+        req, nonce = make_v2_request(self._client_secret, dt.datetime.now(tz=timezone.utc),
                                      identity_map_input.get_identity_map_input_as_json_string().encode())
-        resp = post(self._base_url, '/v2/identity/map', headers=auth_headers(self._auth_key), data=req)
-        resp_body = parse_v2_response(self._secret_key, resp.read(), nonce)
+        resp = post(self._base_url, '/v2/identity/map', headers=auth_headers(self._api_key), data=req)
+        resp_body = parse_v2_response(self._client_secret, resp.read(), nonce)
         return IdentityMapResponse(resp_body, identity_map_input)

uid2_client/identity_map_response.py

@@ -43,7 +43,7 @@ def __init__(self, raw_uid, bucket_id):
         self.raw_uid = raw_uid
         self.bucket_id = bucket_id
 
-    def get_raw_id(self):
+    def get_raw_uid(self):
         return self.raw_uid
 
     def get_bucket_id(self):