Make fetching identity scope optional

Author: asloobq

tests/test_bidstream_client.py

@@ -86,7 +86,6 @@ def decrypt_and_assert_success(self, token, token_version, scope):
         self._assert_success(decrypted, token_version, scope)
 
     def setUp(self):
-        self._key_collection = create_key_collection(IdentityScope.UID2)
         self._client = BidstreamClient(self._CONST_BASE_URL, self._CONST_API_KEY, client_secret)
 
     def test_smoke_test(self):  # SmokeTest
@@ -203,10 +202,10 @@ def test_empty_keys(self):  # EmptyKeyContainer
         self.assertEqual(result.status, DecryptionStatus.NOT_INITIALIZED)
 
     def test_master_key_expired(self):  #ExpiredKeyContainer
-        master_key_expired = EncryptionKey(master_key_id, -1, created=now, activates=now - dt.timedelta(hours=2), expires=now - dt.timedelta(hours=1), secret=master_secret,
-                                        keyset_id=99999)
-        site_key_expired = EncryptionKey(site_key_id, site_id, created=now, activates=now - dt.timedelta(hours=2), expires=now - dt.timedelta(hours=1), secret=site_secret,
-                                        keyset_id=99999)
+        master_key_expired = EncryptionKey(master_key_id, -1, created=now, activates=now - dt.timedelta(hours=2),
+                                           expires=now - dt.timedelta(hours=1), secret=master_secret, keyset_id=99999)
+        site_key_expired = EncryptionKey(site_key_id, site_id, created=now, activates=now - dt.timedelta(hours=2),
+                                         expires=now - dt.timedelta(hours=1), secret=site_secret, keyset_id=99999)
 
         refresh_response = self._client._refresh_json(create_bidstream_response_json(
             [master_key_expired, site_key_expired], IdentityScope.UID2))

tests/test_sharing_client.py

@@ -62,7 +62,6 @@ class TestSharingClient(unittest.TestCase):
     _CONST_API_KEY = 'api_key'
 
     def setUp(self):
-        self._key_collection = create_key_collection(IdentityScope.UID2)
         self._client = SharingClient(self._CONST_BASE_URL, self._CONST_API_KEY, client_secret)
 
     def _assert_success(self, decryption_response, token_version, scope):

tests/test_utils.py

@@ -83,7 +83,6 @@ def key_set_to_json_for_sharing(keys):
 def key_set_to_json_for_sharing_with_header(default_keyset, caller_site_id, keys):
     return """{{
                     "body": {{
-                        "identity_scope": "UID2",
                         "caller_site_id": {0}, 
                         "master_keyset_id": 1,
                         "token_expiry_seconds": 86400,
@@ -111,18 +110,11 @@ def format_key(key: EncryptionKey):
                                          base64.b64encode(key.secret).decode("utf-8"))
 
 
-
 def create_default_key_collection(key_set):
     return EncryptionKeysCollection(key_set, IdentityScope.UID2, 9000, 1,
                                     99999, 2)
 
 
-def create_key_collection(identity_scope):
-    key_set = [master_key, site_key]
-    return EncryptionKeysCollection(key_set, identity_scope, site_id, 1,
-                             99999, 86400)
-
-
 def generate_uid_token(identity_scope, version, raw_uid=example_uid, created_at=None, expires_at=None):
     return UID2TokenGenerator.generate_uid_token(raw_uid, master_key, site_id, site_key,
                                                  identity_scope, version, created_at, expires_at)

uid2_client/refresh_keys_util.py

@@ -15,7 +15,7 @@ def _make_dt(timestamp):
 def _parse_keys_json(resp_body):
     keys = []
     identity_scope = IdentityScope.UID2
-    if resp_body["identity_scope"] == "EUID":
+    if resp_body.get("identity_scope") == "EUID":
         identity_scope = IdentityScope.EUID
     for key in resp_body["keys"]:
         keyset_id = key.get("keyset_id")