diff --git a/appview/state/repo.go b/appview/state/repo.go index e82cc311..e01c44ef 100644 --- a/appview/state/repo.go +++ b/appview/state/repo.go @@ -395,7 +395,7 @@ func (s *State) AddCollaborator(w http.ResponseWriter, r *http.Request) { return } - ksClient, err := NewSignedClient(f.Knot, secret) + ksClient, err := NewSignedClient(f.Knot, secret, s.config.Dev) if err != nil { log.Println("failed to create client to ", f.Knot) return diff --git a/appview/state/signer.go b/appview/state/signer.go index 9877c8d5..8cfcc052 100644 --- a/appview/state/signer.go +++ b/appview/state/signer.go @@ -9,7 +9,6 @@ import ( "fmt" "net/http" "net/url" - "os" "time" ) @@ -34,7 +33,7 @@ type SignedClient struct { client *http.Client } -func NewSignedClient(domain, secret string) (*SignedClient, error) { +func NewSignedClient(domain, secret string, dev bool) (*SignedClient, error) { client := &http.Client{ Timeout: 5 * time.Second, Transport: SignerTransport{ @@ -43,7 +42,7 @@ func NewSignedClient(domain, secret string) (*SignedClient, error) { } uri := "https" - if os.Getenv("TANGLED_DEV") == "true" { + if dev { uri = "http" } url, err := url.Parse(fmt.Sprintf("%s://%s", uri, domain)) diff --git a/appview/state/state.go b/appview/state/state.go index 61b67d0c..fe2f05dc 100644 --- a/appview/state/state.go +++ b/appview/state/state.go @@ -256,7 +256,7 @@ func (s *State) InitKnotServer(w http.ResponseWriter, r *http.Request) { return } - client, err := NewSignedClient(domain, secret) + client, err := NewSignedClient(domain, secret, s.config.Dev) if err != nil { log.Println("failed to create client to ", domain) } @@ -450,7 +450,7 @@ func (s *State) AddMember(w http.ResponseWriter, r *http.Request) { return } - ksClient, err := NewSignedClient(domain, secret) + ksClient, err := NewSignedClient(domain, secret, s.config.Dev) if err != nil { log.Println("failed to create client to ", domain) return @@ -526,7 +526,7 @@ func (s *State) AddRepo(w http.ResponseWriter, r *http.Request) { return } - client, err := NewSignedClient(domain, secret) + client, err := NewSignedClient(domain, secret, s.config.Dev) if err != nil { s.pages.Notice(w, "repo", "Failed to connect to knot server.") return