Merge pull request #34 from Bandwidth/EDGE-630

EDGE-630 Add voice callId to the generateTransferVerb for debugging (breaking change)

Author: acopeland-bw

src/main/java/com/bandwidth/webrtc/utils/WebRtcTransfer.java

@@ -2,20 +2,21 @@
 package com.bandwidth.webrtc.utils;
 
 public class WebRtcTransfer {
-    public static String generateBxml(String deviceToken) {
-        return WebRtcTransfer.generateBxml(deviceToken, "sip:sipx.webrtc.bandwidth.com:5060");
+    public static String generateBxml(String deviceToken, String voiceCallId) {
+        return WebRtcTransfer.generateBxml(deviceToken, voiceCallId, "sip:sipx.webrtc.bandwidth.com:5060");
     }
 
-    public static String generateBxml(String deviceToken, String sipUri) {
+    public static String generateBxml(String deviceToken, String voiceCallId, String sipUri) {
         return "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
                 + "<Response>"
-                + generateTransferVerb(deviceToken, sipUri)
+                + generateTransferVerb(deviceToken, voiceCallId, sipUri)
                 + "</Response>\n";
     }
 
-    public static String generateTransferVerb(String deviceToken, String sipUri) {
+    public static String generateTransferVerb(String deviceToken, String voiceCallId, String sipUri) {
+        String formattedCallId = String.join("", voiceCallId.split("-", 2)[1].split("-"));
         return "<Transfer>\n"
-                + "\t<SipUri uui=\"" + deviceToken + ";encoding=jwt\">" + sipUri + "</SipUri>\n"
+                + "\t<SipUri uui=\"" + formattedCallId + ";encoding=base64," + deviceToken + ";encoding=jwt\">" + sipUri + "</SipUri>\n"
                 + "</Transfer>";
     }
 }

src/test/java/com/bandwidth/BxmlTest.java

@@ -1,4 +1,5 @@
 package com.bandwidth.voice.bxml.verbs;
+import com.bandwidth.webrtc.utils.WebRtcTransfer;
 
 import org.junit.Test;
 import org.junit.Before;
@@ -7,6 +8,7 @@
 
 import java.util.ArrayList;
 
+
 /**
  * Unit tests for BXML
  */
@@ -462,4 +464,33 @@ public void testStartGather() {
 
         assertEquals("BXML strings not equal", expected, response);
     }
+
+    @Test
+    public void testGenerateBxmlTwoParams() {
+        String response = WebRtcTransfer.generateBxml("asdf","c-93d6f3c0-be584596-0b74-4fa2-8015-d8ede84bd1a4");
+        String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
+                + "<Response><Transfer>\n"
+                + "\t<SipUri uui=\"93d6f3c0be5845960b744fa28015d8ede84bd1a4;encoding=base64,asdf;encoding=jwt\">sip:sipx.webrtc.bandwidth.com:5060</SipUri>\n"
+                + "</Transfer></Response>\n";
+        assertEquals("BXML strings are equal", expected, response);
+    }
+
+    @Test
+    public void testGenerateBxmlThreeParams() {
+        String response = WebRtcTransfer.generateBxml("asdf","c-93d6f3c0-be584596-0b74-4fa2-8015-d8ede84bd1a4", "sip1:sipx.webrtc.bandwidth.com:5060");
+        String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
+                + "<Response><Transfer>\n"
+                + "\t<SipUri uui=\"93d6f3c0be5845960b744fa28015d8ede84bd1a4;encoding=base64,asdf;encoding=jwt\">sip1:sipx.webrtc.bandwidth.com:5060</SipUri>\n"
+                + "</Transfer></Response>\n";
+        assertEquals("BXML strings are equal", expected, response);
+    }
+
+    @Test
+    public void testGenerateBxmlVerb() {
+        String response = WebRtcTransfer.generateTransferVerb("asdf","c-93d6f3c0-be584596-0b74-4fa2-8015-d8ede84bd1a4", "sip:sipx.webrtc.bandwidth.com:5060");
+        String expected = "<Transfer>\n"
+                + "\t<SipUri uui=\"93d6f3c0be5845960b744fa28015d8ede84bd1a4;encoding=base64,asdf;encoding=jwt\">sip:sipx.webrtc.bandwidth.com:5060</SipUri>\n"
+                + "</Transfer>";
+        assertEquals("BXML strings are equal", expected, response);
+    }
 }