From 4bba5937141068eae7b46dccb971eddf295bef4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Mon, 21 Mar 2022 08:21:36 +0100
Subject: [PATCH] Remove plugin center login without url (#1978)

This removes the "login" button for the plugin center, when the authentication url is not set.
---
 ...emove_plugin_center_login_without_url.yaml |  2 ++
 scm-ui/ui-api/src/config.ts                   |  1 +
 .../ui-webapp/public/locales/de/config.json   |  3 +-
 .../ui-webapp/public/locales/en/config.json   |  3 +-
 .../form/PluginCenterAuthentication.tsx       | 31 ++++++++++++-------
 .../resources/PluginCenterAuthResource.java   |  2 +-
 .../PluginCenterAuthResourceTest.java         | 10 ++++++
 7 files changed, 37 insertions(+), 15 deletions(-)
 create mode 100644 gradle/changelog/remove_plugin_center_login_without_url.yaml

diff --git a/gradle/changelog/remove_plugin_center_login_without_url.yaml b/gradle/changelog/remove_plugin_center_login_without_url.yaml
new file mode 100644
index 0000000000..08b8c0eaa4
--- /dev/null
+++ b/gradle/changelog/remove_plugin_center_login_without_url.yaml
@@ -0,0 +1,2 @@
+- type: fixed
+  description: Remove plugin center login without url ([#1978](https://github.com/scm-manager/scm-manager/pull/1978))
diff --git a/scm-ui/ui-api/src/config.ts b/scm-ui/ui-api/src/config.ts
index 28826d30d5..bd43153d5e 100644
--- a/scm-ui/ui-api/src/config.ts
+++ b/scm-ui/ui-api/src/config.ts
@@ -46,6 +46,7 @@ export const useUpdateConfig = () => {
       onSuccess: async () => {
         await queryClient.invalidateQueries("config");
         await queryClient.invalidateQueries("index");
+        await queryClient.invalidateQueries("pluginCenterAuth");
       }
     }
   );
diff --git a/scm-ui/ui-webapp/public/locales/de/config.json b/scm-ui/ui-webapp/public/locales/de/config.json
index 80819dc651..3c28f656e0 100644
--- a/scm-ui/ui-webapp/public/locales/de/config.json
+++ b/scm-ui/ui-webapp/public/locales/de/config.json
@@ -21,7 +21,8 @@
       "authenticate": "Authentifizieren",
       "authenticated": "Das Plugin Center ist als <0 /> authentifiziert",
       "subjectTooltip": "Authentifiziert als {{ principal }} {{ ago }}",
-      "logout": "Abmelden"
+      "logout": "Abmelden",
+      "notConfiguredHint": "Authentifizierungs URL ist nicht gesetzt"
     }
   },
   "proxySettings": {
diff --git a/scm-ui/ui-webapp/public/locales/en/config.json b/scm-ui/ui-webapp/public/locales/en/config.json
index a4aca07770..f3dbc87380 100644
--- a/scm-ui/ui-webapp/public/locales/en/config.json
+++ b/scm-ui/ui-webapp/public/locales/en/config.json
@@ -21,7 +21,8 @@
       "authenticate": "Authenticate",
       "authenticated": "Plugin Center is authenticated as <0 />",
       "subjectTooltip": "Authenticated by {{ principal }} {{ ago }}",
-      "logout": "Logout"
+      "logout": "Logout",
+      "notConfiguredHint": "Authentication URL is not configured"
     }
   },
   "proxySettings": {
diff --git a/scm-ui/ui-webapp/src/admin/components/form/PluginCenterAuthentication.tsx b/scm-ui/ui-webapp/src/admin/components/form/PluginCenterAuthentication.tsx
index d3226853bb..6c6f565e82 100644
--- a/scm-ui/ui-webapp/src/admin/components/form/PluginCenterAuthentication.tsx
+++ b/scm-ui/ui-webapp/src/admin/components/form/PluginCenterAuthentication.tsx
@@ -26,7 +26,6 @@ import React, { FC } from "react";
 import { usePluginCenterAuthInfo, usePluginCenterLogout } from "@scm-manager/ui-api";
 import { Button, ErrorNotification, Notification, Tooltip, useDateFormatter } from "@scm-manager/ui-components";
 import { Link, PluginCenterAuthenticationInfo } from "@scm-manager/ui-types";
-import { useLocation } from "react-router-dom";
 import styled from "styled-components";
 import { Trans, useTranslation } from "react-i18next";
 
@@ -83,9 +82,17 @@ const AuthenticatedInfo: FC<Props> = ({ authenticationInfo }) => {
   );
 };
 
+const LoginButton: FC<{ link: Link }> = ({ link }) => {
+  const [t] = useTranslation("config");
+  return (
+    <Button color="primary" link={link.href}>
+      {t("pluginSettings.auth.authenticate")}
+    </Button>
+  );
+};
+
 const PluginCenterAuthentication: FC = () => {
   const { data, isLoading, error } = usePluginCenterAuthInfo();
-  const location = useLocation();
   const [t] = useTranslation("config");
 
   if (isLoading) {
@@ -109,16 +116,16 @@ const PluginCenterAuthentication: FC = () => {
     return <AuthenticatedInfo authenticationInfo={data} />;
   }
 
-  return (
-    <Notification type="inherit" className="is-flex is-justify-content-space-between is-align-content-center">
-      <Message>{t("pluginSettings.auth.notAuthenticated")}</Message>
-      {data._links.login ? (
-        <Button color="primary" link={(data._links.login as Link).href + "?source=" + location.pathname}>
-          {t("pluginSettings.auth.authenticate")}
-        </Button>
-      ) : null}
-    </Notification>
-  );
+  if (data._links.login) {
+    return (
+      <Notification type="inherit" className="is-flex is-justify-content-space-between is-align-content-center">
+        <Message>{t("pluginSettings.auth.notAuthenticated")}</Message>
+        <LoginButton link={data._links.login as Link} />
+      </Notification>
+    );
+  } else {
+    return null;
+  }
 };
 
 export default PluginCenterAuthentication;
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/PluginCenterAuthResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/PluginCenterAuthResource.java
index 16b5e39e46..c51828f3c4 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/PluginCenterAuthResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/PluginCenterAuthResource.java
@@ -263,7 +263,7 @@ public class PluginCenterAuthResource {
             .toASCIIString();
           builder.single(Link.link("reconnect", reconnectLink));
         }
-      } else {
+      } else if (!Strings.isNullOrEmpty(configuration.getPluginAuthUrl())) {
         builder.single(Link.link(METHOD_LOGIN, uriInfo.getAbsolutePathBuilder().path(METHOD_LOGIN).build().toASCIIString()));
       }
     }
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/PluginCenterAuthResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/PluginCenterAuthResourceTest.java
index d9cb0bb09e..3c83d5eaa2 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/PluginCenterAuthResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/PluginCenterAuthResourceTest.java
@@ -147,6 +147,16 @@ class PluginCenterAuthResourceTest {
       assertThat(root.get("_links").get("login").get("href").asText()).isEqualTo("/v2/plugins/auth/login");
     }
 
+    @Test
+    @SubjectAware(value = "marvin", permissions = "plugin:write")
+    void shouldNotReturnLoginLinkIfPermittedButNotConfigured() throws URISyntaxException, IOException {
+      scmConfiguration.setPluginAuthUrl(null);
+
+      JsonNode root = getJson("/v2/plugins/auth");
+
+      assertThat(root.get("_links").get("login")).isNull();
+    }
+
     @Test
     @SubjectAware(value = "marvin", permissions = "plugin:write")
     void shouldReturnReconnectAndLogoutLinkForFailedAuthentication() throws URISyntaxException, IOException {