Merge remote-tracking branch 'origin/master' into 2499-rewrites-3

2022-12-27 10:09:33 +07:00
parent 8e058b8042 e7fc61a997
commit 5a794411d9
3 changed files with 11 additions and 2 deletions
--- a/client/src/actions/encryption.js
+++ b/client/src/actions/encryption.js
@@ -41,6 +41,10 @@ export const setTlsConfig = (config) => async (dispatch, getState) => {
        response.certificate_chain = atob(response.certificate_chain);
        response.private_key = atob(response.private_key);

+        if (values.enabled && values.force_https && window.location.protocol === 'http:') {
+            window.location.reload();
+            return;
+        }
        redirectToCurrentProtocol(response, httpPort);

        const dnsStatus = await apiClient.getGlobalStatus();