From d8a4e96f28fc0f758ea44525f3d364c47ade198b Mon Sep 17 00:00:00 2001
From: Viacheslav <viacheslavgonkivskyi@gmail.com>
Date: Thu, 5 Oct 2023 12:27:57 +0300
Subject: [PATCH] refactoring(rpc): remove authEnvKey (#2810)

<!--
Please read and fill out this form before submitting your PR.

Please make sure you have reviewed our contributors guide before
submitting your
first PR.
-->

## Overview

## Checklist

<!--
Please complete the checklist to ensure that the PR is ready to be
reviewed.

IMPORTANT:
PRs should be left in Draft until the below checklist is completed.
-->

- [ ] New and updated code has appropriate documentation
- [ ] New and updated code has new and/or updated testing
- [ ] Required CI checks are passing
- [ ] Visual proof for any user facing features like CLI or
documentation updates
- [ ] Linked issues closed with keywords
---
 cmd/rpc.go | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/cmd/rpc.go b/cmd/rpc.go
index 7ea0173795..62e9fe7923 100644
--- a/cmd/rpc.go
+++ b/cmd/rpc.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"os"
 
 	"github.com/spf13/cobra"
 	flag "github.com/spf13/pflag"
@@ -17,7 +16,6 @@ import (
 const (
 	// defaultRPCAddress is a default address to dial to
 	defaultRPCAddress = "http://localhost:26658"
-	authEnvKey        = "CELESTIA_NODE_AUTH_TOKEN" //nolint:gosec
 )
 
 var (
@@ -39,7 +37,7 @@ func RPCFlags() *flag.FlagSet {
 		&authTokenFlag,
 		"token",
 		"",
-		"Authorization token (if not provided, the "+authEnvKey+" environment variable will be used)",
+		"Authorization token",
 	)
 
 	storeFlag := NodeFlags().Lookup(nodeStoreFlag)
@@ -48,15 +46,12 @@ func RPCFlags() *flag.FlagSet {
 }
 
 func InitClient(cmd *cobra.Command, _ []string) error {
-	if authTokenFlag == "" {
-		authTokenFlag = os.Getenv(authEnvKey)
-	}
-
 	if authTokenFlag == "" {
 		storePath := ""
-		if cmd.Flag(nodeStoreFlag).Changed {
-			storePath = cmd.Flag(nodeStoreFlag).Value.String()
+		if !cmd.Flag(nodeStoreFlag).Changed {
+			return fmt.Errorf("cant get the access to the auth token: token/node-store flag was not specified")
 		}
+		storePath = cmd.Flag(nodeStoreFlag).Value.String()
 		token, err := getToken(storePath)
 		if err != nil {
 			return fmt.Errorf("cant get the access to the auth token: %v", err)