Merge branch 'main' into release

CHANGELOG.md

@@ -3,31 +3,21 @@ All notable changes to this project will be documented in this file.
 
 ## 0.9.0 - 2022-07-20
 
-### chore
-
-- Update Makefile to remove unused targets [`67780b`](https://github.com/reearth/reearth-backend/commit/67780b)
-
-### ci
-
-- Fix release workflow [`0e2daa`](https://github.com/reearth/reearth-backend/commit/0e2daa)
-- Update changelog config [`62dede`](https://github.com/reearth/reearth-backend/commit/62dede)
-- Simplify if in build workflow [`164eba`](https://github.com/reearth/reearth-backend/commit/164eba)
-
-### feat
+### 🚀 Features
 
 - Change layer indicators from preset list from backend side ([#158](https://github.com/reearth/reearth-backend/pull/158)) [`0267f1`](https://github.com/reearth/reearth-backend/commit/0267f1)
 
-### fix
+### 🔧 Bug Fixes
 
 - Property fields in a property list cannot be removed ([#160](https://github.com/reearth/reearth-backend/pull/160)) [`358237`](https://github.com/reearth/reearth-backend/commit/358237)
 
-### test
+### 🧪 Testing
 
 - Unit test for mongo auth request repo ([#159](https://github.com/reearth/reearth-backend/pull/159)) [`5afc81`](https://github.com/reearth/reearth-backend/commit/5afc81)
 
-### 
+### Miscellaneous Tasks
 
-- V0.8.0 [`64d646`](https://github.com/reearth/reearth-backend/commit/64d646)
+- Update Makefile to remove unused targets [`67780b`](https://github.com/reearth/reearth-backend/commit/67780b)
 
 ## 0.8.0 - 2022-06-17
 
@@ -341,4 +331,4 @@ All notable changes to this project will be documented in this file.
 - Fix renaming file names in release workflow [`96f0b3`](https://github.com/reearth/reearth-backend/commit/96f0b3)
 - Fix and refactor release workflow [skip ci] [`d5466b`](https://github.com/reearth/reearth-backend/commit/d5466b)
 
-<!-- generated by git-cliff -->
+<!-- generated by git-cliff -->

internal/app/app.go

@@ -139,7 +139,7 @@ func allowedOrigins(cfg *ServerConfig) []string {
 	}
 	origins := append([]string{}, cfg.Config.Origins...)
 	if cfg.Debug {
-		origins = append(origins, "http://localhost:3000", "http://localhost:8080")
+		origins = append(origins, "http://localhost:3000", "http://127.0.0.1:3000", "http://localhost:8080")
 	}
 	return origins
 }

internal/app/config.go

@@ -18,6 +18,7 @@ const configPrefix = "reearth"
 
 type Config struct {
 	Port           string `default:"8080" envconfig:"PORT"`
+	ServerHost     string
 	Host           string `default:"http://localhost:8080"`
 	Host_Web       string
 	Dev            bool

internal/app/main.go

@@ -66,10 +66,15 @@ func NewServer(ctx context.Context, cfg *ServerConfig) *WebServer {
 		port = "8080"
 	}
 
-	address := "0.0.0.0:" + port
-	if cfg.Debug {
-		address = "localhost:" + port
+	host := cfg.Config.ServerHost
+	if host == "" {
+		if cfg.Debug {
+			host = "localhost"
+		} else {
+			host = "0.0.0.0"
+		}
 	}
+	address := host + ":" + port
 
 	w := &WebServer{
 		address: address,