Fixed typo and master key bug

Author: cody-constine-ttd

tests/sharing_test.py

@@ -19,7 +19,7 @@
 _example_id = 'ywsvDNINiZOVSsfkHpLpSJzXzhr6Jx9Z/4Q0+lsEUvM='
 _now = dt.datetime.now(tz=timezone.utc)
 _master_key = EncryptionKey(_master_key_id, -1, _now - dt.timedelta(days=-1), _now, _now + dt.timedelta(days=1),
-                            _master_secret, keyset_id=9999)
+                            _master_secret, keyset_id=1)
 _site_key = EncryptionKey(_site_key_id, _site_id, _now - dt.timedelta(days=-1), _now, _now + dt.timedelta(days=1),
                           _site_secret, keyset_id=99999)
 
@@ -118,7 +118,7 @@ def test_raw_uid_produces_correct_identity_type_in_token(self):
 
     def test_multiple_keys_per_keyset(self):
         master_key2 = EncryptionKey(264, -1, _now - dt.timedelta(days=-2), _now - dt.timedelta(days=-1), _now - dt.timedelta(hours=-1),
-                            _master_secret, keyset_id=9999)
+                            _master_secret, keyset_id=1)
         site_key2 = EncryptionKey(_site_key_id, _site_id, _now - dt.timedelta(days=-2), _now - dt.timedelta(days=-1), _now - dt.timedelta(hours=-1),
                           _site_secret, keyset_id=99999)
         client = Uid2Client("endpoint", "authkey", _client_secret)
@@ -138,7 +138,7 @@ def test_cannot_encrypt_if_no_key_from_default_keyset(self):
 
         self.assertRaises(EncryptionError, encrypt, _example_uid, IdentityScope.UID2, keys)
 
-    def test_cannot_encrypt_if_theres_to_default_keyset_header(self):
+    def test_cannot_encrypt_if_theres_no_default_keyset_header(self):
         client = Uid2Client("endpoint", "authkey", _client_secret)
         json_body = self._key_set_to_json_for_sharing_with_header("", _site_id, [_master_key, _site_key])
         keys = client.refresh_json(json_body)

uid2_client/encryption.py

@@ -216,7 +216,7 @@ def encrypt(uid2, indentity_scope, keys, keyset_id=None, **kwargs):
         ad_token_version = AdvertisingTokenVersion.ADVERTISING_TOKEN_V4
 
     key = keys.get_default_keyset_key(now) if keyset_id is None else keys.get_by_keyset_key(keyset_id, now)
-    master_key = keys.get_by_keyset_key(9999, now)
+    master_key = keys.get_by_keyset_key(keys.get_master_keyset_id(), now)
 
     token_expiry = now + dt.timedelta(days=30) if keys.get_token_expiry_seconds() is None \
         else now + dt.timedelta(seconds=keys.get_token_expiry_seconds())