fix: [AXM-334] Fix firebase credentials getting logic

raccoongang · Jun 11, 2024 · 7278c29 · 7278c29
1 parent 85440e6
commit 7278c29
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/openedx/core/djangoapps/ace_common/settings/common.py b/openedx/core/djangoapps/ace_common/settings/common.py
@@ -31,13 +31,18 @@ def plugin_settings(settings):  # lint-amnesty, pylint: disable=missing-function
     # Note: To local development with Firebase, you must set FIREBASE_CREDENTIALS_PATH
     # (path to json file with FIREBASE_CREDENTIALS)
     # or FIREBASE_CREDENTIALS dictionary.
+    # AND COMMENT or remove `settings.FIREBASE_APP = None` string below.
+    settings.FIREBASE_CREDENTIALS_PATH = None
+    settings.FIREBASE_CREDENTIALS = None
+    settings.FIREBASE_APP = None
+
     settings.FCM_APP_NAME = 'fcm-edx-platform'
     used_firebase_credentials = getattr(settings, 'FIREBASE_CREDENTIALS_PATH', None)
     if not used_firebase_credentials:
         used_firebase_credentials = getattr(settings, 'FIREBASE_CREDENTIALS', None)
 
     if used_firebase_credentials:
-        settings.FIREBASE_APP = setup_firebase_app(settings.FIREBASE_CREDENTIALS, settings.FCM_APP_NAME)
+        settings.FIREBASE_APP = setup_firebase_app(used_firebase_credentials, settings.FCM_APP_NAME)
 
     if getattr(settings, 'FIREBASE_APP', None):
         settings.ACE_ENABLED_CHANNELS.append(settings.ACE_CHANNEL_DEFAULT_PUSH)

diff --git a/openedx/core/djangoapps/ace_common/settings/production.py b/openedx/core/djangoapps/ace_common/settings/production.py
@@ -38,7 +38,7 @@ def plugin_settings(settings):
         used_firebase_credentials = settings.FIREBASE_CREDENTIALS
 
     if used_firebase_credentials:
-        settings.FIREBASE_APP = setup_firebase_app(settings.FIREBASE_CREDENTIALS, settings.FCM_APP_NAME)
+        settings.FIREBASE_APP = setup_firebase_app(used_firebase_credentials, settings.FCM_APP_NAME)
 
     if settings.FIREBASE_APP:
         settings.ACE_ENABLED_CHANNELS.append(settings.ACE_CHANNEL_DEFAULT_PUSH)