Fix JWT test

Author: JonnyWong16

plexapi/myplex.py

@@ -2069,12 +2069,12 @@ def generateKeypair(self, keyfiles=(None, None), overwrite=False):
 
         privateKey = ed25519.Ed25519PrivateKey.generate()
         publicKey = privateKey.public_key()
-        self._privateKey = privateKey.private_bytes(
+        _privateKey = privateKey.private_bytes(
             encoding=serialization.Encoding.Raw,
             format=serialization.PrivateFormat.Raw,
             encryption_algorithm=serialization.NoEncryption()
         )
-        self._publicKey = publicKey.public_bytes(
+        _publicKey = publicKey.public_bytes(
             encoding=serialization.Encoding.Raw,
             format=serialization.PublicFormat.Raw
         )
@@ -2084,8 +2084,11 @@ def generateKeypair(self, keyfiles=(None, None), overwrite=False):
                 raise FileExistsError('Keypair files already exist, set overwrite=True to overwrite them.')
 
             with open(keyfiles[0], 'wb') as privateFile, open(keyfiles[1], 'wb') as publicFile:
-                privateFile.write(self._privateKey)
-                publicFile.write(self._publicKey)
+                privateFile.write(_privateKey)
+                publicFile.write(_publicKey)
+
+        self._privateKey = _privateKey
+        self._publicKey = _publicKey
 
     @property
     def _clientIdentifier(self):

tests/test_myplex.py

@@ -3,6 +3,7 @@
 import pytest
 from plexapi.exceptions import BadRequest, NotFound, Unauthorized
 from plexapi.myplex import MyPlexAccount, MyPlexInvite, MyPlexJWTLogin
+from plexapi.utils import createMyPlexDevice
 
 from . import conftest as utils
 from .payloads import MYPLEX_INVITE
@@ -369,31 +370,40 @@ def test_myplex_ping(account):
 
 
 def test_myplex_jwt_login(account, tmp_path, monkeypatch):
+    # Create a new MyPlexDevice for JWT tests
+    device = createMyPlexDevice(account=account)
+
+    privkey = tmp_path / 'private.key'
+    pubkey = tmp_path / 'public.key'
+
     jwtlogin = MyPlexJWTLogin(
-        token=account.authToken,
+        headers={'X-Plex-Client-Identifier': device.clientIdentifier},
+        token=device.token,
         scopes=['username', 'email', 'friendly_name']
     )
-    jwtlogin.generateKeypair(keyfiles=(tmp_path / 'private.key', tmp_path / 'public.key'), overwrite=True)
+    jwtlogin.generateKeypair(keyfiles=(privkey, pubkey), overwrite=True)
     with pytest.raises(FileExistsError):
-        jwtlogin.generateKeypair(keyfiles=(tmp_path / 'private.key', tmp_path / 'public.key'))
+        jwtlogin.generateKeypair(keyfiles=(privkey, pubkey))
     jwtlogin.registerDevice()
     jwtToken = jwtlogin.refreshJWT()
     assert jwtlogin.decodedJWT['user']['username'] == account.username
-    assert MyPlexAccount(token=jwtToken) == account
+    new_account = MyPlexAccount(token=jwtToken)
+    assert new_account.username == account.username
 
     jwtlogin = MyPlexJWTLogin(
+        headers={'X-Plex-Client-Identifier': device.clientIdentifier},
         jwtToken=jwtToken,
-        keypair=(tmp_path / 'private.key', tmp_path / 'public.key'),
+        keypair=(privkey, pubkey),
         scopes=['username', 'email', 'friendly_name']
     )
     assert jwtlogin.verifyJWT()
     newjwtToken = jwtlogin.refreshJWT()
     assert newjwtToken != jwtToken
-    assert MyPlexAccount(token=newjwtToken) == account
+    new_account = MyPlexAccount(token=newjwtToken)
+    assert new_account.username == account.username
 
     plexPublicJWKs = jwtlogin._getPlexPublicJWK()
-    invalidJWK = plexPublicJWKs[0].copy()
-    invalidJWK['x'] += 'invalid'
+    invalidJWK = jwtlogin._publicJWK._jwk_data.copy()
     monkeypatch.setattr(MyPlexJWTLogin, "_getPlexPublicJWK", lambda self: plexPublicJWKs + [invalidJWK])
     assert jwtlogin.decodePlexJWT()