Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 06:11:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 985762 - Remove displayname from IdP protocol. r=jib

Browse Source
This commit is contained in:
Martin Thomson 2014-03-20 15:49:33 -07:00
parent 846a3f333c
commit fae57f41a0
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/media/PeerConnection.js
View File

@ -676,7 +676,7 @@ RTCPeerConnection.prototype = {
_processIdentity: function(message) {
if (message) {
this._peerIdentity = new this._win.RTCIdentityAssertion(
this._remoteIdp.provider, message.identity.name);
this._remoteIdp.provider, message.identity);
let args = { peerIdentity: this._peerIdentity };
this.dispatchEvent(new this._win.Event("peeridentity"));

9
dom/media/PeerConnectionIdp.jsm
View File

@ -182,14 +182,13 @@ PeerConnectionIdp.prototype = {
try {
let contents = JSON.parse(message.contents);
if (typeof contents.fingerprint !== "object" ||
typeof message.identity !== "object") {
warn("fingerprint or identity not objects");
if (typeof contents.fingerprint !== "object") {
warn("fingerprint is not an object");
} else if (contents.fingerprint.digest !== fingerprint.digest ||
contents.fingerprint.algorithm !== fingerprint.algorithm) {
contents.fingerprint.algorithm !== fingerprint.algorithm) {
warn("fingerprint does not match");
} else {
let error = this._validateName(message.identity.name);
let error = this._validateName(message.identity);
if (error) {
warn(error);
} else {

4
dom/media/tests/identity/idp-proxy.js
View File

@ -86,9 +86,7 @@
type : "SUCCESS",
id : message.id,
message : {
identity : {
name : payload.username
},
identity : payload.username,
contents : payload.contents
}
});