GDrive: basedir as rootID

Author: DoyunShin

cmd/cmd.go

@@ -2,12 +2,12 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/dutchcoders/transfer.sh/server/storage"
 	"log"
 	"os"
 	"strings"
 
 	"github.com/dutchcoders/transfer.sh/server"
+	"github.com/dutchcoders/transfer.sh/server/storage"
 	"github.com/fatih/color"
 	"github.com/urfave/cli"
 	"google.golang.org/api/googleapi"
@@ -471,11 +471,10 @@ func New() *Cmd {
 			}
 		case "gdrive":
 			chunkSize := c.Int("gdrive-chunk-size") * 1024 * 1024
+			localConfigPath := c.String("gdrive-local-config-path")
 
 			if clientJSONFilepath := c.String("gdrive-client-json-filepath"); clientJSONFilepath == "" {
-				panic("client-json-filepath not set.")
-			} else if localConfigPath := c.String("gdrive-local-config-path"); localConfigPath == "" {
-				panic("local-config-path not set.")
+				panic("gdrive-client-json-filepath not set.")
 			} else if basedir := c.String("basedir"); basedir == "" {
 				panic("basedir not set.")
 			} else if store, err := storage.NewGDriveStorage(clientJSONFilepath, localConfigPath, basedir, chunkSize, logger); err != nil {

server/storage/gdrive.go

@@ -24,14 +24,12 @@ import (
 type GDrive struct {
 	service         *drive.Service
 	rootID          string
-	basedir         string
 	localConfigPath string
 	authType        string
 	chunkSize       int
 	logger          *log.Logger
 }
 
-const gDriveRootConfigFile = "root_id.conf"
 const gDriveTokenJSONFile = "token.json"
 const gDriveDirectoryMimeType = "application/vnd.google-apps.folder"
 
@@ -50,7 +48,7 @@ func NewGDriveStorage(clientJSONFilepath string, localConfigPath string, basedir
 	var AuthType string
 
 	if strings.Contains(string(b), `"type": "service_account"`) {
-		AuthType = "service_account"
+		AuthType = "service"
 
 		logger.Println("GDrive: using Service Account credentials")
 		config, err := google.JWTConfigFromJSON(b, drive.DriveScope, drive.DriveMetadataScope)
@@ -59,7 +57,11 @@ func NewGDriveStorage(clientJSONFilepath string, localConfigPath string, basedir
 		}
 		httpClient = config.Client(ctx)
 	} else {
-		AuthType = "user_account"
+		AuthType = "oauth"
+
+		if localConfigPath == "" {
+			return nil, fmt.Errorf("gdrive-local-config-path not set")
+		}
 
 		logger.Println("GDrive: using OAuth2 credentials")
 		config, err := google.ConfigFromJSON(b, drive.DriveScope, drive.DriveMetadataScope)
@@ -74,45 +76,26 @@ func NewGDriveStorage(clientJSONFilepath string, localConfigPath string, basedir
 		return nil, err
 	}
 
-	storage := &GDrive{service: srv, basedir: basedir, rootID: "", localConfigPath: localConfigPath, authType: AuthType, chunkSize: chunkSize, logger: logger}
-	err = storage.setupRoot()
+	storage := &GDrive{service: srv, rootID: basedir, localConfigPath: localConfigPath, authType: AuthType, chunkSize: chunkSize, logger: logger}
+	err = storage.checkRoot()
 	if err != nil {
 		return nil, err
 	}
 
 	return storage, nil
 }
 
-func (s *GDrive) setupRoot() error {
-	rootFileConfig := filepath.Join(s.localConfigPath, gDriveRootConfigFile)
-
-	rootID, err := ioutil.ReadFile(rootFileConfig)
-	if err != nil && !os.IsNotExist(err) {
-		return err
-	}
-
-	if string(rootID) != "" {
-		s.rootID = string(rootID)
-		return nil
-	}
-
-	dir := &drive.File{
-		Name:     s.basedir,
-		MimeType: gDriveDirectoryMimeType,
-	}
-
-	di, err := s.service.Files.Create(dir).Fields("id").SupportsAllDrives(true).Do()
-	if err != nil {
-		return err
-	}
-
-	s.rootID = di.Id
-	err = ioutil.WriteFile(rootFileConfig, []byte(s.rootID), os.FileMode(0600))
-	if err != nil {
-		return err
+func (s *GDrive) checkRoot() error {
+	if s.rootID == "root" {
+		switch s.authType {
+		case "service":
+			return fmt.Errorf("GDrive: Folder \"root\" is not available when using Service Account credentials")
+		case "oauth":
+			s.logger.Println("GDrive: Warning: Folder \"root\" is not recommended.")
+		}
 	}
-
-	return nil
+	_, err := s.service.Files.Get(s.rootID).SupportsAllDrives(true).Do()
+	return err
 }
 
 func (s *GDrive) hasChecksum(f *drive.File) bool {