See the discussion on bug 927967. We're currently implementing an unnecessary workaround in the customization workflow to allow marketplace to have an origin of app://marketplace.firefox.com. Now that we have the origin property in the webapp manifest, we no longer need to include that workaround. We're looking in removing that workaround, so we need marketplace to add origin = app://marketplace.firefox.com in their webapp manifest.

https://github.com/mozilla/fireplace/commit/2b524f4 Updated all our packages!

(In reply to Jason Smith [:jsmith] from comment #0) > See the discussion on bug 927967. We're currently implementing an > unnecessary workaround in the customization workflow to allow marketplace to > have an origin of app://marketplace.firefox.com. Now that we have the origin > property in the webapp manifest, we no longer need to include that > workaround. We're looking in removing that workaround, so we need > marketplace to add origin = app://marketplace.firefox.com in their webapp > manifest. Actually IIRC that should be just "origin": "marketplace.firefox.com" without the protocol part.

(In reply to Antonio Manuel Amaya Calvo (:amac) from comment #2) > (In reply to Jason Smith [:jsmith] from comment #0) > > See the discussion on bug 927967. We're currently implementing an > > unnecessary workaround in the customization workflow to allow marketplace to > > have an origin of app://marketplace.firefox.com. Now that we have the origin > > property in the webapp manifest, we no longer need to include that > > workaround. We're looking in removing that workaround, so we need > > marketplace to add origin = app://marketplace.firefox.com in their webapp > > manifest. > > Actually IIRC that should be just > > "origin": "marketplace.firefox.com" > > without the protocol part. Nah, I stand corrected. It's as Jason said app:// + domain. [1] https://mxr.mozilla.org/mozilla-central/source/dom/apps/src/Webapps.jsm#2895

I think this bug is not fixed, market app still has the origin in its metadata: https://github.com/mozilla-b2g/gaia/blob/master/external-apps/marketplace.firefox.com/metadata.json#L5 It should be moved to the manifest.webapp inside application.zip And the same for https://github.com/mozilla-b2g/gaia/tree/master/test_external_apps/marketplace-dev.allizom.org

Correct. Thanks - will address.

Comment on attachment 8341296 [details] https://github.com/mozilla-b2g/gaia/pull/14285 lgtm

Comment on attachment 8341296 [details] https://github.com/mozilla-b2g/gaia/pull/14285 The patch on the https://github.com/cvan/gaia/commit/655f9ab3c01edfdd8ce353b01b065b946da06ece commit looks good to me. Still, we usually have only one commit (for only one bug) on each PR, and this one has two different commits for two different bugs. I don't think you should land it that way.

The patch seems correct to me, but the build is failing with a Exception: TypeError: metadata.origin is undefined Albert, did your patch land already? Can you take a look to this?

(In reply to Antonio Manuel Amaya Calvo (:amac) from comment #11) > The patch seems correct to me, but the build is failing with a > > Exception: TypeError: metadata.origin is undefined > > Albert, did your patch land already? Can you take a look to this? No, my patch can't land before this one because travis fails due to marketplace. The problem is that build/applications-data.js uses the origin to set the icon url for homescreen icons, and for external apps it gets the origin from metadata: https://github.com/mozilla-b2g/gaia/blob/master/build/applications-data.js#L75 However, the patch just removes the origin in the metadata, but doesn't add the origin in the manifest inside application.zip, is this correct? In order to be able to land this patch and then the patch for bug 929602 I think that we should open a new bug modifying application-data to search origin in both metadata and manifest to ensure compatibility until 929602 can be landed. What do you think?

(In reply to Albert [:albert] from comment #12) > However, the patch just removes the origin in the metadata, but doesn't add > the origin in the manifest inside application.zip, is this correct? If you look inside the `application.zip`, you'll see that the manifest inside in fact contains an `origin`: "origin": "app://marketplace.firefox.com",

Ok, so if I'm reading this correctly, we have a patch interlock here. This one can't land till bug 929602 lands, and bug 929602 can't land until this one lands... Instead of doing a intermediate patch that will just serve to land this one, can't we just land both at the same time (merge both patches into a single one?). WDYT?

(In reply to Antonio Manuel Amaya Calvo (:amac) from comment #14) > Ok, so if I'm reading this correctly, we have a patch interlock here. This > one can't land till bug 929602 lands, and bug 929602 can't land until this > one lands... > > Instead of doing a intermediate patch that will just serve to land this one, > can't we just land both at the same time (merge both patches into a single > one?). WDYT? Yes, I think that's the best option.

(In reply to Christopher Van Wiemeersch [:cvan] from comment #13) > (In reply to Albert [:albert] from comment #12) > > > However, the patch just removes the origin in the metadata, but doesn't add > > the origin in the manifest inside application.zip, is this correct? > > If you look inside the `application.zip`, you'll see that the manifest > inside in fact contains an `origin`: > > "origin": "app://marketplace.firefox.com", Are you sure? I don't see an origin in the manifest inside https://github.com/mozilla-b2g/gaia/blob/master/external-apps/marketplace.firefox.com/application.zip Maybe you have a modified application.zip

Comment on attachment 8343262 [details] https://github.com/mozilla-b2g/gaia/pull/14426 This has been merged into bug 929602 (https://bugzilla.mozilla.org/attachment.cgi?id=828880) to avoid a bug deadlock.

Fixed in 929602