fix cli commands that interact with the api

merlinfuchs · Feb 3, 2024 · 28e16c6 · 28e16c6
1 parent 20f9bfc
commit 28e16c6
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 24 deletions.
diff --git a/examples/automod/package-lock.json b/examples/automod/package-lock.json
diff --git a/examples/automod/yarn.lock b/examples/automod/yarn.lock
diff --git a/kite-docs/package-lock.json b/kite-docs/package-lock.json
diff --git a/kite-service/cmd/config/login.go b/kite-service/cmd/config/login.go
@@ -22,7 +22,7 @@ func loginCMD() *cli.Command {
 			&cli.StringFlag{
 				Name:  "server",
 				Usage: "The Kite server to deploy to",
-				Value: "http://localhost:3000",
+				Value: "http://localhost:8080",
 			},
 		},
 		Action: func(c *cli.Context) error {
@@ -45,7 +45,7 @@ func loginCMD() *cli.Command {
 
 func runLogin(serverURL *url.URL, cfg *config.GlobalConfig) error {
 	authStartURL := *serverURL
-	authStartURL.Path = path.Join(authStartURL.Path, "/api/v1/auth/cli/start")
+	authStartURL.Path = path.Join(authStartURL.Path, "/v1/auth/cli/start")
 	resp, err := http.Post(authStartURL.String(), "application/json", nil)
 	if err != nil {
 		return fmt.Errorf("Failed to start auth: %v", err)
@@ -68,7 +68,7 @@ func runLogin(serverURL *url.URL, cfg *config.GlobalConfig) error {
 	loginCode := loginResp.Data.Code
 
 	authRedirectURL := *serverURL
-	authRedirectURL.Path = path.Join(authRedirectURL.Path, "/api/v1/auth/cli/redirect")
+	authRedirectURL.Path = path.Join(authRedirectURL.Path, "/v1/auth/cli/redirect")
 	authRedirectURL.RawQuery = url.Values{
 		"code": {loginCode},
 	}.Encode()
@@ -77,7 +77,7 @@ func runLogin(serverURL *url.URL, cfg *config.GlobalConfig) error {
 	fmt.Println("\n\nWaiting for you to complete the login ...")
 
 	authCheckURL := *serverURL
-	authCheckURL.Path = path.Join(authCheckURL.Path, "/api/v1/auth/cli/check")
+	authCheckURL.Path = path.Join(authCheckURL.Path, "/v1/auth/cli/check")
 	authCheckURL.RawQuery = url.Values{
 		"code": {loginCode},
 	}.Encode()

diff --git a/kite-service/cmd/plugin/deploy.go b/kite-service/cmd/plugin/deploy.go
@@ -34,7 +34,7 @@ func deployCMD() *cli.Command {
 			&cli.StringFlag{
 				Name:  "server",
 				Usage: "The Kite server to deploy to",
-				Value: "http://localhost:3000",
+				Value: "http://localhost:8080",
 			},
 		},
 		Action: func(c *cli.Context) error {
@@ -81,7 +81,7 @@ func runDeploy(
 		return fmt.Errorf("No session for server %s, login first!", serverURL.String())
 	}
 
-	serverURL.Path = path.Join(serverURL.Path, "api/v1/guilds", guildID, "deployments")
+	serverURL.Path = path.Join(serverURL.Path, "v1/guilds", guildID, "deployments")
 
 	wasmPath := filepath.Join(basePath, cfg.Module.Build.Out)
 	wasm, err := os.ReadFile(wasmPath)