Re-factor

Author: robotdan

src/main/java/io/fusionauth/http/server/HTTPRequest.java

@@ -785,11 +785,6 @@ private int getBaseURLServerPort() {
       return serverPort;
     }
 
-    // If we don't have an X-Forwarded-Proto header, or it is not https, nothing to do here.
-    if (!"https".equals(getHeader(Headers.XForwardedProto))) {
-      return serverPort;
-    }
-
     // If we don't have a host header, nothing to do here.
     String xHost = getHeader(Headers.XForwardedHost);
     if (xHost == null) {
@@ -808,6 +803,12 @@ private int getBaseURLServerPort() {
       return serverPort;
     }
 
+    // If we don't have an X-Forwarded-Proto header, or it is not https, nothing to do here.
+    // - We must have the X-Forwarded-Proto: https in order to assume 443
+    if (!"https".equals(getHeader(Headers.XForwardedProto))) {
+      return serverPort;
+    }
+
     // If we made this far, we have met all conditions for assuming port 443.
     // - We are missing the X-Forwarded-Port header, we have an X-Forwarded-Proto header of https, and we have an X-Forwarded-Host
     //   header value that has not defined a port, and it has defined a port.