feat(setup): infer nonce from client rather than taking it as a param…

…eter
ctfer-io · Apr 10, 2024 · 9eb5b5a · 9eb5b5a
1 parent 367ebb4
commit 9eb5b5a
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 7 deletions.
diff --git a/api/run_test.go b/api/run_test.go
@@ -62,7 +62,6 @@ func Test_F_CTF(t *testing.T) {
 		ThemeColor:             "",
 		Start:                  "",
 		End:                    "",
-		Nonce:                  nonce,
 	})
 	if !assert.Nil(err, "got error: %s", err) {
 		return

diff --git a/api/setup.go b/api/setup.go
@@ -26,7 +26,6 @@ type SetupParams struct {
 	ThemeColor             string
 	Start                  string
 	End                    string
-	Nonce                  string // XXX this should not be part of the API, but is required
 }
 
 // WARNING: this endpoint is not officially supported.
@@ -51,7 +50,7 @@ func (client *Client) Setup(params *SetupParams, opts ...Option) error {
 		"start":                   params.Start,
 		"end":                     params.End,
 		"_submit":                 "Finish",
-		"nonce":                   params.Nonce,
+		"nonce":                   client.nonce,
 	}
 	if params.TeamSize != nil {
 		mp["team_size"] = strconv.Itoa(*params.TeamSize)

diff --git a/api/setup_test.go b/api/setup_test.go
@@ -60,7 +60,6 @@ func Test_F_Setup(t *testing.T) {
 		ThemeColor:             "",
 		Start:                  "",
 		End:                    "",
-		Nonce:                  nonce,
 	})
 	if !assert.Nil(err, "got error: %s", err) {
 		return
@@ -263,7 +262,6 @@ func Test_F_AdvancedSetup(t *testing.T) {
 		ThemeColor:             "",
 		Start:                  "",
 		End:                    "",
-		Nonce:                  nonce,
 	})
 	if !assert.Nil(err, "got error: %s", err) {
 		return
@@ -367,7 +365,6 @@ func Test_F_UsersAndTeams(t *testing.T) {
 		ThemeColor:             "",
 		Start:                  "",
 		End:                    "",
-		Nonce:                  nonce,
 	})
 	if !assert.Nil(err, "got error: %s", err) {
 		return

diff --git a/examples/setup/main.go b/examples/setup/main.go
@@ -40,7 +40,6 @@ func main() {
 		ThemeColor:             "",
 		Start:                  "",
 		End:                    "",
-		Nonce:                  nonce,
 	}); err != nil {
 		log.Fatalf("Setting up CTFd: %s", err)
 	}