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.

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

Ce/connectid messaging settins #6426

Merged
merged 3 commits into from
Nov 15, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
2 changes: 2 additions & 0 deletions environments/production/public.yml
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,8 @@ localsettings:
USER_REPORTING_METADATA_BATCH_ENABLED: True
WS4REDIS_CONNECTION_HOST: "redis.production.commcare.local"
CONNECTID_URL: 'https://connectid.dimagi.com/o/userinfo'
CONNECTID_CHANNEL_URL: 'https://connectid.dimagi.com/messaging/create_channel/'
CONNECTID_MESSAGE_URL: 'https://connectid.dimagi.com/messaging/send_fcm/'
ASYNC_INDICATORS_TO_QUEUE: 20000

# comment these two lines out to make a new rackspace machine
Expand Down
2 changes: 2 additions & 0 deletions environments/staging/public.yml
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,8 @@ localsettings:
}
}
CONNECTID_URL: 'https://connectid.dimagi.com/o/userinfo'
CONNECTID_CHANNEL_URL: 'https://connectid.dimagi.com/messaging/create_channel/'
CONNECTID_MESSAGE_URL: 'https://connectid.dimagi.com/messaging/send_fcm/'


# comment these two lines out to make a new rackspace machine
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1202,6 +1202,22 @@ FCM_CREDS = json.loads({{ FCM_CREDS }})
CONNECTID_USERINFO_URL = "{{ localsettings.CONNECTID_URL }}"
{% endif %}

{% if CONNECTID_SECRET_KEY is defined %}
CONNECTID_SECRET_KEY = "{{ CONNECTID_SECRET_KEY }}"
{% endif %}

{% if CONNECTID_CLIENT_ID is defined %}
CONNECTID_CLIENT_ID = "{{ CONNECTID_CLIENT_ID }}"
{% endif %}

{% if localsettings.CONNECTID_CHANNEL_URL is defined %}
CONNECTID_CHANNEL_URL = "{{ localsettings.CONNECTID_CHANNEL_URL }}"
{% endif %}

{% if localsettings.CONNECTID_MESSAGE_URL is defined %}
CONNECTID_MESSAGE_URL = "{{ localsettings.CONNECTID_MESSAGE_URL }}"
{% endif %}

{% if localsettings.MAX_MOBILE_UCR_LIMIT is defined %}
MAX_MOBILE_UCR_LIMIT = {{ localsettings.MAX_MOBILE_UCR_LIMIT }}
{% endif %}
Expand Down
6 changes: 6 additions & 0 deletions src/commcare_cloud/environment/secrets/secrets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -184,3 +184,9 @@
- name: EPIC_CLIENT_ID
legacy_namespace: secrets
default: ''
- name: CONNECTID_SECRET_KEY
legacy_namespace: secrets
default: ''
- name: CONNECTID_CLIENT_ID
legacy_namespace: secrets
default: ''
Loading