adding application_id back to client for video compatibility

src/vonage/client.py

@@ -95,6 +95,8 @@ def __init__(
         self.signature_secret = signature_secret
         self.signature_method = signature_method
 
+        self.application_id = application_id
+
         if self.signature_method in {
             "md5",
             "sha1",
@@ -444,9 +446,9 @@ def _add_individual_errors(self, error_data):
         return message
 
     def _create_jwt_auth_string(self):
-        return b"Bearer " + self._generate_application_jwt()
+        return b"Bearer " + self.generate_application_jwt()
 
-    def _generate_application_jwt(self):
+    def generate_application_jwt(self):
         try:
             return self._jwt_client.generate_application_jwt(self._jwt_claims)
         except AttributeError as err:

src/vonage/video.py

@@ -1,3 +1,9 @@
+from __future__ import annotations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from vonage import Client
+
 from .errors import (
     InvalidRoleError,
     TokenExpiryError,
@@ -18,7 +24,7 @@ class Video:
     media_mode_values = {'routed', 'relayed'}
     token_roles = {'subscriber', 'publisher', 'moderator'}
 
-    def __init__(self, client):
+    def __init__(self, client: Client):
         self._client = client
 
     def create_session(self, session_options: dict = None):
@@ -313,7 +319,6 @@ def remove_stream_from_broadcast(self, broadcast_id: str, stream_id: str):
     def generate_client_token(self, session_id, token_options={}):
         now = int(time())
         claims = {
-            'application_id': self._client.application_id,
             'scope': 'session.connect',
             'session_id': session_id,
             'role': 'publisher',
@@ -339,10 +344,8 @@ def generate_client_token(self, session_id, token_options={}):
             claims['acl'] = token_options['acl']
 
         self.validate_client_token_options(claims)
-        headers = {'typ': 'JWT', 'alg': 'RS256'}
-        return jwt.encode(
-            payload=claims, key=self._client._private_key, algorithm='RS256', headers=headers
-        )
+        self._client.auth(claims)
+        return self._client.generate_application_jwt()
 
     def validate_client_token_options(self, claims):
         now = int(time())

tests/test_jwt.py

@@ -31,7 +31,7 @@ def vonage_jwt_mock(self, claims):
 
 def test_generate_application_jwt(client):
     with patch('vonage.client.JwtClient.generate_application_jwt', vonage_jwt_mock):
-        jwt = client._generate_application_jwt()
+        jwt = client.generate_application_jwt()
     assert jwt == test_jwt
 
 
@@ -47,7 +47,7 @@ def test_create_jwt_error_no_application_id_or_private_key():
     empty_client = Client()
 
     with raises(ClientError) as err:
-        empty_client._generate_application_jwt()
+        empty_client.generate_application_jwt()
     assert (
         str(err.value)
         == 'JWT generation failed. Check that you passed in valid values for "application_id" and "private_key".'

tests/test_video.py

@@ -1,4 +1,5 @@
 from util import *
+from vonage import Client
 from vonage.errors import (
     ClientError,
     InvalidRoleError,
@@ -20,7 +21,7 @@
 
 
 @responses.activate
-def test_create_default_session(client, dummy_data):
+def test_create_default_session(client: Client, dummy_data):
     stub(
         responses.POST,
         "https://video.api.vonage.com/session/create",
@@ -37,7 +38,7 @@ def test_create_default_session(client, dummy_data):
 
 
 @responses.activate
-def test_create_session_custom_archive_mode_and_location(client, dummy_data):
+def test_create_session_custom_archive_mode_and_location(client: Client, dummy_data):
     stub(
         responses.POST,
         "https://video.api.vonage.com/session/create",
@@ -55,7 +56,7 @@ def test_create_session_custom_archive_mode_and_location(client, dummy_data):
 
 
 @responses.activate
-def test_create_session_custom_media_mode(client, dummy_data):
+def test_create_session_custom_media_mode(client: Client, dummy_data):
     stub(
         responses.POST,
         "https://video.api.vonage.com/session/create",
@@ -135,7 +136,6 @@ def test_generate_client_token_custom_options(client):
 def test_check_client_token_headers(client):
     token = client.video.generate_client_token(session_id)
     headers = jwt.get_unverified_header(token)
-    print(headers)
     assert headers['alg'] == 'RS256'
     assert headers['typ'] == 'JWT'
 
@@ -152,7 +152,7 @@ def test_generate_client_token_invalid_expire_time(client):
 
 
 @responses.activate
-def test_get_stream(client, dummy_data):
+def test_get_stream(client: Client, dummy_data):
     stub(
         responses.GET,
         f"https://video.api.vonage.com/v2/project/{client.application_id}/session/{session_id}/stream/{stream_id}",
@@ -166,7 +166,7 @@ def test_get_stream(client, dummy_data):
 
 
 @responses.activate
-def test_list_streams(client, dummy_data):
+def test_list_streams(client: Client, dummy_data):
     stub(
         responses.GET,
         f"https://video.api.vonage.com/v2/project/{client.application_id}/session/{session_id}/stream",
@@ -180,7 +180,7 @@ def test_list_streams(client, dummy_data):
 
 
 @responses.activate
-def test_change_stream_layout(client, dummy_data):
+def test_change_stream_layout(client: Client, dummy_data):
     stub(
         responses.PUT,
         f"https://video.api.vonage.com/v2/project/{client.application_id}/session/{session_id}/stream",
@@ -194,7 +194,7 @@ def test_change_stream_layout(client, dummy_data):
 
 
 @responses.activate
-def test_send_signal_to_all_participants(client, dummy_data):
+def test_send_signal_to_all_participants(client: Client, dummy_data):
     stub(
         responses.POST,
         f"https://video.api.vonage.com/v2/project/{client.application_id}/session/{session_id}/signal",
@@ -208,7 +208,7 @@ def test_send_signal_to_all_participants(client, dummy_data):
 
 
 @responses.activate
-def test_send_signal_to_single_participant(client, dummy_data):
+def test_send_signal_to_single_participant(client: Client, dummy_data):
     stub(
         responses.POST,
         f"https://video.api.vonage.com/v2/project/{client.application_id}/session/{session_id}/connection/{connection_id}/signal",
@@ -225,7 +225,7 @@ def test_send_signal_to_single_participant(client, dummy_data):
 
 
 @responses.activate
-def test_disconnect_client(client, dummy_data):
+def test_disconnect_client(client: Client, dummy_data):
     stub(
         responses.DELETE,
         f"https://video.api.vonage.com/v2/project/{client.application_id}/session/{session_id}/connection/{connection_id}",
@@ -236,7 +236,7 @@ def test_disconnect_client(client, dummy_data):
 
 
 @responses.activate
-def test_mute_specific_stream(client, dummy_data):
+def test_mute_specific_stream(client: Client, dummy_data):
     stub(
         responses.POST,
         f"https://video.api.vonage.com/v2/project/{client.application_id}/session/{session_id}/stream/{stream_id}/mute",
@@ -250,7 +250,7 @@ def test_mute_specific_stream(client, dummy_data):
 
 
 @responses.activate
-def test_mute_all_streams(client, dummy_data):
+def test_mute_all_streams(client: Client, dummy_data):
     stub(
         responses.POST,
         f"https://video.api.vonage.com/v2/project/{client.application_id}/session/{session_id}/mute",
@@ -264,7 +264,7 @@ def test_mute_all_streams(client, dummy_data):
 
 
 @responses.activate
-def test_mute_all_streams_except_excluded_list(client, dummy_data):
+def test_mute_all_streams_except_excluded_list(client: Client, dummy_data):
     stub(
         responses.POST,
         f"https://video.api.vonage.com/v2/project/{client.application_id}/session/{session_id}/mute",
@@ -280,7 +280,7 @@ def test_mute_all_streams_except_excluded_list(client, dummy_data):
 
 
 @responses.activate
-def test_disable_mute_all_streams(client, dummy_data):
+def test_disable_mute_all_streams(client: Client, dummy_data):
     stub(
         responses.POST,
         f"https://video.api.vonage.com/v2/project/{client.application_id}/session/{session_id}/mute",
@@ -300,7 +300,7 @@ def test_disable_mute_all_streams(client, dummy_data):
 
 
 @responses.activate
-def test_list_archives_with_filters_applied(client, dummy_data):
+def test_list_archives_with_filters_applied(client: Client, dummy_data):
     stub(
         responses.GET,
         f"https://video.api.vonage.com/v2/project/{client.application_id}/archive",
@@ -315,7 +315,7 @@ def test_list_archives_with_filters_applied(client, dummy_data):
 
 
 @responses.activate
-def test_create_new_archive(client, dummy_data):
+def test_create_new_archive(client: Client, dummy_data):
     stub(
         responses.POST,
         f"https://video.api.vonage.com/v2/project/{client.application_id}/archive",
@@ -332,7 +332,7 @@ def test_create_new_archive(client, dummy_data):
 
 
 @responses.activate
-def test_get_archive(client, dummy_data):
+def test_get_archive(client: Client, dummy_data):
     stub(
         responses.GET,
         f"https://video.api.vonage.com/v2/project/{client.application_id}/archive/{archive_id}",
@@ -348,23 +348,25 @@ def test_get_archive(client, dummy_data):
 
 
 @responses.activate
-def test_delete_archive(client, dummy_data):
+def test_delete_archive(client: Client, dummy_data):
     stub(
         responses.GET,
         f"https://video.api.vonage.com/v2/project/{client.application_id}/archive/{archive_id}",
         status_code=204,
+        fixture_path='no_content.json',
     )
 
     assert client.video.delete_archive(archive_id=archive_id) == None
     assert request_user_agent() == dummy_data.user_agent
 
 
 @responses.activate
-def test_add_stream_to_archive(client, dummy_data):
+def test_add_stream_to_archive(client: Client, dummy_data):
     stub(
         responses.PATCH,
         f"https://video.api.vonage.com/v2/project/{client.application_id}/archive/{archive_id}/streams",
         status_code=204,
+        fixture_path='no_content.json',
     )
 
     assert (
@@ -377,19 +379,20 @@ def test_add_stream_to_archive(client, dummy_data):
 
 
 @responses.activate
-def test_remove_stream_from_archive(client, dummy_data):
+def test_remove_stream_from_archive(client: Client, dummy_data):
     stub(
         responses.PATCH,
         f"https://video.api.vonage.com/v2/project/{client.application_id}/archive/{archive_id}/streams",
         status_code=204,
+        fixture_path='no_content.json',
     )
 
     assert client.video.remove_stream_from_archive(archive_id=archive_id, stream_id='1234') == None
     assert request_user_agent() == dummy_data.user_agent
 
 
 @responses.activate
-def test_stop_archive(client, dummy_data):
+def test_stop_archive(client: Client, dummy_data):
     stub(
         responses.POST,
         f"https://video.api.vonage.com/v2/project/{client.application_id}/archive/{archive_id}/stop",
@@ -405,7 +408,7 @@ def test_stop_archive(client, dummy_data):
 
 
 @responses.activate
-def test_change_archive_layout(client, dummy_data):
+def test_change_archive_layout(client: Client, dummy_data):
     stub(
         responses.PUT,
         f"https://video.api.vonage.com/v2/project/{client.application_id}/archive/{archive_id}/layout",
@@ -665,11 +668,12 @@ def test_change_broadcast_layout(client):
 
 
 @responses.activate
-def test_add_stream_to_broadcast(client, dummy_data):
+def test_add_stream_to_broadcast(client: Client, dummy_data):
     stub(
         responses.PATCH,
         f"https://video.api.vonage.com/v2/project/{client.application_id}/broadcast/{broadcast_id}/streams",
         status_code=204,
+        fixture_path='no_content.json',
     )
 
     assert (
@@ -682,7 +686,7 @@ def test_add_stream_to_broadcast(client, dummy_data):
 
 
 @responses.activate
-def test_remove_stream_from_archive(client, dummy_data):
+def test_remove_stream_from_archive(client: Client, dummy_data):
     stub(
         responses.PATCH,
         f"https://video.api.vonage.com/v2/project/{client.application_id}/broadcast/{broadcast_id}/streams",