From 7fe1148f44e878a64e01f48dc3aae29eae6ebe1a Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriks@matrix.org>
Date: Mon, 5 Aug 2019 19:28:31 +0100
Subject: 'not useing' tls is no longer an option.

---
 synapse_topology/view/webui/js/actions/constants.js       |  1 -
 synapse_topology/view/webui/js/components/TLS.jsx         | 15 +++------------
 synapse_topology/view/webui/js/containers/TLS.js          |  4 ----
 .../view/webui/js/reducers/reducer-base-config-ui.js      |  4 +---
 4 files changed, 4 insertions(+), 20 deletions(-)

(limited to 'synapse_topology/view/webui')

diff --git a/synapse_topology/view/webui/js/actions/constants.js b/synapse_topology/view/webui/js/actions/constants.js
index 467bd4e3fc..ebd3498679 100644
--- a/synapse_topology/view/webui/js/actions/constants.js
+++ b/synapse_topology/view/webui/js/actions/constants.js
@@ -16,5 +16,4 @@ export const TLS_TYPES = {
   ACME: "ACME",
   TLS: "TLS",
   REVERSE_PROXY: "REVERSE_PROXY",
-  NONE: "NONE",
 }
\ No newline at end of file
diff --git a/synapse_topology/view/webui/js/components/TLS.jsx b/synapse_topology/view/webui/js/components/TLS.jsx
index 2dc560f708..4b6898d11d 100644
--- a/synapse_topology/view/webui/js/components/TLS.jsx
+++ b/synapse_topology/view/webui/js/components/TLS.jsx
@@ -12,7 +12,7 @@ const haproxyLink = "http://www.haproxy.org/";
 const nginxLink = "https://www.nginx.com/";
 const proxyInfoLink = "https://github.com/matrix-org/synapse/blob/master/docs/reverse_proxy.rst";
 
-export default ({ onClickACME, onClickTLS, onClickReverseProxy, onClickNoTLS }) =>
+export default ({ onClickACME, onClickTLS, onClickReverseProxy }) =>
   <ContentWrapper>
     <h1>TLS</h1>
     <p>
@@ -22,7 +22,7 @@ export default ({ onClickACME, onClickTLS, onClickReverseProxy, onClickNoTLS })
     <p>
       TLS keeps the communication between homeservers secure. To enable TLS you'll
       need a TLS cert. You can use ACME, provide your own certs, or let the reverse
-      proxy handle the TLS certs instead. (You can also not use TLS but that's not recommended)
+      proxy handle the TLS certs instead.
     </p>
     <h3>
       ReverseProxy
@@ -69,18 +69,9 @@ export default ({ onClickACME, onClickTLS, onClickReverseProxy, onClickNoTLS })
       If you have your own TLS certs for the domain we'll ask you for the path
       to them or you can upload them for synapse to use.
     </p>
-    <h3>
-      Don't use TLS
-    </h3>
-    <p>
-      Please don't do this.
-    </p>
     <ButtonDisplay>
       <button onClick={() => onClickACME()}>Use ACME</button>
       <button onClick={() => onClickReverseProxy()}>I already/will use a Reverse Proxy with TLS</button>
       <button onClick={() => onClickTLS()}>I have a TLS cert</button>
     </ButtonDisplay>
-    <ButtonDisplay>
-      <button className={style.redButton} onClick={() => onClickNoTLS()}>Do not use TLS</button>
-    </ButtonDisplay>
-  </ContentWrapper >
\ No newline at end of file
+  </ContentWrapper>
\ No newline at end of file
diff --git a/synapse_topology/view/webui/js/containers/TLS.js b/synapse_topology/view/webui/js/containers/TLS.js
index 58efa98897..24f8f2cfe6 100644
--- a/synapse_topology/view/webui/js/containers/TLS.js
+++ b/synapse_topology/view/webui/js/containers/TLS.js
@@ -19,10 +19,6 @@ const mapDispathToProps = (dispatch) => ({
     dispatch(advance_ui(TLS_TYPES.TLS));
     dispatch(set_tls(TLS_TYPES.TLS));
   },
-  onClickNoTLS: () => {
-    dispatch(advance_ui(TLS_TYPES.NONE));
-    dispatch(set_tls(TLS_TYPES.NONE));
-  },
   onClickReverseProxy: () => {
     dispatch(advance_ui(TLS_TYPES.REVERSE_PROXY)),
       dispatch(set_tls(TLS_TYPES.REVERSE_PROXY))
diff --git a/synapse_topology/view/webui/js/reducers/reducer-base-config-ui.js b/synapse_topology/view/webui/js/reducers/reducer-base-config-ui.js
index fce8da2018..3d5142b11a 100644
--- a/synapse_topology/view/webui/js/reducers/reducer-base-config-ui.js
+++ b/synapse_topology/view/webui/js/reducers/reducer-base-config-ui.js
@@ -45,9 +45,7 @@ export default (state, action) => {
             case DELEGATION_TYPES.WELL_KNOWN:
               return DELEGATION_SERVER_NAME_UI;
             case DELEGATION_TYPES.LOCAL:
-              return REVERSE_PROXY_UI;
-            default:
-              return DELEGATION_OPTIONS_UI;
+              return TLS_UI;
           }
         case DELEGATION_SERVER_NAME_UI:
           return DELEGATION_PORT_SELECTION_UI;
-- 
cgit 1.5.1