commonplace - npm Package Compare versions

Comparing version 0.6.3 to 0.6.4

dist/core/capabilities.js

@@ -43,2 +43,10 @@ define('capabilities', ['settings'], function(settings) {
     };
+    static_caps.yulelogFxA = function() {
+        return (static_caps.firefoxOS &&
+                settings.switches.indexOf('firefox-accounts') !== -1 &&
+                window.top !== window.self &&
+                navigator.userAgent.match(/rv:(\d{2})/)[1] >= 34 &&
+                // Disable until ready to begin native-fxa testing
+                false);
+    };
     static_caps.fallbackFxA = function() {
@@ -45,0 +53,0 @@ return (!static_caps.nativeFxA() &&

dist/core/login.js

@@ -15,3 +15,3 @@ define('login',
     var pending_logins = [];
-
+    var packaged_origin = "app://packaged." + window.location.host;
     function oncancel() {
@@ -145,3 +145,5 @@ console.log('Login cancelled');
         }
-        if (capabilities.fallbackFxA()) {
+        if (capabilities.yulelogFxA()) {
+            window.top.postMessage({type: 'fxa-request'}, packaged_origin);
+        } else if (capabilities.fallbackFxA()) {
             var fxa_url;
@@ -181,3 +183,2 @@ if (user.canMigrate()) {
             }, 150);
-
         } else {
@@ -200,6 +201,10 @@ persona_loaded.done(function() {
         console.log('Got assertion from Persona');
-
+        if (capabilities.yulelogFxA()) {
+            var aud = packaged_origin;
+        } else {
+            var aud = window.location.protocol + '//' + window.location.host;
+        }
         var data = {
             assertion: assertion,
-            audience: window.location.protocol + '//' + window.location.host,
+            audience: aud,
             is_mobile: capabilities.mobileLogin()
@@ -305,3 +310,21 @@ };
     siteConfig.promise.done(function(data) {
-        if (!capabilities.fallbackFxA()) {
+        if (capabilities.yulelogFxA()) {
+            console.log("setting up yulelog-fxa");
+            window.addEventListener('message', function (msg) {
+                if (!msg.data || !msg.data.type || !msg.origin !== packaged_origin) {
+                    return;
+                }
+                console.log("fxa message " + JSON.stringify(msg.data));
+                if (msg.data.type === 'fxa-login') {
+                    gotVerifiedEmail(msg.data.assertion);
+                } else if (msg.data.type === 'fxa-logout') {
+                    logOut();
+                } else if (msg.data.type === 'fxa-cancel') {
+                    oncancel();
+                }
+            });
+            window.top.postMessage({type: 'fxa-watch',
+                                    email: user.get_setting('email') || ''},
+                                   packaged_origin);
+        } else if (!capabilities.fallbackFxA()) {
             // Try to load persona. This is used by persona native/fallback
@@ -308,0 +331,0 @@ // implementation, as well as fxa native.

lib/config.js

@@ -112,3 +112,3 @@ var CORE_MODULES = [
     CSS_DEST_PATH: CSS_DEST_PATH,
-    GULP_SRC_PATH: 'bower_components/marketplace-gulp',
+    GULP_SRC_PATH: (process.env.BOWER_PATH || 'bower_components/') + 'marketplace-gulp',
     JS_DEST_PATH: JS_DEST_PATH,
@@ -115,0 +115,0 @@ LIB_DEST_PATH: LIB_DEST_PATH,

package.json

 {
   "name": "commonplace",
   "description": "Reusable components for Firefox Marketplace frontend projects.",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "main": "lib/commonplace",
@@ -6,0 +6,0 @@ "preferGlobal": true,

No alert changes

Improved metrics

Total package byte prevSize

871539

increased by0.2%

Number of package files

316

increased by0.64%

Lines of code

6979

increased by0.49%

No dependency changes