Add support for password protected sessions for codegame-share

Author: juho05

cmd/session_import.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
+	"time"
 
 	"github.com/Bananenpro/cli"
 	"github.com/code-game-project/go-utils/config"
@@ -36,6 +37,25 @@ var sessionImportCmd = &cobra.Command{
 		resp, err := http.Get(fmt.Sprintf(baseURL+"/%s?type=session", id))
 		abortf(fmt.Sprintf("Failed to contact %s: %s", conf.ShareURL, "%s"), err)
 
+		for resp.StatusCode == http.StatusForbidden {
+			password, err := cli.Input("Password:")
+			abort(err)
+			request, err := http.NewRequest("GET", fmt.Sprintf(baseURL+"/%s?type=session", id), nil)
+			abort(err)
+			request.Header.Set("Password", password)
+			resp, err = http.DefaultClient.Do(request)
+			abortf(fmt.Sprintf("Failed to contact %s: %s", conf.ShareURL, "%s"), err)
+			if resp.StatusCode == http.StatusTooManyRequests {
+				time.Sleep(1 * time.Second)
+				resp, err = http.DefaultClient.Do(request)
+				abortf(fmt.Sprintf("Failed to contact %s: %s", conf.ShareURL, "%s"), err)
+			}
+			if resp.StatusCode != http.StatusForbidden {
+				break
+			}
+			cli.Error("Wrong password. Try again.")
+		}
+
 		type resSession struct {
 			GameId       string `json:"game_id"`
 			PlayerId     string `json:"player_id"`

cmd/share_game.go

@@ -111,7 +111,11 @@ var shareGameCmd = &cobra.Command{
 			}
 			var res response
 			err = json.NewDecoder(resp.Body).Decode(&res)
-			cli.Error(res.Error)
+			if err != nil {
+				cli.Error("Failed to decode error message: %s", err)
+			} else {
+				cli.Error(res.Error)
+			}
 			return
 		}
 

cmd/share_session.go

@@ -20,6 +20,9 @@ var shareSessionCmd = &cobra.Command{
 		session, err := selectSession(args)
 		abortf("Failed to load session: %s", err)
 
+		password, err := cli.InputOptional("Password (optional):")
+		abort(err)
+
 		type reqSession struct {
 			GameId       string `json:"game_id"`
 			PlayerId     string `json:"player_id"`
@@ -30,6 +33,7 @@ var shareSessionCmd = &cobra.Command{
 			GameURL  string     `json:"game_url"`
 			Username string     `json:"username"`
 			Session  reqSession `json:"session"`
+			Password string     `json:"password"`
 		}
 
 		data := request{
@@ -40,6 +44,7 @@ var shareSessionCmd = &cobra.Command{
 				PlayerId:     session.PlayerId,
 				PlayerSecret: session.PlayerSecret,
 			},
+			Password: password,
 		}
 
 		jsonData, err := json.Marshal(data)
@@ -60,7 +65,11 @@ var shareSessionCmd = &cobra.Command{
 			}
 			var res response
 			err = json.NewDecoder(resp.Body).Decode(&res)
-			cli.Error(res.Error)
+			if err != nil {
+				cli.Error("Failed to decode error message: %s", err)
+			} else {
+				cli.Error(res.Error)
+			}
 			return
 		}
 

cmd/share_spectate.go

@@ -80,7 +80,11 @@ var shareSpectateCmd = &cobra.Command{
 			}
 			var res response
 			err = json.NewDecoder(resp.Body).Decode(&res)
-			cli.Error(res.Error)
+			if err != nil {
+				cli.Error("Failed to decode error message: %s", err)
+			} else {
+				cli.Error(res.Error)
+			}
 			return
 		}