diff --git a/src/backend/core/tests/utils/test_webhooks_matrix_client.py b/src/backend/core/tests/utils/test_webhooks_matrix_client.py index 4ad66b2..e29797c 100644 --- a/src/backend/core/tests/utils/test_webhooks_matrix_client.py +++ b/src/backend/core/tests/utils/test_webhooks_matrix_client.py @@ -131,7 +131,7 @@ def test_matrix_webhook__invite_user_to_room_success(caplog): @responses.activate -@override_settings(TCHAP_ACCESS_TOKEN="TCHAP_TOKEN") +@override_settings(MATRIX_BOT_ACCESS_TOKEN="TCHAP_TOKEN") def test_matrix_webhook__override_secret_for_tchap(): """The user passed to the function should get invited.""" user = factories.UserFactory() diff --git a/src/backend/core/utils/matrix.py b/src/backend/core/utils/matrix.py index 96d0865..976127d 100644 --- a/src/backend/core/utils/matrix.py +++ b/src/backend/core/utils/matrix.py @@ -28,14 +28,12 @@ session.mount("https://", adapter) class MatrixAPIClient: """A client to interact with Matrix API""" - - secret = settings.TCHAP_ACCESS_TOKEN - + def get_headers(self, webhook): """Build header dict from webhook object.""" headers = {"Content-Type": "application/json"} if "tchap.gouv.fr" in webhook.url: - token = settings.TCHAP_ACCESS_TOKEN + token = settings.MATRIX_BOT_ACCESS_TOKEN elif webhook.secret: token = webhook.secret else: diff --git a/src/backend/people/settings.py b/src/backend/people/settings.py index 4e750d8..36267fb 100755 --- a/src/backend/people/settings.py +++ b/src/backend/people/settings.py @@ -601,9 +601,9 @@ class Base(Configuration): environ_name="DNS_PROVISIONING_API_CREDENTIALS", environ_prefix=None, ) - TCHAP_ACCESS_TOKEN = values.Value( + MATRIX_BOT_ACCESS_TOKEN = values.Value( default=None, - environ_name="TCHAP_ACCESS_TOKEN", + environ_name="MATRIX_BOT_ACCESS_TOKEN", environ_prefix=None, ) diff --git a/src/helm/env.d/dev/values.desk.yaml.gotmpl b/src/helm/env.d/dev/values.desk.yaml.gotmpl index 47ecf0e..8154c3c 100644 --- a/src/helm/env.d/dev/values.desk.yaml.gotmpl +++ b/src/helm/env.d/dev/values.desk.yaml.gotmpl @@ -73,7 +73,7 @@ backend: secretKeyRef: name: backend key: MAIL_PROVISIONING_API_CREDENTIALS - TCHAP_ACCESS_TOKEN: service_account_key + MATRIX_BOT_ACCESS_TOKEN: service_account_key command: - "gunicorn" - "-c"