From 010af117924f8fd3a2a7e49f95fb682c3e8270f3 Mon Sep 17 00:00:00 2001
From: Derek Nola <derek.nola@suse.com>
Date: Thu, 5 Oct 2023 09:58:31 -0700
Subject: [PATCH] Remove action request field

Signed-off-by: Derek Nola <derek.nola@suse.com>
---
 pkg/cli/token/token.go |  3 +--
 pkg/server/token.go    | 17 +++++------------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/pkg/cli/token/token.go b/pkg/cli/token/token.go
index 56b8cd8921b5..cdb1a56a8754 100644
--- a/pkg/cli/token/token.go
+++ b/pkg/cli/token/token.go
@@ -154,8 +154,7 @@ func Rotate(app *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	b, err := json.Marshal(server.ServerTokenRequest{
-		Action:   pointer.String("rotate"),
+	b, err := json.Marshal(server.TokenRotateRequest{
 		NewToken: pointer.String(cmds.TokenConfig.NewToken),
 	})
 	if err != nil {
diff --git a/pkg/server/token.go b/pkg/server/token.go
index 27b82d1025de..d107bbd0ed7c 100644
--- a/pkg/server/token.go
+++ b/pkg/server/token.go
@@ -16,17 +16,16 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-type ServerTokenRequest struct {
-	Action   *string `json:"stage,omitempty"`
+type TokenRotateRequest struct {
 	NewToken *string `json:"newToken,omitempty"`
 }
 
-func getServerTokenRequest(req *http.Request) (ServerTokenRequest, error) {
+func getServerTokenRequest(req *http.Request) (TokenRotateRequest, error) {
 	b, err := io.ReadAll(req.Body)
 	if err != nil {
-		return ServerTokenRequest{}, err
+		return TokenRotateRequest{}, err
 	}
-	result := ServerTokenRequest{}
+	result := TokenRotateRequest{}
 	err = json.Unmarshal(b, &result)
 	return result, err
 }
@@ -45,13 +44,7 @@ func tokenRequestHandler(ctx context.Context, server *config.Control) http.Handl
 			resp.Write([]byte(err.Error()))
 			return
 		}
-		if *sTokenReq.Action == "rotate" {
-			err = tokenRotate(ctx, server, *sTokenReq.NewToken)
-		} else {
-			err = fmt.Errorf("unknown action %s requested", *sTokenReq.Action)
-		}
-
-		if err != nil {
+		if err = tokenRotate(ctx, server, *sTokenReq.NewToken); err != nil {
 			genErrorMessage(resp, http.StatusInternalServerError, err, "token")
 			return
 		}