From 6c955c38fd8405fc3079a2d8845b86bc1f9fd4b9 Mon Sep 17 00:00:00 2001 From: Piotr Gawron Date: Mon, 5 Sep 2022 17:12:40 +0200 Subject: [PATCH 1/2] include another issue affected by API docs problem --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index d12cf9f11..ee45af471 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,6 @@ minerva (16.2.8) stable; urgency=medium * Bug fix: missing content-type header in REST API documentation caused issues - with converter API (#1745, #1754, #1759) + with converter API (#1745, #1754, #1759, #1755) -- Piotr Gawron Sat, 03 Sep 2022 22:00:00 +0200 -- GitLab From e3614bf36bbc9690769fcf236fad26f14b6979c6 Mon Sep 17 00:00:00 2001 From: Piotr Gawron Date: Mon, 5 Sep 2022 19:50:33 +0200 Subject: [PATCH 2/2] document authentication token when necessary --- CHANGELOG | 2 ++ .../CommandFormatterWithReplacingPostFilenameHeader.java | 3 +++ .../lcsb/mapviewer/web/utils/CustomCurlRequestSnippet.java | 7 +++++++ 3 files changed, 12 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index ee45af471..9ea9bfa8e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ minerva (16.2.8) stable; urgency=medium * Bug fix: missing content-type header in REST API documentation caused issues with converter API (#1745, #1754, #1759, #1755) + * Bug fix: MINERVA_AUTH token in REST API documentation was sometimes missing + and sometimes it was unnecessary (#1744) -- Piotr Gawron Sat, 03 Sep 2022 22:00:00 +0200 diff --git a/web/src/test/java/lcsb/mapviewer/web/utils/CommandFormatterWithReplacingPostFilenameHeader.java b/web/src/test/java/lcsb/mapviewer/web/utils/CommandFormatterWithReplacingPostFilenameHeader.java index 9a5fefe85..b42b9465d 100644 --- a/web/src/test/java/lcsb/mapviewer/web/utils/CommandFormatterWithReplacingPostFilenameHeader.java +++ b/web/src/test/java/lcsb/mapviewer/web/utils/CommandFormatterWithReplacingPostFilenameHeader.java @@ -52,6 +52,9 @@ public class CommandFormatterWithReplacingPostFilenameHeader implements CommandF @Override public String format(final List elements) { if (CollectionUtils.isEmpty(elements)) { + if (session) { + return String.format(this.separator) + "--cookie \"" + Configuration.AUTH_TOKEN + "=xxxxxxxx\""; + } return ""; } String contentFileName = getContentFileName(elements); diff --git a/web/src/test/java/lcsb/mapviewer/web/utils/CustomCurlRequestSnippet.java b/web/src/test/java/lcsb/mapviewer/web/utils/CustomCurlRequestSnippet.java index 3c37f8e3e..21fe1f46c 100644 --- a/web/src/test/java/lcsb/mapviewer/web/utils/CustomCurlRequestSnippet.java +++ b/web/src/test/java/lcsb/mapviewer/web/utils/CustomCurlRequestSnippet.java @@ -2,6 +2,8 @@ package lcsb.mapviewer.web.utils; import java.util.Map; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.restdocs.cli.CommandFormatter; import org.springframework.restdocs.cli.CurlRequestSnippet; import org.springframework.restdocs.operation.Operation; @@ -17,6 +19,8 @@ import org.springframework.restdocs.operation.Operation; */ public class CustomCurlRequestSnippet extends CurlRequestSnippet { + protected static Logger logger = LogManager.getLogger(); + private final CommandFormatter commandFormatter; public CustomCurlRequestSnippet(final CommandFormatter commandFormatter) { @@ -35,6 +39,9 @@ public class CustomCurlRequestSnippet extends CurlRequestSnippet { boolean session = false; if (obj instanceof org.springframework.mock.web.MockHttpServletRequest) { session = (((org.springframework.mock.web.MockHttpServletRequest) obj).getSession() != null); + if (session) { + session = !((org.springframework.mock.web.MockHttpServletRequest) obj).getSession().isNew(); + } } if (commandFormatter instanceof CommandFormatterWithReplacingPostFilenameHeader) { ((CommandFormatterWithReplacingPostFilenameHeader) commandFormatter).setSessionAvailable(session); -- GitLab