diff --git a/arkindex/project/config.py b/arkindex/project/config.py index b97f561fc4b63e234fb82432f7d4847c544aa4e8..71a74d8282f86f52f85d19884a9feffd139e3b46 100644 --- a/arkindex/project/config.py +++ b/arkindex/project/config.py @@ -91,7 +91,6 @@ def get_settings_parser(base_dir): # SECURITY WARNING: keep the secret key used in production secret! parser.add_option("secret_key", type=str, default="jf0w^y&ml(caax8f&a1mub)(js9(l5mhbbhosz3gi+m01ex+lo") - parser.add_option("jwt_signing_key", type=str, default=None) database_parser = parser.add_subparser("database", default={}) database_parser.add_option("name", type=str, default="arkindex_dev") diff --git a/arkindex/project/settings.py b/arkindex/project/settings.py index fee1ef5ac2602f1ef00c67da2c85b36efe2bc350..eaed15d931496e9e27069cdc2689654255972dff 100644 --- a/arkindex/project/settings.py +++ b/arkindex/project/settings.py @@ -14,7 +14,6 @@ import decimal import os import sys import warnings -from datetime import timedelta from pathlib import Path from textwrap import dedent @@ -219,13 +218,6 @@ REST_FRAMEWORK = { "TEST_REQUEST_DEFAULT_FORMAT": "json", } -SIMPLE_JWT = { - "USER_ID_CLAIM": "agent_id", - "ROTATE_REFRESH_TOKENS": True, - "ACCESS_TOKEN_LIFETIME": timedelta(hours=6), - "SIGNING_KEY": conf["jwt_signing_key"] or SECRET_KEY, -} - SPECTACULAR_SETTINGS = { "CAMELIZE_NAMES": True, # Remove the automatically generated `description` that lists the members of all enums, diff --git a/arkindex/project/tests/config_samples/defaults.yaml b/arkindex/project/tests/config_samples/defaults.yaml index 24aa0d51d4b66cab220df1ad131648ab26039348..d45fe54f5d5bd1450e367f7615e82c46675df887 100644 --- a/arkindex/project/tests/config_samples/defaults.yaml +++ b/arkindex/project/tests/config_samples/defaults.yaml @@ -60,7 +60,6 @@ job_timeouts: send_verification_email: 120 task: 36000 worker_results_delete: 3600 -jwt_signing_key: null local_imageserver_id: 1 metrics_port: 3000 ponos: diff --git a/arkindex/project/tests/config_samples/errors.yaml b/arkindex/project/tests/config_samples/errors.yaml index fd795eded5eb97f408d21b5263afabbb62e8f64e..455ae2d4ca25f153dff5577f2db6c455564b9f9e 100644 --- a/arkindex/project/tests/config_samples/errors.yaml +++ b/arkindex/project/tests/config_samples/errors.yaml @@ -43,7 +43,6 @@ job_timeouts: task: '' worker_results_delete: null send_verification_email: lol -jwt_signing_key: null local_imageserver_id: 1 metrics_port: 12 ponos: diff --git a/arkindex/project/tests/config_samples/override.yaml b/arkindex/project/tests/config_samples/override.yaml index fed278c1c26d9b17837037b68b9b6922cffe7745..52b0d9869fc5863f513130342cc049b868d7910c 100644 --- a/arkindex/project/tests/config_samples/override.yaml +++ b/arkindex/project/tests/config_samples/override.yaml @@ -75,7 +75,6 @@ job_timeouts: send_verification_email: 10 task: 11 worker_results_delete: 12 -jwt_signing_key: deadbeef local_imageserver_id: 45 metrics_port: 4242 ponos: diff --git a/requirements.txt b/requirements.txt index 0deadcac3b5ce6f4c6e637454dccca90b2a566eb..29cf9f325bc4239d08d8d281d51889df9cd77162 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,6 @@ django-enumfields2==3.0.2 django-pgtrigger==4.7.0 django-rq==2.10.1 djangorestframework==3.15.2 -djangorestframework-simplejwt==5.4.0 docker==7.0.0 drf-spectacular==0.27.2 psycopg[binary]==3.2.4