fix tokens handler

cmd/app/docker.go

@@ -24,12 +24,9 @@ func DockerCMD() *cobra.Command {
 
 func DockerBuildCMD() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "build",
-		Short: "Build your bot docker image",
-		PreRun: func(cmd *cobra.Command, args []string) {
-			tools.CheckDir()
-			tools.SetupTokensInDocker()
-		},
+		Use:     "build",
+		Short:   "Build your bot docker image",
+		PreRun:  func(cmd *cobra.Command, args []string) { tools.CheckDir() },
 		Run:     func(cmd *cobra.Command, args []string) { build_image.DockerBuildImage() },
 		PostRun: func(cmd *cobra.Command, args []string) { tools.RemoveConfig() },
 	}

cmd/app/init.go

@@ -3,7 +3,6 @@ package app
 import (
 	"github.com/abdfnx/botway/internal/options"
 	"github.com/abdfnx/botway/internal/pipes/initx"
-	"github.com/abdfnx/botway/tools"
 	"github.com/spf13/cobra"
 )
 
@@ -19,8 +18,6 @@ func InitCMD() *cobra.Command {
 		Aliases: []string{"."},
 		Run: func(cmd *cobra.Command, args []string) {
 			if opts.Docker {
-				tools.SetupTokensInDocker()
-
 				initx.DockerInit()
 			} else {
 				initx.Init()

internal/pipes/initx/docker.go

@@ -43,18 +43,15 @@ func DockerInit() {
 		bot_token = "TELEGRAM_TOKEN"
 	}
 
-	env := viper.New()
-	env.SetConfigType("env")
-
-	viper.SetDefault("botway.bots."+botwaygo.GetBotInfo("bot.name")+".bot_token", env.GetString(bot_token))
+	viper.SetDefault("botway.bots."+botwaygo.GetBotInfo("bot.name")+".bot_token", os.Getenv(bot_token))
 	viper.SetDefault("botway.bots_names", []string{botwaygo.GetBotInfo("bot.name")})
 
 	if botType != "telegram" {
-		viper.SetDefault("botway.bots."+botwaygo.GetBotInfo("bot.name")+"."+cid, env.GetString(app_token))
+		viper.SetDefault("botway.bots."+botwaygo.GetBotInfo("bot.name")+"."+cid, os.Getenv(app_token))
 	}
 
 	if botType == "slack" {
-		viper.SetDefault("botway.bots."+botwaygo.GetBotInfo("bot.name")+".signing_secret", env.GetString(signing_secret))
+		viper.SetDefault("botway.bots."+botwaygo.GetBotInfo("bot.name")+".signing_secret", os.Getenv(signing_secret))
 	}
 
 	if botType == "discord" {
@@ -68,7 +65,7 @@ func DockerInit() {
 
 				sgi := strings.ToUpper(server) + "_GUILD_ID"
 
-				viper.Set("botway.bots."+botwaygo.GetBotInfo("bot.name")+".guilds."+server+".server_id", env.GetString(sgi))
+				viper.Set("botway.bots."+botwaygo.GetBotInfo("bot.name")+".guilds."+server+".server_id", os.Getenv(sgi))
 			}
 		}
 	}

internal/railway/deploy.go

@@ -7,7 +7,6 @@ import (
 	"time"
 
 	"github.com/abdfnx/botway/constants"
-	"github.com/abdfnx/botway/tools"
 	"github.com/abdfnx/botwaygo"
 	"github.com/botwayorg/railway-api/entity"
 	CLIErrors "github.com/botwayorg/railway-api/errors"
@@ -17,7 +16,6 @@ import (
 
 func (h *Handler) Delpoy(ctx context.Context, req *entity.CommandRequest) error {
 	CheckBuildKit()
-	tools.SetupTokensInDocker()
 
 	isVerbose, err := req.Cmd.Flags().GetBool("verbose")
 	if err != nil {

internal/render/auth.go

@@ -17,6 +17,14 @@ import (
 )
 
 func (m model) Auth() {
+	if _, err := os.Stat(constants.RenderConfigFile); os.IsNotExist(err) {
+		renderConfigFile := os.WriteFile(constants.RenderConfigFile, []byte("{}"), 0644)
+
+		if renderConfigFile != nil {
+			log.Fatal(renderConfigFile)
+		}
+	}
+
 	email := strings.ReplaceAll(m.inputs[1].Value(), "@", "%40")
 
 	url := fmt.Sprintf("https://api.render.com/v1/owners?name=%s&email=%s&limit=20", m.inputs[0].Value(), email)

internal/render/deploy.go

@@ -7,12 +7,9 @@ import (
 	"strings"
 
 	"github.com/abdfnx/botway/constants"
-	"github.com/abdfnx/botway/tools"
 )
 
 func Deploy() {
-	tools.SetupTokensInDocker()
-
 	UpdateTokens(serviceId)
 
 	url := fmt.Sprintf("https://api.render.com/v1/services/%s/deploys", serviceId)

tools/check-dir.go

@@ -3,6 +3,7 @@ package tools
 import (
 	"fmt"
 	"os"
+	"path/filepath"
 
 	"github.com/abdfnx/botway/constants"
 )
@@ -14,3 +15,7 @@ func CheckDir() {
 		panic(constants.FAIL_FOREGROUND.Render("You need to run this command in your bot directory"))
 	}
 }
+
+func RemoveConfig() {
+	os.Remove(filepath.Join("config", "botway-tokens.env"))
+}