handle bytes/str versions of twilio capability token

to avoid pinning PyJWT version

Author: jlev

call_server/campaign/views.py

@@ -263,6 +263,11 @@ def audio(campaign_id):
     twilio_client = current_app.config.get('TWILIO_CLIENT')
     twilio_capability = ClientCapabilityToken(*twilio_client.auth)
     twilio_capability.allow_client_outgoing(current_app.config.get('TWILIO_PLAYBACK_APP'))
+    twilio_jwt = twilio_capability.to_jwt()
+    if type(twilio_jwt) == bytes:
+        twilio_jwt_str = twilio_capability.to_jwt().decode('UTF-8')
+    elif type(twilio_jwt) == str:
+        twilio_jwt_str = twilio_jwt
 
     for field in form:
         campaign_audio, is_default_message = campaign.audio_or_default(field.name)
@@ -279,7 +284,7 @@ def audio(campaign_id):
         return redirect(url_for('campaign.launch', campaign_id=campaign.id))
 
     return render_template('campaign/audio.html', campaign=campaign, form=form,
-                           twilio_capability = twilio_capability.to_jwt().decode('UTF-8'),
+                           twilio_jwt=twilio_jwt_str,
                            descriptions=current_app.config.CAMPAIGN_FIELD_DESCRIPTIONS,
                            example_text=current_app.config.CAMPAIGN_MESSAGE_DEFAULTS)
 

call_server/static/dist/js/site.js

@@ -69,8 +69,8 @@ $(document).ready(function () {
                        navigator.msGetUserMedia);
       window.URL = window.URL || window.webkitURL;
 
-      if (CallPower.Config.TWILIO_CAPABILITY) {
-        this.setupTwilioClient(CallPower.Config.TWILIO_CAPABILITY);
+      if (CallPower.Config.TWILIO_JWT) {
+        this.setupTwilioClient(CallPower.Config.TWILIO_JWT);
       }
 
       // add required fields client-side
@@ -185,10 +185,10 @@ $(document).ready(function () {
       button.children('.text').html('Play');
     },
 
-    setupTwilioClient: function(capability) {
+    setupTwilioClient: function(token) {
       //connect twilio API to read text-to-speech
       try {
-        this.twilio = Twilio.Device.setup(capability, {"debug":CallPower.Config.DEBUG | false});
+        this.twilio = Twilio.Device.setup(token, {"debug":CallPower.Config.DEBUG | false});
       } catch (e) {
         console.error(e);
         msg = 'Sorry, your browser does not support WebRTC, Text-to-Speech playback may not work.<br/>' +

call_server/static/scripts/site/views/audio.js

@@ -23,8 +23,8 @@
                        navigator.msGetUserMedia);
       window.URL = window.URL || window.webkitURL;
 
-      if (CallPower.Config.TWILIO_CAPABILITY) {
-        this.setupTwilioClient(CallPower.Config.TWILIO_CAPABILITY);
+      if (CallPower.Config.TWILIO_JWT) {
+        this.setupTwilioClient(CallPower.Config.TWILIO_JWT);
       }
 
       // add required fields client-side
@@ -139,10 +139,10 @@
       button.children('.text').html('Play');
     },
 
-    setupTwilioClient: function(capability) {
+    setupTwilioClient: function(token) {
       //connect twilio API to read text-to-speech
       try {
-        this.twilio = Twilio.Device.setup(capability, {"debug":CallPower.Config.DEBUG | false});
+        this.twilio = Twilio.Device.setup(token, {"debug":CallPower.Config.DEBUG | false});
       } catch (e) {
         console.error(e);
         msg = 'Sorry, your browser does not support WebRTC, Text-to-Speech playback may not work.<br/>' +

call_server/templates/layouts/base_admin.html

@@ -53,7 +53,7 @@
 <script>
     window.CallPower = {
       Config: {
-        {% if twilio_capability %}TWILIO_CAPABILITY: "{{twilio_capability}}", {%endif%}
+        {% if twilio_jwt %}TWILIO_JWT: "{{twilio_jwt}}", {%endif%}
       }
     };
 </script>