fix(server): add schema to published field in web config

reearth · Feb 24, 2023 · b17807a · b17807a
1 parent 18fdf71
commit b17807a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/server/internal/app/public.go b/server/internal/app/public.go
@@ -248,6 +248,7 @@ func getAliasFromHost(host, pattern string) string {
 	}
 
 	const placeholder = "<>"
+	pattern = strings.TrimPrefix(strings.TrimPrefix(pattern, "https://"), "http://")
 	pattern = strings.ReplaceAll(pattern, "{}", placeholder)
 	re, err := regexp.Compile(strings.ReplaceAll(regexp.QuoteMeta(pattern), placeholder, "(.+?)"))
 	if err != nil {

diff --git a/server/internal/app/public_test.go b/server/internal/app/public_test.go
@@ -241,5 +241,7 @@ func TestGetAliasFromHost(t *testing.T) {
 	assert.Equal(t, "", getAliasFromHost("", ".example.com")) // invalid regexp
 	assert.Equal(t, "", getAliasFromHost("", "{}.example.com"))
 	assert.Equal(t, "aaa", getAliasFromHost("aaa.example.com", "{}.example.com"))
+	assert.Equal(t, "aaa", getAliasFromHost("aaa.example.com", "https://{}.example.com"))
+	assert.Equal(t, "aaa", getAliasFromHost("aaa.example.com", "http://{}.example.com"))
 	assert.Equal(t, "bbb.aaa", getAliasFromHost("bbb.aaa.example.com", "{}.example.com"))
 }
diff --git a/server/internal/app/web.go b/server/internal/app/web.go
@@ -47,7 +47,7 @@ func (w *WebHandler) Handler(e *echo.Echo) {
 		}
 	}
 	if w.HostPattern != "" {
-		config["published"] = w.HostPattern
+		config["published"] = w.hostWithSchema()
 	}
 
 	for k, v := range w.WebConfig {
@@ -73,3 +73,10 @@ func (w *WebHandler) Handler(e *echo.Echo) {
 	e.GET("/", notFound, PublishedIndexMiddleware(w.HostPattern, false, w.AppDisabled), m)
 	e.GET("*", notFound, m)
 }
+
+func (w *WebHandler) hostWithSchema() string {
+	if strings.HasPrefix(w.HostPattern, "http://") || strings.HasPrefix(w.HostPattern, "https://") {
+		return w.HostPattern
+	}
+	return "https://" + w.HostPattern
+}
diff --git a/server/internal/app/web_test.go b/server/internal/app/web_test.go
@@ -66,7 +66,7 @@ func TestWeb(t *testing.T) {
 			name:        "reearth_config.json",
 			path:        "/reearth_config.json",
 			statusCode:  http.StatusOK,
-			body:        `{"a":"b","auth0Audience":"https://aud.example.com","auth0ClientId":"clientID","auth0Domain":"https://iss.example.com"}`,
+			body:        `{"a":"b","auth0Audience":"https://aud.example.com","auth0ClientId":"clientID","auth0Domain":"https://iss.example.com","published":"https://{}.example.com"}`,
 			contentType: "application/json; charset=UTF-8",
 		},
 		{