Skip to content

Commit ef06f95

Browse files
VegasNativeVegasNative
authored
Merge pull request #383 from bkochendorfer/remove-firefox-accounts
feat: Remove mentions of firefox-accounts
2 parents a9c6627 + a6208d4 commit ef06f95

11 files changed

+7
-146
lines changed

‎config/development.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
"features": {
1212
"autologin": "true",
1313
"iam_api_lookup": "true",
14-
"maintenance_mode": "false",
15-
"mozilla_accounts_banner_pre": "false",
16-
"mozilla_accounts_banner_post": "true"
14+
"maintenance_mode": "false"
1715
},
1816
"supportedLoginMethods": [ "github", "google-oauth2", "firefoxaccounts", "email" ],
1917
"csp": "default-src 'none'; connect-src 'self' https://iam.api.test.sso.allizom.org; script-src 'self' https://cdn.sso.allizom.org https://www.googletagmanager.com https://www.google-analytics.com; style-src 'self' https://cdn.sso.allizom.org; font-src 'self' https://cdn.sso.allizom.org; img-src 'self' https://cdn.sso.allizom.org https://www.google-analytics.com",

‎config/local.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
"features": {
1212
"autologin": "true",
1313
"iam_api_lookup": "true",
14-
"maintenance_mode": "false",
15-
"mozilla_accounts_banner_pre": "false",
16-
"mozilla_accounts_banner_post": "true"
14+
"maintenance_mode": "false"
1715
},
1816
"supportedLoginMethods": [ "github", "google-oauth2", "firefoxaccounts", "email" ],
1917
"csp": "default-src *",

‎config/production.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
"features": {
1111
"autologin": "true",
1212
"iam_api_lookup": "true",
13-
"maintenance_mode": "false",
14-
"mozilla_accounts_banner_pre": "false",
15-
"mozilla_accounts_banner_post": "true"
13+
"maintenance_mode": "false"
1614
},
1715
"supportedLoginMethods": [ "github", "google-oauth2", "firefoxaccounts", "email" ],
1816
"csp": "default-src 'none'; connect-src 'self' https://iam.api.sso.mozilla.com; script-src 'self' https://cdn.sso.mozilla.com https://www.googletagmanager.com https://www.google-analytics.com; style-src 'self' https://cdn.sso.mozilla.com; font-src 'self' https://cdn.sso.mozilla.com; img-src 'self' https://cdn.sso.mozilla.com https://www.google-analytics.com",

‎src/html/index.html

Lines changed: 4 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@
3434
iam_api_lookup: {{{ features.iam_api_lookup }}}
3535
supportedLoginMethods: {{{ supportedLoginMethods }}}
3636
maintenance_mode: "{{{ features.maintenance_mode }}}"
37-
mozilla_accounts_banner_pre: "{{{ features.mozilla_accounts_banner_pre }}}"
38-
mozilla_accounts_banner_post: "{{{ features.mozilla_accounts_banner_post }}}"
3937
Display names:
4038
github: {{{ displayNames.github }}}
4139
google-oauth2: {{{ displayNames.google-oauth2 }}}
@@ -62,74 +60,6 @@
6260
<p>We are currently experiencing an issue &amp; working hard to resolve it. Please try to login again in a few minutes. Request help via <a href="mailto:[email protected]">[email protected]</a>, IRC #moc or Slack #mozsm-all.</p>
6361
</div>
6462
</div>
65-
<div data-decorator="check-if-accounts-banner-pre" hidden>
66-
<div class="banner-branding" id="accounts-banner-pre">
67-
<div class="flex">
68-
<div class="cta flex">
69-
<div class="flex-none order-last">
70-
<button
71-
class="close-brand-banner"
72-
aria-label="Close Banner"
73-
type=button
74-
data-handler="mozilla-accounts-pre"
75-
>
76-
<img
77-
src="{{{ cdn }}}/images/x.svg"
78-
class="cursor-pointer"
79-
alt="Close Banner"
80-
/>
81-
</button>
82-
</div>
83-
84-
<div class="flex-none relative">
85-
<img
86-
class="mozilla-logo"
87-
src="{{{ cdn }}}/images/m.svg"
88-
alt="Mozilla m logo"
89-
/>
90-
</div>
91-
<div class="flex-initial max-w-md">
92-
<p class="text-l font-bold">
93-
Firefox accounts will be renamed Mozilla accounts on Nov 1
94-
</p>
95-
<p class="text-s">
96-
You’ll still sign in with the same username and password, and there are no other changes to the products that you use.
97-
<a href="https://support.mozilla.org/kb/firefox-accounts-renamed-mozilla-accounts">Learn more</a>
98-
</p>
99-
</div>
100-
</div>
101-
</div>
102-
</div>
103-
</div>
104-
<div data-decorator="check-if-accounts-banner-post" hidden>
105-
<div class="banner-branding" id="accounts-banner-post">
106-
<div class="flex">
107-
<div class="cta-post flex">
108-
<div class="flex-none order-last">
109-
<button
110-
class="close-brand-banner"
111-
aria-label="Close Banner"
112-
type=button
113-
data-handler="mozilla-accounts-post"
114-
>
115-
<img
116-
src="{{{ cdn }}}/images/x.svg"
117-
class="cursor-pointer"
118-
alt="Close Banner"
119-
120-
/>
121-
</button>
122-
</div>
123-
<div class="flex-initial max-w-md">
124-
<p class="text-m">
125-
We’ve renamed Firefox accounts to Mozilla accounts. You’ll still sign in with the same username and password, and there are no other changes to the products that you use.
126-
<a href="https://support.mozilla.org/kb/firefox-accounts-renamed-mozilla-accounts">Learn more</a>
127-
</p>
128-
</div>
129-
</div>
130-
</div>
131-
</div>
132-
</div>
13363

13464
<div class="card">
13565
<a href="https://mozilla.org" class="logo" target="_blank"><img alt="Mozilla" src="{{{ cdn }}}/images/mozilla.svg" /></a>
@@ -150,13 +80,7 @@
15080
<input type="submit" class="button button--full-width" id="enter-initial" value="Enter" />
15181
<hr>
15282
<ul class="login-options list list--plain">
153-
<li data-optional-login-method="firefoxaccounts" id="firefoxaccounts">
154-
<button class="button button--full-width button--social button--secondary" type="button" data-handler="authorise-firefoxaccounts">
155-
<img class="icon" src="{{{ cdn }}}/images/firefox.svg" alt="">
156-
<span>Log in with Firefox</span>
157-
</button>
158-
</li>
159-
<li data-optional-login-method="firefoxaccounts" id="mozillaaccounts" data-decorator="show-mozilla-accounts" hidden>
83+
<li data-optional-login-method="firefoxaccounts" id="mozillaaccounts">
16084
<button class="button button--full-width button--social button--secondary" type="button" data-handler="authorise-firefoxaccounts">
16185
<img class="icon" src="{{{ cdn }}}/images/m.svg" alt="">
16286
<span>Sign in with Mozilla</span>
@@ -195,12 +119,7 @@
195119
<input type="submit" class="button button--full-width" id="enter-initial-signup" value="Enter" />
196120
<hr>
197121
<ul class="login-options list list--plain">
198-
<li data-optional-login-method="firefoxaccounts" id="firefoxaccounts">
199-
<button class="button button--full-width button--social button--secondary" type="button" data-handler="authorise-firefoxaccounts">
200-
<img class="icon" src="{{{ cdn }}}/images/firefox.svg" alt="">
201-
<span>Continue with Firefox</span>
202-
</button>
203-
<li data-optional-login-method="firefoxaccounts" id="mozillaaccounts" data-decorator="show-mozilla-accounts">
122+
<li data-optional-login-method="firefoxaccounts" id="mozillaaccounts">
204123
<button class="button button--full-width button--social button--secondary" type="button" data-handler="authorise-firefoxaccounts">
205124
<img class="icon" src="{{{ cdn }}}/images/m.svg" alt="">
206125
<span>Continue with Mozilla</span>
@@ -249,13 +168,7 @@
249168
<a href="https://wiki.mozilla.org/IAM/Frequently_asked_questions#Q:_Why_do_you_support_email_login_.28.22passwordless.22.29_if_it.27s_less_safe_than_other_methods.3F" class="button button--text-only button--unpadded" target="_blank">Why an email?</a>
250169
<hr>
251170
<ul class="login-options list list--plain">
252-
<li data-optional-login-method="firefoxaccounts" id="firefoxaccounts">
253-
<button class="button button--full-width button--social button--secondary" type="button" data-handler="authorise-firefoxaccounts">
254-
<img class="icon" src="{{{ cdn }}}/images/firefox.svg" alt="">
255-
<span>Continue with Firefox</span>
256-
</button>
257-
</li>
258-
<li data-optional-login-method="firefoxaccounts" id="mozillaccounts" data-decorator="show-mozilla-accounts">
171+
<li data-optional-login-method="firefoxaccounts" id="mozillaccounts">
259172
<button class="button button--full-width button--social button--secondary" type="button" data-handler="authorise-firefoxaccounts">
260173
<img class="icon" src="{{{ cdn }}}/images/m.svg" alt="">
261174
<span>Continue with Mozilla</span>
@@ -351,9 +264,7 @@ <h2 class="card__heading card__heading--iconless">Auto-login settings</h2>
351264
"features" : {
352265
"autologin": "{{{ features.autologin }}}",
353266
"iam_api_lookup": "{{{ features.iam_api_lookup }}}",
354-
"maintenance_mode": "{{{ features.maintenance_mode }}}",
355-
"mozilla_accounts_banner_pre": "{{{ features.mozilla_accounts_banner_pre }}}",
356-
"mozilla_accounts_banner_post": "{{{ features.mozilla_accounts_banner_post }}}"
267+
"maintenance_mode": "{{{ features.maintenance_mode }}}"
357268
},
358269
"supportedLoginMethods": "{{{ supportedLoginMethods }}}",
359270
"logout_url": "{{{ logout_url }}}",

‎src/js/decorators.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
var decorators = {
66
'check-if-maintenance-mode': require( 'decorators/check-if-maintenance-mode' ),
7-
'check-if-accounts-banner-pre': require( 'decorators/check-if-accounts-banner-pre' ),
8-
'check-if-accounts-banner-post': require( 'decorators/check-if-accounts-banner-post' ),
97
'check-keyboard': require( 'decorators/check-keyboard' ),
108
'decide-screen': require( 'decorators/decide-screen' ),
119
'display-rp-name': require( 'decorators/display-rp-name' ),
@@ -17,7 +15,6 @@ var decorators = {
1715
'load-ga': require( 'decorators/load-ga' ),
1816
'prevent-clickjack': require( 'decorators/prevent-clickjack' ),
1917
'track-password-manager-usage': require( 'decorators/track-password-manager-usage' ),
20-
'show-mozilla-accounts': require( 'decorators/show-mozilla-accounts' ),
2118
'set-autologin-preference': require( 'decorators/set-autologin-preference' ),
2219
'submit-with-enter': require( 'decorators/submit-with-enter' ),
2320
'tooltip': require( 'decorators/tooltip' ),

‎src/js/decorators/check-if-accounts-banner-post.js

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎src/js/decorators/check-if-accounts-banner-pre.js

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎src/js/decorators/show-mozilla-accounts.js

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎src/js/handlers.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
// no component, they are in the general 'handlers' folder (src/assets/js/handlers).
88

99
module.exports = {
10-
'mozilla-accounts-pre': require( 'handlers/mozilla-accounts-pre' ),
11-
'mozilla-accounts-post': require( 'handlers/mozilla-accounts-post' ),
1210
'enter': require( 'handlers/enter' ),
1311
'go-to-initial-page': require( 'handlers/go-to-initial-page' ),
1412
'authorise-ldap': require( 'handlers/authorise-ldap' ),

‎src/js/handlers/mozilla-accounts-post.js

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎src/js/handlers/mozilla-accounts-pre.js

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)