From c4ea91fa823a976a0e14eace8f4bb16ae3d04a62 Mon Sep 17 00:00:00 2001
From: Jan-Ivar Bruaroey <jib@mozilla.com>
Date: Thu, 25 Feb 2016 00:24:16 -0500
Subject: [PATCH] Bug 1247619 - add console warning about OAuth for STUN not
 yet supported. r=jesup,smaug

MozReview-Commit-ID: L0nViIWiIDn

--HG--
extra : rebase_source : 3d463e85c811426384a758dca3b0a82370c22099
---
 dom/media/PeerConnection.js                            |  7 +++++++
 dom/webidl/RTCConfiguration.webidl                     | 10 ++++++++--
 .../src/peerconnection/PeerConnectionImpl.cpp          |  4 ++--
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/dom/media/PeerConnection.js b/dom/media/PeerConnection.js
index 4bde9ce7942d..8a67205a92dd 100644
--- a/dom/media/PeerConnection.js
+++ b/dom/media/PeerConnection.js
@@ -586,6 +586,13 @@ RTCPeerConnection.prototype = {
             throw new this._win.DOMException(msg + " - missing credential: " + urlStr,
                                              "InvalidAccessError");
           }
+          if (server.credentialType != "password") {
+            this.logWarning("RTCConfiguration TURN credentialType \""+
+                            server.credentialType +
+                            "\" is not yet implemented. Treating as password."+
+                            " https://bugzil.la/1247616",
+                            null, 0);
+          }
         }
         else if (!(url.scheme in { stun:1, stuns:1 })) {
           throw new this._win.DOMException(msg + " - improper scheme: " + url.scheme,
diff --git a/dom/webidl/RTCConfiguration.webidl b/dom/webidl/RTCConfiguration.webidl
index 71aa436004c6..072d9ba70e4f 100644
--- a/dom/webidl/RTCConfiguration.webidl
+++ b/dom/webidl/RTCConfiguration.webidl
@@ -7,11 +7,17 @@
  * http://dev.w3.org/2011/webrtc/editor/webrtc.html#idl-def-RTCConfiguration
  */
 
+enum RTCIceCredentialType {
+    "password",
+    "token"
+};
+
 dictionary RTCIceServer {
     (DOMString or sequence<DOMString>) urls;
     DOMString  url; //deprecated
-    DOMString? credential = null;
-    DOMString? username = null;
+    DOMString username;
+    DOMString credential;
+    RTCIceCredentialType credentialType = "password";
 };
 
 enum RTCIceTransportPolicy {
diff --git a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
index ff875e39f4ca..ec9b2a016e06 100644
--- a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
+++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
@@ -663,8 +663,8 @@ PeerConnectionConfiguration::AddIceServer(const RTCIceServer &aServer)
       port = (isStuns || isTurns)? 5349 : 3478;
 
     if (isTurn || isTurns) {
-      NS_ConvertUTF16toUTF8 credential(aServer.mCredential);
-      NS_ConvertUTF16toUTF8 username(aServer.mUsername);
+      NS_ConvertUTF16toUTF8 credential(aServer.mCredential.Value());
+      NS_ConvertUTF16toUTF8 username(aServer.mUsername.Value());
 
       if (!addTurnServer(host.get(), port,
                          username.get(),