chore(clients): improve clients nomenclature

marcelovicentegc · Nov 6, 2021 · 139adb0 · 139adb0
1 parent a6d650e
commit 139adb0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/clients/clients.go b/clients/clients.go
@@ -16,11 +16,11 @@ import (
 	"google.golang.org/api/option"
 )
 
-func getClient(ctx context.Context, oauthConfig *oauth2.Config) *http.Client {
+func getDriveClient(ctx context.Context, oauthConfig *oauth2.Config) *http.Client {
 	authURL := oauthConfig.AuthCodeURL("state-token", oauth2.AccessTypeOffline)
 	utils.OpenBrowser(authURL)
 
-	authCode := runLocalOAuthServer()
+	authCode := runLocalOAuthServer(config.GoogleDriveOAuthCallback)
 
 	token, err := oauthConfig.Exchange(context.TODO(), authCode)
 	if err != nil {
@@ -52,7 +52,7 @@ func UploadFileToDrive() {
 	if err != nil {
 		log.Fatalf("Unable to parse client secret file to config: %v", err)
 	}
-	client := getClient(ctx, configFromJson)
+	client := getDriveClient(ctx, configFromJson)
 
 	service, err := drive.NewService(ctx, option.WithHTTPClient(client))
 	if err != nil {

diff --git a/clients/oauth2.go b/clients/oauth2.go
@@ -7,16 +7,15 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/marcelovicentegc/kontrolio-cli/config"
 	"github.com/marcelovicentegc/kontrolio-cli/messages"
 )
 
-func runLocalOAuthServer() string {
+func runLocalOAuthServer(oauthEndpoint string) string {
 	mux := http.NewServeMux()
 	server := http.Server{Addr: ":8080", Handler: mux}
 	authCodeChannel := make(chan string)
 
-	mux.HandleFunc(config.GoogleDriveOAuthCallback, func(writer http.ResponseWriter, request *http.Request) {
+	mux.HandleFunc(oauthEndpoint, func(writer http.ResponseWriter, request *http.Request) {
 		err := request.ParseForm()
 		if err != nil {
 			fmt.Fprintf(os.Stdout, "could not parse query: %v", err)