diff --git a/net/server/internal/api_status.go b/net/server/internal/api_status.go index 730769e6..05d76241 100644 --- a/net/server/internal/api_status.go +++ b/net/server/internal/api_status.go @@ -23,6 +23,13 @@ func Status(w http.ResponseWriter, r *http.Request) { // send ringing updates ringMode := r.FormValue("mode") == "ring" + // allows cross origin websocket in dev mode + if APPMode == "dev" { + upgrader.CheckOrigin = func(r *http.Request) bool { + return true + } + } + // accept websocket connection conn, err := upgrader.Upgrade(w, r, nil) if err != nil { diff --git a/net/server/internal/appValues.go b/net/server/internal/appValues.go index e16eae20..f18df29d 100644 --- a/net/server/internal/appValues.go +++ b/net/server/internal/appValues.go @@ -1,5 +1,8 @@ package databag +//APPMode for development mode +var APPMode = "prod" + //APPCopyTransform reserved tranform code indicating copy const APPTransformCopy = "_" diff --git a/net/server/main.go b/net/server/main.go index 86f18d0e..1313ad3f 100644 --- a/net/server/main.go +++ b/net/server/main.go @@ -79,6 +79,7 @@ func main() { } } + app.APPMode = mode router := app.NewRouter(webApp) origins := handlers.AllowedOrigins([]string{"*"}) headers := handlers.AllowedHeaders([]string{"content-type", "authorization"})