Include an ENV check in use_fake_fxa that correctly maps to the conso…

…lidated runtime environment variable ENV

docker-compose.yml

@@ -19,10 +19,12 @@ x-env-mapping: &env
     - HISTSIZE=50000
     - HISTIGNORE=ls:exit:"cd .."
     - HISTCONTROL=erasedups
+    - ENV=local
     - CIRCLECI
     - DATA_BACKUP_SKIP
     - FXA_CLIENT_ID
     - FXA_CLIENT_SECRET
+
 x-olympia: &olympia
   <<: *env
   image: ${DOCKER_TAG:-}

settings.py

@@ -195,3 +195,7 @@ def insert_debug_toolbar_middleware(middlewares):
             'static_url_prefix': 'bundle',
         }
     }
+
+# Hardcode the environment to local to guarantee a clear distinction
+# between local and non-local environments.
+ENV = 'local'

settings_test.py

@@ -122,3 +122,5 @@
         'client_secret': '.',
     },
 }
+
+ENV = 'test'

src/olympia/amo/tests/test_views.py

@@ -509,7 +509,7 @@ def test_allow_mozilla_collections(self):
 
 
 @pytest.mark.django_db
-@override_settings(FXA_CONFIG={'default': {'client_id': '.'}})
+@override_settings(FXA_CONFIG={'default': {'client_id': '.'}}, ENV='local')
 def test_fake_fxa_authorization_correct_values_passed():
     url = reverse('fake-fxa-authorization')
     response = test.Client().get(url, {'state': 'foobar'})

src/olympia/amo/utils.py

@@ -1163,8 +1163,8 @@ def extract_colors_from_image(path):
 
 def use_fake_fxa(config):
     """Return whether or not to use a fake FxA server for authentication.
-    Should always return False in production"""
-    return config.get('client_id') == '.'
+    Should always return False in local environments"""
+    return settings.ENV == 'local' and config.get('client_id') == '.'
 
 
 class AMOJSONEncoder(JSONEncoder):

src/olympia/conf/dev/settings.py

@@ -11,7 +11,6 @@
 EMAIL_HOST_USER = EMAIL_URL['EMAIL_HOST_USER']
 EMAIL_HOST_PASSWORD = EMAIL_URL['EMAIL_HOST_PASSWORD']
 
-ENV = env('ENV')
 RAISE_ON_SIGNAL_ERROR = True
 
 API_THROTTLING = True

src/olympia/conf/prod/settings.py

@@ -20,8 +20,6 @@
 
 SEND_REAL_EMAIL = True
 
-ENV = env('ENV')
-
 API_THROTTLING = True
 
 DOMAIN = env('DOMAIN', default='addons.mozilla.org')

src/olympia/conf/stage/settings.py

@@ -11,8 +11,6 @@
 EMAIL_HOST_USER = EMAIL_URL['EMAIL_HOST_USER']
 EMAIL_HOST_PASSWORD = EMAIL_URL['EMAIL_HOST_PASSWORD']
 
-ENV = env('ENV')
-
 API_THROTTLING = True
 
 DOMAIN = env('DOMAIN', default='addons.allizom.org')

src/olympia/lib/settings_base.py

@@ -1636,3 +1636,9 @@ def read_only_mode(env):
         'manifest_path': STATIC_BUILD_MANIFEST_PATH,
     }
 }
+
+# The environment in which the application is running.
+# This is set by the environment variables in production environments.
+# For local it is hard coded to "local" to guarantee a clear distinction
+# between local and non-local environments.
+ENV = env('ENV')