Commit 9da8a56d authored by Yann Garcia's avatar Yann Garcia
Browse files

Bug fixed building host URL

parent b493b9fc

go-apps/meep-sandbox-api/server/sandbox_api.go

+2 −13
Original line number Diff line number Diff line
@@ -222,17 +222,6 @@ func Init() (err error) { 
	}

	log.Info("sandboxApiConnectors.uri: ", sandboxApiConnectors.uri)



	// hostUrl is the url of the node serving the resourceURL

	// Retrieve public url address where service is reachable, if not present, use Host URL environment variable

	sandboxApiConnectors.uri, err = url.Parse(strings.TrimSpace(os.Getenv("MEEP_PUBLIC_URL")))

	if err != nil || sandboxApiConnectors.uri == nil || sandboxApiConnectors.uri.String() == "" {

		sandboxApiConnectors.uri, err = url.Parse(strings.TrimSpace(os.Getenv("MEEP_HOST_URL")))

		if err != nil {

			sandboxApiConnectors.uri = new(url.URL)

		}

	}

	log.Info("sandboxApiConnectors.uri: ", sandboxApiConnectors.uri)



	sandboxApiConnectors.sessionStore = make(map[string]*sm.Session)

	sandboxApiConnectors.sandboxCtrlAppClient = make(map[string]*sandboxCtrlClient.APIClient)
@@ -349,7 +338,7 @@ func login(w http.ResponseWriter, r *http.Request) { 
		_ = sandboxApiConnectors.metricStore.SetSessionMetric(met.SesMetTypeLogin, metric)



		sandboxCtrlAppClientCfg := sandboxCtrlClient.NewConfiguration()

		sandboxCtrlAppClientCfg.BasePath = sandboxApiConnectors.uri + "/" + sandboxName + "/sandbox-ctrl/v1"

		sandboxCtrlAppClientCfg.BasePath = sandboxApiConnectors.uri.String() + "/" + sandboxName + "/sandbox-ctrl/v1"

		log.Info("sandboxCtrlAppClientCfg.BasePath: ", sandboxCtrlAppClientCfg.BasePath)

		tr := &http.Transport{TLSClientConfig: &tls.Config{InsecureSkipVerify: true}}

		sandboxCtrlAppClientCfg.HTTPClient = &http.Client{Transport: tr}
@@ -536,7 +525,7 @@ func login(w http.ResponseWriter, r *http.Request) { 
		_ = sandboxApiConnectors.metricStore.SetSessionMetric(met.SesMetTypeLogin, metric)



		sandboxCtrlAppClientCfg := sandboxCtrlClient.NewConfiguration()

		sandboxCtrlAppClientCfg.BasePath = sandboxApiConnectors.uri + "/" + sandboxName + "/sandbox-ctrl/v1"

		sandboxCtrlAppClientCfg.BasePath = sandboxApiConnectors.uri.String() + "/" + sandboxName + "/sandbox-ctrl/v1"

		log.Info("sandboxCtrlAppClientCfg.BasePath: ", sandboxCtrlAppClientCfg.BasePath)

		tr := &http.Transport{TLSClientConfig: &tls.Config{InsecureSkipVerify: true}}

		sandboxCtrlAppClientCfg.HTTPClient = &http.Client{Transport: tr}