From f47610ac0f73450796e82748a87c9fb3f657307a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matja=C5=BE=20Horvat?= Date: Wed, 11 Oct 2023 17:58:57 +0200 Subject: [PATCH 1/2] Update Firefox Accounts references to Mozilla Accounts --- docs/admin/deployment.rst | 3 +-- pontoon/settings/base.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/admin/deployment.rst b/docs/admin/deployment.rst index e8cd731d2c..0c1f56164a 100644 --- a/docs/admin/deployment.rst +++ b/docs/admin/deployment.rst @@ -67,7 +67,7 @@ you create: ``AUTHENTICATION_METHOD`` The default value is `django`, which allows you to log in via accounts created using `manage.py shell`. - Set to 'fxa' if you want to use 'Firefox Accounts' (corresponding FXA_* settings must be set). + Set to 'fxa' if you want to use 'Mozilla Accounts' (corresponding FXA_* settings must be set). Set to 'github' if you want to use 'GitHub' (corresponding GITHUB_* settings must be set). Set to 'gitlab' if you want to use 'GitLab' (corresponding GITLAB_* settings must be set if required). Set to 'google' if you want to use 'Google' (corresponding GOOGLE_* settings must be set). @@ -256,7 +256,6 @@ you create: .. _the spec: https://github.com/mozilla/pontoon/blob/HEAD/specs/0108-community-health-dashboard.md .. _Heroku Reference: https://devcenter.heroku.com/articles/error-pages#customize-pages -.. _Firefox Accounts: https://developer.mozilla.org/docs/Mozilla/Tech/Firefox_Accounts/Introduction .. _Microsoft Translator API: http://msdn.microsoft.com/en-us/library/hh454950 .. _Google Analytics key: https://www.google.com/analytics/ .. _Google Cloud Translation API: https://cloud.google.com/translate/ diff --git a/pontoon/settings/base.py b/pontoon/settings/base.py index b0b3f9e909..04b51d1707 100644 --- a/pontoon/settings/base.py +++ b/pontoon/settings/base.py @@ -956,7 +956,7 @@ def account_username(user): ACCOUNT_EMAIL_VERIFICATION = "none" ACCOUNT_USER_DISPLAY = account_username -# Firefox Accounts +# Mozilla Accounts FXA_CLIENT_ID = os.environ.get("FXA_CLIENT_ID") FXA_SECRET_KEY = os.environ.get("FXA_SECRET_KEY") FXA_OAUTH_ENDPOINT = os.environ.get("FXA_OAUTH_ENDPOINT", "") From a194345343e06fea7d59c5ce352747846e19b65c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matja=C5=BE=20Horvat?= Date: Thu, 12 Oct 2023 09:43:35 +0200 Subject: [PATCH 2/2] Add former name in the comment --- pontoon/settings/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pontoon/settings/base.py b/pontoon/settings/base.py index 04b51d1707..59f707f70d 100644 --- a/pontoon/settings/base.py +++ b/pontoon/settings/base.py @@ -956,7 +956,7 @@ def account_username(user): ACCOUNT_EMAIL_VERIFICATION = "none" ACCOUNT_USER_DISPLAY = account_username -# Mozilla Accounts +# Mozilla Accounts (formerly Firefox Accounts) FXA_CLIENT_ID = os.environ.get("FXA_CLIENT_ID") FXA_SECRET_KEY = os.environ.get("FXA_SECRET_KEY") FXA_OAUTH_ENDPOINT = os.environ.get("FXA_OAUTH_ENDPOINT", "")