From 03280073459210901675c8664315f4f9d70f6009 Mon Sep 17 00:00:00 2001
From: CalDescent <caldescent@protonmail.com>
Date: Sat, 30 Oct 2021 17:29:23 +0100
Subject: [PATCH] Domain mapping now uses registered name instead of
 transaction signature.

There's no real need to maintain support for signature mapping anymore. Using this new method means that the latest version of a site is always served via the traditional domain name, whereas using transaction signatures caused older versions to be shown.

Example settings.json configuration:

"domainMapServiceEnabled": true,
"domainMapServicePort": 80,
"domainMap": [
  {
    "domain": "webdemo.qortal.uk",
    "name": "QortalDemo"
  },
 {
    "domain": "www.reqorder.org",
    "name": "ReQorder"
  }
]
---
 .../org/qortal/api/resource/WebsiteResource.java     |  2 +-
 src/main/java/org/qortal/settings/Settings.java      | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/qortal/api/resource/WebsiteResource.java b/src/main/java/org/qortal/api/resource/WebsiteResource.java
index 71d9430d..5c8951a6 100644
--- a/src/main/java/org/qortal/api/resource/WebsiteResource.java
+++ b/src/main/java/org/qortal/api/resource/WebsiteResource.java
@@ -215,7 +215,7 @@ public class WebsiteResource {
     private HttpServletResponse getDomainMap(String inPath) {
         Map<String, String> domainMap = Settings.getInstance().getSimpleDomainMap();
         if (domainMap != null && domainMap.containsKey(request.getServerName())) {
-            return this.get(domainMap.get(request.getServerName()), ResourceIdType.SIGNATURE, inPath, null, "", false);
+            return this.get(domainMap.get(request.getServerName()), ResourceIdType.NAME, inPath, null, "", false);
         }
         return this.getResponse(404, "Error 404: File Not Found");
     }
diff --git a/src/main/java/org/qortal/settings/Settings.java b/src/main/java/org/qortal/settings/Settings.java
index e3c9ac4f..0e542c3c 100644
--- a/src/main/java/org/qortal/settings/Settings.java
+++ b/src/main/java/org/qortal/settings/Settings.java
@@ -270,7 +270,7 @@ public class Settings {
 	// Domain mapping
 	public static class DomainMap {
 		private String domain;
-		private String signature;
+		private String name;
 
 		private DomainMap() { // makes JAXB happy; will never be invoked
 		}
@@ -283,12 +283,12 @@ public class Settings {
 			this.domain = domain;
 		}
 
-		public String getSignature() {
-			return signature;
+		public String getName() {
+			return name;
 		}
 
-		public void setSignature(String signature) {
-			this.signature = signature;
+		public void setName(String name) {
+			this.name = name;
 		}
 	}
 
@@ -511,7 +511,7 @@ public class Settings {
 	public Map<String, String> getSimpleDomainMap() {
 		HashMap<String, String> map = new HashMap<>();
 		for (DomainMap dMap : this.domainMap) {
-			map.put(dMap.getDomain(), dMap.getSignature());
+			map.put(dMap.getDomain(), dMap.getName());
 		}
 		return map;
 	}