Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: [AXM-334] Allow easily adding Firebase credentials in Tutor #2572

Merged
merged 5 commits into from
Jun 14, 2024
Merged

feat: [AXM-334] Allow easily adding Firebase credentials in Tutor #2572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a9e2187
feat: [AXM-334] Allow easily adding Firebase credentials in Tutor
KyryloKireiev Jun 10, 2024
620b516
fix: [AXM-334] Fix firebase credentials getting logic
KyryloKireiev Jun 11, 2024
d30eb7b
fix: [AXM-334] Remove extra setting
KyryloKireiev Jun 11, 2024
0f30b7c
fix: [AXM-334] Ivan's changes
KyryloKireiev Jun 11, 2024
0fda011
refactor: [AXM-334] Remove exstra variable
KyryloKireiev Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions openedx/core/djangoapps/ace_common/settings/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,15 @@ def plugin_settings(settings): # lint-amnesty, pylint: disable=missing-function
settings.FCM_APP_NAME = 'fcm-edx-platform'

settings.ACE_CHANNEL_DEFAULT_PUSH = 'push_notification'
# Note: To local development with Firebase, you must set FIREBASE_CREDENTIALS.
settings.FCM_APP_NAME = 'fcm-edx-platform'
# Note: To local development with Firebase, you must set FIREBASE_CREDENTIALS_PATH
# (path to json file with FIREBASE_CREDENTIALS)
# or FIREBASE_CREDENTIALS dictionary.
settings.FIREBASE_CREDENTIALS_PATH = None
settings.FIREBASE_CREDENTIALS = None

settings.FIREBASE_APP = setup_firebase_app(settings.FIREBASE_CREDENTIALS, settings.FCM_APP_NAME)
settings.FIREBASE_APP = setup_firebase_app(
settings.FIREBASE_CREDENTIALS_PATH or settings.FIREBASE_CREDENTIALS, settings.FCM_APP_NAME
)

if getattr(settings, 'FIREBASE_APP', None):
settings.ACE_ENABLED_CHANNELS.append(settings.ACE_CHANNEL_DEFAULT_PUSH)
Expand Down
8 changes: 7 additions & 1 deletion openedx/core/djangoapps/ace_common/settings/production.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,15 @@ def plugin_settings(settings):
'ACE_CHANNEL_TRANSACTIONAL_EMAIL', settings.ACE_CHANNEL_TRANSACTIONAL_EMAIL
)
settings.FCM_APP_NAME = settings.ENV_TOKENS.get('FCM_APP_NAME', settings.FCM_APP_NAME)
settings.FIREBASE_CREDENTIALS_PATH = settings.ENV_TOKENS.get(
'FIREBASE_CREDENTIALS_PATH', settings.FIREBASE_CREDENTIALS_PATH
)
settings.FIREBASE_CREDENTIALS = settings.ENV_TOKENS.get('FIREBASE_CREDENTIALS', settings.FIREBASE_CREDENTIALS)

settings.FIREBASE_APP = setup_firebase_app(settings.FIREBASE_CREDENTIALS, settings.FCM_APP_NAME)
settings.FIREBASE_APP = setup_firebase_app(
settings.FIREBASE_CREDENTIALS_PATH or settings.FIREBASE_CREDENTIALS, settings.FCM_APP_NAME
)

if settings.FIREBASE_APP:
settings.ACE_ENABLED_CHANNELS.append(settings.ACE_CHANNEL_DEFAULT_PUSH)
settings.ACE_ENABLED_POLICIES.append('bulk_push_notification_optout')
Expand Down
Loading