Merge branch 'feature/485-token-permissions-setup-configuration' into…

… feature/486-token-permissions-configuration
maykinmedia · Dec 17, 2024 · 3202c7f · 3202c7f
2 parents 8e2c354 + 8e49812
commit 3202c7f
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/docs/installation/config.rst b/docs/installation/config.rst
@@ -82,10 +82,11 @@ Optional
 * ``EMAIL_HOST_PASSWORD``: password to connect to the mail server. Defaults to: ``(empty string)``.
 * ``EMAIL_USE_TLS``: whether to use TLS or not to connect to the mail server. Should be True if you're changing the ``EMAIL_PORT`` to 487. Defaults to: ``False``.
 * ``DEFAULT_FROM_EMAIL``: The default email address from which emails are sent. Defaults to: ``[email protected]``.
-* ``LOG_STDOUT``: whether to log to stdout or not. Defaults to: ``False``.
+* ``LOG_STDOUT``: whether to log to stdout or not. Defaults to: ``True``.
 * ``LOG_LEVEL``: control the verbosity of logging output. Available values are ``CRITICAL``, ``ERROR``, ``WARNING``, ``INFO`` and ``DEBUG``. Defaults to: ``WARNING``.
 * ``LOG_QUERIES``: enable (query) logging at the database backend level. Note that you must also set ``DEBUG=1``, which should be done very sparingly!. Defaults to: ``False``.
 * ``LOG_REQUESTS``: enable logging of the outgoing requests. Defaults to: ``False``.
+* ``CELERY_LOGLEVEL``: control the verbosity of logging output for celery, independent of ``LOG_LEVEL``. Available values are ``CRITICAL``, ``ERROR``, ``WARNING``, ``INFO`` and ``DEBUG``. Defaults to: ``INFO``.
 * ``SESSION_COOKIE_AGE``: For how long, in seconds, the session cookie will be valid. Defaults to: ``1209600``.
 * ``SESSION_COOKIE_SAMESITE``: The value of the SameSite flag on the session cookie. This flag prevents the cookie from being sent in cross-site requests thus preventing CSRF attacks and making some methods of stealing session cookie impossible.Currently interferes with OIDC. Keep the value set at Lax if used. Defaults to: ``Lax``.
 * ``CSRF_COOKIE_SAMESITE``: The value of the SameSite flag on the CSRF cookie. This flag prevents the cookie from being sent in cross-site requests. Defaults to: ``Strict``.

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -252,7 +252,7 @@ notifications-api-common[setup-configuration]==0.4.0
     # via
     #   -r requirements/base.in
     #   commonground-api-common
-open-api-framework==0.9.0
+open-api-framework==0.9.1
     # via -r requirements/base.in
 orderedmultidict==1.0.1
     # via furl

diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -411,7 +411,7 @@ notifications-api-common[setup-configuration]==0.4.0
     # via
     #   -r requirements/base.txt
     #   commonground-api-common
-open-api-framework==0.9.0
+open-api-framework==0.9.1
     # via -r requirements/base.txt
 orderedmultidict==1.0.1
     # via

diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -433,7 +433,7 @@ notifications-api-common[setup-configuration]==0.4.0
     # via
     #   -r requirements/base.txt
     #   commonground-api-common
-open-api-framework==0.9.0
+open-api-framework==0.9.1
     # via -r requirements/base.txt
 orderedmultidict==1.0.1
     # via

diff --git a/src/objects/fixtures/demodata.json b/src/objects/fixtures/demodata.json
@@ -779,7 +779,8 @@
         "organization": "",
         "last_modified": "2020-12-23T11:43:16.820Z",
         "created": "2020-12-22T16:27:00.751Z",
-        "token": "cd63e158f3aca276ef284e3033d020a22899c728"
+        "token": "cd63e158f3aca276ef284e3033d020a22899c728",
+        "identifier": "token-1"
     }
 },
 {

diff --git a/src/objects/setup_configuration/tests/test_token_auth_config.py b/src/objects/setup_configuration/tests/test_token_auth_config.py
@@ -384,4 +384,4 @@ def test_invalid_empty_identifier(self):
         with self.assertRaises(PrerequisiteFailed) as command_error:
             execute_single_step(TokenAuthConfigurationStep, object_source=object_source)
         self.assertTrue("String should match pattern" in str(command_error.exception))
-        self.assertEqual(TokenAuth.objects.count(), 0)
+        self.assertEqual(TokenAuth.objects.count(), 0)