From fce982eac8feeb61cbb81258956cd4e5a660f86e Mon Sep 17 00:00:00 2001 From: Logan Bertram Date: Tue, 12 Nov 2024 11:10:36 -0500 Subject: [PATCH 1/2] Fixed date format --- apps/dot_ext/tests/test_authorization.py | 2 +- apps/dot_ext/views/authorization.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/dot_ext/tests/test_authorization.py b/apps/dot_ext/tests/test_authorization.py index e159074c1..c60fdf111 100644 --- a/apps/dot_ext/tests/test_authorization.py +++ b/apps/dot_ext/tests/test_authorization.py @@ -575,7 +575,7 @@ def test_dag_expiration_exists(self): c = Client() response = c.post('/v1/o/token/', data=token_request_data) tkn = response.json() - expiration_date_string = strftime('%Y-%m-%d %H:%M:%SZ', expiration_date.timetuple()) + expiration_date_string = strftime('%Y-%m-%dT%H:%M:%SZ', expiration_date.timetuple()) self.assertEqual(tkn["access_grant_expiration"][:-4], expiration_date_string[:-4]) def test_revoke_endpoint(self): diff --git a/apps/dot_ext/views/authorization.py b/apps/dot_ext/views/authorization.py index dd63ba8a4..5fc3da156 100644 --- a/apps/dot_ext/views/authorization.py +++ b/apps/dot_ext/views/authorization.py @@ -329,13 +329,13 @@ def post(self, request, *args, **kwargs): application=app ) if dag.expiration_date is not None: - dag_expiry = strftime('%Y-%m-%d %H:%M:%SZ', dag.expiration_date.timetuple()) + dag_expiry = strftime('%Y-%m-%dT%H:%M:%SZ', dag.expiration_date.timetuple()) except DataAccessGrant.DoesNotExist: dag_expiry = "" elif app.data_access_type == "ONE_TIME": expires_at = datetime.utcnow() + timedelta(seconds=body['expires_in']) - dag_expiry = expires_at.strftime('%Y-%m-%d %H:%M:%SZ') + dag_expiry = expires_at.strftime('%Y-%m-%dT%H:%M:%SZ') elif app.data_access_type == "RESEARCH_STUDY": dag_expiry = "" From 13336f77162760b4274d64cf71ba6c79f99494fa Mon Sep 17 00:00:00 2001 From: Logan Bertram Date: Wed, 13 Nov 2024 16:35:59 -0500 Subject: [PATCH 2/2] Fixed merge issues --- apps/dot_ext/views/authorization.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/dot_ext/views/authorization.py b/apps/dot_ext/views/authorization.py index 1428dcb8b..847bd1a99 100644 --- a/apps/dot_ext/views/authorization.py +++ b/apps/dot_ext/views/authorization.py @@ -331,13 +331,13 @@ def post(self, request, *args, **kwargs): application=app ) if dag.expiration_date is not None: - dag_expiry = strftime('%Y-%m-%d %H:%M:%SZ', dag.expiration_date.timetuple()) + dag_expiry = strftime('%Y-%m-%dT%H:%M:%SZ', dag.expiration_date.timetuple()) except DataAccessGrant.DoesNotExist: dag_expiry = "" elif app.data_access_type == "ONE_TIME": expires_at = datetime.utcnow() + timedelta(seconds=body['expires_in']) - dag_expiry = expires_at.strftime('%Y-%m-%d %H:%M:%SZ') + dag_expiry = expires_at.strftime('%Y-%m-%dT%H:%M:%SZ') elif app.data_access_type == "RESEARCH_STUDY": dag_expiry = ""