src/auth/auth.go

@@ -3,7 +3,6 @@ package auth
 import (
 	"encoding/json"
 	"fmt"
-	"io"
 	"log"
 	"net/http"
 	"os"
@@ -57,42 +56,30 @@ func GetClient(ctx *gctx.Context) (*spotify.Client, error) {
 		),
 	)
 	if _, err := os.Stat(filepath.Join(configDir, "gospt/auth.json")); err == nil {
-		authFile, err := os.Open(filepath.Join(configDir, "gospt/auth.json"))
+		authFilePath := filepath.Join(configDir, "gospt/auth.json")
+		authFile, err := os.Open(authFilePath)
 		if err != nil {
 			return nil, err
 		}
 		defer authFile.Close()
-		authValue, err := io.ReadAll(authFile)
+		tok := &oauth2.Token{}
+		err = json.NewDecoder(authFile).Decode(tok)
 		if err != nil {
 			return nil, err
 		}
-		var tok *oauth2.Token
-		err = json.Unmarshal(authValue, &tok)
-		if err != nil {
-			return nil, err
-		}
-		client := spotify.New(auth.Client(ctx, tok))
+		authClient := auth.Client(ctx, tok)
+		client := spotify.New(authClient)
 		new_token, err := client.Token()
 		if err != nil {
 			return nil, err
 		}
-		if new_token != tok {
-			out, err := json.MarshalIndent(new_token, "", " ")
-			if err != nil {
-				panic(err.Error())
-			}
-			err = os.WriteFile(filepath.Join(configDir, "gospt/auth.json"), out, 0o644)
-			if err != nil {
-				panic("FAILED TO SAVE AUTH")
-			}
-		}
-		out, err := json.MarshalIndent(tok, "", " ")
+		out, err := json.MarshalIndent(new_token, "", " ")
 		if err != nil {
-			panic(err.Error())
+			return nil, err
 		}
-		err = os.WriteFile(filepath.Join(configDir, "gospt/auth.json"), out, 0o644)
+		err = os.WriteFile(authFilePath, out, 0o644)
 		if err != nil {
-			panic("FAILED TO SAVE AUTH")
+			return nil, fmt.Errorf("failed to save auth")
 		}
 		return client, nil
 	}