1264843 - Conditional tweaks to content of in-product pages for Firefox China repack

Status: RESOLVED FIXED

(www.mozilla.org :: Pages & Content, defect)

Description

[Hector Zhao [:hectorz]]

Beijing office frequently needs to modify urls of in-product pages to forked and slightly modified version hosted at firefox.com.cn for its China repack of Firefox for desktop. Often we don't take time to integrate any future updates after the initial fork.

Most changes are FxA related. We have our own FxA and Sync servers since most users in China generally don't have stable connection to the global servers hosted on AWS. We don't want our users to register accounts at https://accounts.firefox.com/ and be confused about why they cannot use that account to sync their data.

Additionally we'd like the link to Firefox for Android be replaced with that of China build, which also defaults to use our FxA and Sync servers.

I think it would be better if such changes are maintained in bedrock. I'm sending draft PRs later to alter the content when "dist=mozillaonline" appears in the query string.

Please let me know whether you think this is an acceptable approach.

Comment 1

[Paul [:pmac] McLanahan]

I very much like the idea of keeping the changes in bedrock. Why "mozillaonline" though? Can we use something more descriptive so that we'll be more easily able to understand what's happening in future? 

jbertsch: thoughts?

Comment 2

[Hector Zhao [:hectorz]]

(In reply to Paul [:pmac] McLanahan from comment #1)
> I very much like the idea of keeping the changes in bedrock. Why
> "mozillaonline" though? Can we use something more descriptive so that we'll
> be more easily able to understand what's happening in future? 

"Mozilla Online" is the name of the Chinese subsidiary of MoCo, and it's used as some kind of unique id for Fx China repack. For example, it checks for Fx update with a request to https://aus5.mozilla.org/update/3/Firefox/45.0.2/20160407164938/WINNT_x86-msvc-x64/zh-CN/release-cck-mozillaonline/Windows_NT%2010.0.0.0%20(x64)/MozillaOnline/2015.12/update.xml .

I guess no other partner distributions will need this, so using other identifier also works for me.

Comment 3

[Paul [:pmac] McLanahan]

(In reply to Hector Zhao [:hectorz] from comment #2)
> "Mozilla Online" is the name of the Chinese subsidiary of MoCo, and it's
> used as some kind of unique id for Fx China repack. For example, it checks
> for Fx update with a request to
> https://aus5.mozilla.org/update/3/Firefox/45.0.2/20160407164938/WINNT_x86-
> msvc-x64/zh-CN/release-cck-mozillaonline/Windows_NT%2010.0.0.0%20(x64)/
> MozillaOnline/2015.12/update.xml .
> 
> I guess no other partner distributions will need this, so using other
> identifier also works for me.

No, that makes sense. For some reason I failed to make that connection. "mozillaonline" it is.

Comment 4

[Hector Zhao [:hectorz]]

Attachment: PR, fxa iframe parts

(In reply to Hector Zhao [:hectorz] from comment #0)
> ... alter the content when "dist=mozillaonline"
> appears in the query string.

As discussed in the PR referenced, UITour API (Fx 48+) will be used to get more accurate distribution information, query strings will not be necessary.

Comment 5

[Alex Gibson [:agibson]]

I pushed this branch to a demo server for testing:

https://www-demo1.allizom.org/en-US/firefox/accounts/
https://www-demo1.allizom.org/en-US/firefox/46.0/firstrun/

Note: in order to test you'll need to white-list demo1 for UITour:

http://bedrock.readthedocs.io/en/latest/uitour.html#local-development

Comment 6

[Hector Zhao [:hectorz]]

cc Yanfang, QA engineer in Beijing.

I've uploaded a minimal distribution.ini to simulate a China repack and set the necessary prefs:
http://people.mozilla.org/~bzhao/bug1264843/distribution.ini

Server configuration of https://accounts.firefox.com.cn/ needs one more correction, so temporarily you'll see a 500 error page with this distribution.ini.

Comment 7

[Hector Zhao [:hectorz]]

(In reply to Hector Zhao [:hectorz] from comment #6)
> 
> Server configuration of https://accounts.firefox.com.cn/ needs one more
> correction.

This was fixed just now. Also please test with Fx 48+.

Comment 8

[Yanfang Liu]

I tested the distribution.ini with Fx48, and it worked fine.

Comment 9

[[github robot]]

Commits pushed to master at https://github.com/mozilla/bedrock

https://github.com/mozilla/bedrock/commit/2ceb012927a5772628bf3c932552d57143311219
Bug 1264843 - embed FxA server in China within Fx China repack

https://github.com/mozilla/bedrock/commit/700ebd9344bf17969deaab1951bc8e3f1a6e092a
Merge pull request #4066 from l-hedgehog/mozillaonline-fxaframe

Bug 1264843 - embed FxA server in China within Fx China repack

Comment 10

[Hector Zhao [:hectorz]]

Attachment: PR, Fx4A parts

Comment 11

[[github robot]]

Commits pushed to master at https://github.com/mozilla/bedrock

https://github.com/mozilla/bedrock/commit/34fd6737fed0573add39bf9ed0e56db90f3e5cf3
Bug 1264843: macro to generate Google Play button

https://github.com/mozilla/bedrock/commit/2e9049e69ed6eb5ae49d76030e97bee284dc162b
Bug 1264843: link to China build of Fx4A, for display within Fx China repack

https://github.com/mozilla/bedrock/commit/fb5e0504134985ca9b6bc6b79c2fc91192dc5bfc
Merge pull request #4067 from l-hedgehog/mozillaonline-fxandroid

 Bug 1264843: link to China build of Fx4A, for display within Fx China repack

Comment 12

[Hector Zhao [:hectorz]]

Should've resolved this bug as FIXED when the second PR was merged.