Bug 1021595 - Set "services.mobileid.forcehttps" to true once the server is https. r=jedp, a=lmandel
authorFernando Jiménez <ferjmoreno@gmail.com>
Thu, 03 Jul 2014 11:56:34 +0200
changeset 208802 ca9c1bf798be255409116c62a0445ef9d8f4804f
parent 208801 9bfa44d692e27960f008a8b65f77c80ff657ba42
child 208803 3f9d7a3a0b7be26226f07cde59cc85b80188511c
push id494
push userraliiev@mozilla.com
push dateMon, 25 Aug 2014 18:42:16 +0000
treeherdermozilla-release@a3cc3e46b571 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjedp, lmandel
bugs1021595
milestone32.0a2
Bug 1021595 - Set "services.mobileid.forcehttps" to true once the server is https. r=jedp, a=lmandel
b2g/app/b2g.js
services/mobileid/MobileIdentityClient.jsm
--- a/b2g/app/b2g.js
+++ b/b2g/app/b2g.js
@@ -995,12 +995,13 @@ pref("touchcaret.enabled", false);
 pref("selectioncaret.enabled", false);
 
 // Enable sync and mozId with Firefox Accounts.
 #ifdef MOZ_SERVICES_FXACCOUNTS
 pref("services.sync.fxaccounts.enabled", true);
 pref("identity.fxaccounts.enabled", true);
 #endif
 
-pref("services.mobileid.server.uri", "http://msisdn.dev.mozaws.net");
+// Mobile Identity API.
+pref("services.mobileid.server.uri", "https://msisdn-dev.stage.mozaws.net");
 
 // Enable mapped array buffer
 pref("dom.mapped_arraybuffer.enabled", true);
--- a/services/mobileid/MobileIdentityClient.jsm
+++ b/services/mobileid/MobileIdentityClient.jsm
@@ -15,19 +15,18 @@ Cu.import("resource://services-common/ha
 Cu.import("resource://services-common/utils.js");
 Cu.import("resource://services-crypto/utils.js");
 Cu.import("resource://gre/modules/MobileIdentityCommon.jsm");
 Cu.import("resource://gre/modules/Promise.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
 this.MobileIdentityClient = function(aServerUrl) {
   let serverUrl = aServerUrl || SERVER_URL;
-  let forceHttps = false;
+  let forceHttps = true;
   try {
-    // TODO: Force https in production. Bug 1021595.
     forceHttps = Services.prefs.getBoolPref(PREF_FORCE_HTTPS);
   } catch(e) {
     log.warn("Getting force HTTPS pref failed. If this was not intentional " +
              "check that " + PREF_FORCE_HTTPS + " is defined");
   }
 
   log.debug("Force HTTPS " + forceHttps);