Merge pull request #245 from mozilla-services/1094838-userMac-consist…

…ency Bug 1094838 — Be consistent on the userMac usage.
mozilla-services · Nov 16, 2014 · 43e9eae · 43e9eae
2 parents fc6eced + 2ba80be
commit 43e9eae
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/loop/config.js b/loop/config.js
@@ -193,7 +193,7 @@ var conf = convict({
   fakeTokBoxURL: {
     doc: "URL where to Mock TokBox calls",
     format: String,
-    default: "http://httpbin.org/deny"
+    default: "https://call.stage.mozaws.net/"
   },
   tokBox: {
     apiUrl: {

diff --git a/loop/routes/rooms.js b/loop/routes/rooms.js
@@ -71,7 +71,7 @@ module.exports = function (apiRouter, conf, logError, storage, auth,
    * Update room data and emit an event if needed so the owner is aware.
    *
    * @param roomToken The roomToken
-   * @param userIdHmac The roomOwnerHmac
+   * @param roomOwnerHmac The roomOwnerHmac
    * @param callback The action to do next
    **/
   function emitRoomEvent(roomToken, roomOwnerHmac, callback) {
@@ -151,7 +151,7 @@ module.exports = function (apiRouter, conf, logError, storage, auth,
         participants = participants.map(function(participant) {
           participant.owner = (participant.userIdHmac === roomStorageData.roomOwnerHmac);
           delete participant.hawkIdHmac;
-          delete participant.userIdHmac;
+          delete participant.userMac;
           delete participant.clientMaxSize;
           return participant;
         });
@@ -337,7 +337,7 @@ module.exports = function (apiRouter, conf, logError, storage, auth,
                           id: uuid.v4(),
                           displayName: req.body.displayName,
                           clientMaxSize: requestMaxSize,
-                          userIdHmac: req.user,
+                          userMac: req.user,
                           account: account
                         }, ttl, function(err) {
                           if (res.serverError(err)) return;

diff --git a/test/rooms_test.js b/test/rooms_test.js
@@ -1353,7 +1353,7 @@ describe("/rooms", function() {
                 expect(participant.account).to.eql('alexis@notmyidea.org');
                 expect(participant.displayName).to.eql('Alexis');
                 expect(participant.id).to.not.eql(undefined);
-                expect(participant.userIdHmac).to.eql(undefined);
+                expect(participant.userMac).to.eql(undefined);
                 expect(participant.hawkIdHmac).to.eql(undefined);
 
                 delete res.body[0].participants;