fix(server): marketplace http client bug

reearth · Sep 9, 2022 · b652c80 · b652c80
1 parent 6b6b21f
commit b652c80
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/server/internal/app/config.go b/server/internal/app/config.go
@@ -333,7 +333,7 @@ type OAuthClientCredentialsConfig struct {
 }
 
 func (c *OAuthClientCredentialsConfig) Config() *clientcredentials.Config {
-	if c == nil {
+	if c == nil || c.ClientID == "" || c.ClientSecret == "" || c.TokenURL == "" {
 		return nil
 	}
 

diff --git a/server/internal/infrastructure/marketplace/marketplace.go b/server/internal/infrastructure/marketplace/marketplace.go
@@ -36,7 +36,7 @@ func (m *Marketplace) FetchPluginPackage(ctx context.Context, pid id.PluginID) (
 }
 
 func (m *Marketplace) getPluginURL(pid id.PluginID) (string, error) {
-	return fmt.Sprintf("%s/api/plugins/%s/%s.zip", m.endpoint, pid.Name(), pid.Version().String()), nil
+	return strings.TrimSpace(fmt.Sprintf("%s/api/plugins/%s/%s.zip", m.endpoint, pid.Name(), pid.Version().String())), nil
 }
 
 /*
@@ -96,7 +96,7 @@ type plugin struct {
 
 func (m *Marketplace) downloadPluginPackage(ctx context.Context, url string) (*pluginpack.Package, error) {
 	var client *http.Client
-	if m.conf != nil {
+	if m.conf != nil && m.conf.ClientID != "" && m.conf.ClientSecret != "" && m.conf.TokenURL != "" {
 		client = m.conf.Client(ctx)
 	}
 	if client == nil {