From 89e74e6c7c8d6d98939a24fa3f77b9caff2dec07 Mon Sep 17 00:00:00 2001 From: Jeffrey Armstrong Date: Thu, 27 Oct 2022 18:37:28 -0400 Subject: Auto appending the token by adding gemini-style query strings when posting, or using titan, is now disabled since titan already handles the token in a different manner. --- player/endpoints.f90 | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/player/endpoints.f90 b/player/endpoints.f90 index 60e96af..cbb1126 100644 --- a/player/endpoints.f90 +++ b/player/endpoints.f90 @@ -103,28 +103,34 @@ contains character(len=*), intent(in), optional::task_type character(*), intent(out)::url - character(32)::int_text + logical::internal_posting + + internal_posting = .false. if(present(posting)) then - call base_url(captain, LOCATION_STATUS, posting, url) - else - call base_url(captain, LOCATION_STATUS, .false., url) + internal_posting = posting end if + + call base_url(captain, LOCATION_STATUS, internal_posting, url) + call replace_field(url, "name", identity) call replace_field(url, "jobid", job) call replace_field(url, "step", step) - if(present(status)) then - url = trim(url)//"?status="//trim(status_text(status)) - if(present(task_type)) then - url = trim(url)//"&type="//trim(task_type) + ! Query strings aren't to be used when posting (i.e. a titan request) + if(.not. internal_posting) then + if(present(status)) then + url = trim(url)//"?status="//trim(status_text(status)) + if(present(task_type)) then + url = trim(url)//"&type="//trim(task_type) + end if + else if(present(task_type)) then + url = trim(url)//"?type="//trim(task_type) end if - else if(present(task_type)) then - url = trim(url)//"?type="//trim(task_type) + + call append_query_token(url) end if - call append_query_token(url) - end subroutine get_status_url subroutine get_job_report_url(job, success, res) -- cgit v1.2.3