Merge pull request #169 from digitaltsai/SIP

Makes the auth and headers for dial in the children of sip

Author: digitaltsai

sample/SipCall/README.md

@@ -27,8 +27,7 @@ Finally, start the PHP CLI development server (requires PHP >= 5.4) using the `r
 $ ./run-demo
 ```
 
-Visit <http://localhost:8080> in your browser. Open it again in a second window. Smile! You've just
-set up a group chat. You can
+Visit <http://localhost:8080> in your browser.
 
 ## Walkthrough
 

src/OpenTok/Util/Client.php

@@ -233,11 +233,11 @@ public function dial($sessionId, $token, $sipUri, $options)
         );
 
         if (isset($options) && array_key_exists('headers', $options) && sizeof($options['headers']) > 0) {
-            $body['headers'] = $options['headers'];
+            $body['sip']['headers'] = $options['headers'];
         }
 
         if (isset($options) && array_key_exists('auth', $options)) {
-            $body['auth'] = $options['auth'];
+            $body['sip']['auth'] = $options['auth'];
         }
 
         // set up the request

tests/OpenTok/OpenTokTest.php

@@ -1118,6 +1118,48 @@ public function testSipCall()
       $this->assertNotNull($sipCall->streamId);
     }
 
+    public function testSipCallWithAuth()
+    {
+      // Arrange
+      $mock = new MockPlugin();
+      $response = MockPlugin::getMockFile(
+          self::$mockBasePath . 'v2/partner/APIKEY/dial'
+      );
+      $mock->addResponse($response);
+      $this->client->addSubscriber($mock);
+
+      $sessionId = '1_MX4xMjM0NTY3OH4-VGh1IEZlYiAyNyAwNDozODozMSBQU1QgMjAxNH4wLjI0NDgyMjI';
+      $bogusApiKey = '12345678';
+      $bogusApiSecret = '0123456789abcdef0123456789abcdef0123456789';
+      $bogusToken = 'T1==TEST';
+      $bogusSipUri = 'sip:[email protected]';
+      $opentok = new OpenTok($bogusApiKey, $bogusApiSecret);
+
+      $auth = array(
+        'username' => 'john',
+        'password' => 'doe'
+      );
+
+      // Act
+      $sipCall = $this->opentok->dial($sessionId, $bogusToken, $bogusSipUri, array(
+        'auth' => $auth
+      ));
+
+      // Assert
+      $this->assertInstanceOf('OpenTok\SipCall', $sipCall);
+      $this->assertNotNull($sipCall->id);
+      $this->assertNotNull($sipCall->connectionId);
+      $this->assertNotNull($sipCall->streamId);
+
+      $requests = $mock->getReceivedRequests();
+      $this->assertCount(1, $requests);
+      $request = $requests[0];
+
+      $body = json_decode($request->getBody());
+      $this->assertEquals($auth['username'], $body->sip->auth->username);
+      $this->assertEquals($auth['password'], $body->sip->auth->password);
+    }
+
     public function testFailedSipCall()
     {
       // Arrange