adding more conditional statement, adding necessary userID strings

Philip-21 · Philip-21 · commit b846135f22b6 · 2024-05-31T23:48:46.000+01:00
Signed-off-by: Philip-21 &lt;philipuzomaobiora@gmail.com&gt;
diff --git a/cli/tokens.go b/cli/tokens.go
@@ -59,9 +59,11 @@ func (r *RootCmd) createToken() *serpent.Command {
 			r.InitClient(client),
 		),
 		Handler: func(inv *serpent.Invocation) error {
+			userID := codersdk.Me
 			if user != "" {
+				userID = user
 				adminID := codersdk.Me
-				res, err := client.CreateTokenForUser(inv.Context(), adminID, user, codersdk.CreateTokenRequest{
+				res, err := client.CreateTokenForUser(inv.Context(), adminID, userID, codersdk.CreateTokenRequest{
 					Lifetime:  tokenLifetime,
 					TokenName: name,
 				})
@@ -71,7 +73,7 @@ func (r *RootCmd) createToken() *serpent.Command {
 				_, _ = fmt.Fprintln(inv.Stdout, res.Key) // Print the token to stdout
 			} else {
 				// Otherwise, create a token for the current user
-				res, err := client.CreateToken(inv.Context(), codersdk.Me, codersdk.CreateTokenRequest{
+				res, err := client.CreateToken(inv.Context(), userID, codersdk.CreateTokenRequest{
 					Lifetime:  tokenLifetime,
 					TokenName: name,
 				})
diff --git a/codersdk/apikey.go b/codersdk/apikey.go
@@ -88,6 +88,9 @@ func (c *Client) CreateTokenForUser(ctx context.Context, adminID, targetUserID s
 	if !isAdmin {
 		return GenerateAPIKeyResponse{}, fmt.Errorf("user %s is not an admin", adminID)
 	}
+	if adminID == targetUserID {
+		return GenerateAPIKeyResponse{}, fmt.Errorf("admin cannot create a token for themselves")
+	}
 	return c.CreateToken(ctx, targetUserID, req)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,9 @@ func (c *Client) CreateTokenForUser(ctx context.Context, adminID, targetUserID s`
`88`	`88`	`if !isAdmin {`
`89`	`89`	`return GenerateAPIKeyResponse{}, fmt.Errorf("user %s is not an admin", adminID)`
`90`	`90`	`}`
	`91`	`+ if adminID == targetUserID {`
	`92`	`+ return GenerateAPIKeyResponse{}, fmt.Errorf("admin cannot create a token for themselves")`
	`93`	`+ }`
`91`	`94`	`return c.CreateToken(ctx, targetUserID, req)`
`92`	`95`	`}`
`93`	`96`