From d4237b1fe9efe49967c69d6e4a0e4fcc403a0285 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Mon, 1 Oct 2018 13:02:34 +0200 Subject: [PATCH] Generate only one login link --- .../java/sonia/scm/api/v2/resources/IndexDtoGenerator.java | 5 +---- .../java/sonia/scm/api/v2/resources/IndexResourceTest.java | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/IndexDtoGenerator.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/IndexDtoGenerator.java index b0e39c197a..8ed193348c 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/IndexDtoGenerator.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/IndexDtoGenerator.java @@ -39,10 +39,7 @@ public class IndexDtoGenerator { } builder.single(link("repositories", resourceLinks.repositoryCollection().self())); } else { - builder.single( - link("formLogin", resourceLinks.authentication().formLogin()), - link("jsonLogin", resourceLinks.authentication().jsonLogin()) - ); + builder.single(link("login", resourceLinks.authentication().jsonLogin())); } return new IndexDto(builder.build()); diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/IndexResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/IndexResourceTest.java index 00c6b39313..6bdd44e791 100644 --- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/IndexResourceTest.java +++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/IndexResourceTest.java @@ -22,8 +22,7 @@ public class IndexResourceTest { public void shouldRenderLoginUrlsForUnauthenticatedRequest() { IndexDto index = indexResource.getIndex(); - Assertions.assertThat(index.getLinks().getLinkBy("formLogin")).matches(Optional::isPresent); - Assertions.assertThat(index.getLinks().getLinkBy("jsonLogin")).matches(Optional::isPresent); + Assertions.assertThat(index.getLinks().getLinkBy("login")).matches(Optional::isPresent); } @Test