adhoc: commit todo changes related to google drive

pkg/filesystem/driver/googledrive/client.go

@@ -5,6 +5,7 @@ import (
 	model "github.com/cloudreve/Cloudreve/v3/models"
 	"github.com/cloudreve/Cloudreve/v3/pkg/cluster"
 	"github.com/cloudreve/Cloudreve/v3/pkg/request"
+	"google.golang.org/api/drive/v3"
 )
 
 // Client Google Drive client
@@ -39,7 +40,7 @@ const (
 var (
 	// Defualt required scopes
 	RequiredScope = []string{
-		"https://www.googleapis.com/auth/drive",
+		drive.DriveScope,
 		"openid",
 		"profile",
 		"https://www.googleapis.com/auth/userinfo.profile",

pkg/filesystem/driver/googledrive/handler.go

@@ -17,10 +17,6 @@ type Driver struct {
 	HTTPClient request.Client
 }
 
-// http://localhost:3000/api/v3/callback/googledrive/auth?code=4/0AVHEtk4AaNbo5YoCrMSGgoJfZfe6SgEOVmA7XtalZl8BMtdsAIRWqxt6jO4NKJCxGVxyQA&scope=profile%20openid%20https://www.googleapis.com/auth/userinfo.profile%20https://www.googleapis.com/auth/drive&authuser=0&prompt=consent
-// https://accounts.google.com/o/oauth2/v2/auth?client_id=89866991293-5uja7qsbl8btuak3hb41h3o8u9jhlckg.apps.googleusercontent.com&response_type=code&redirect_uri=http://localhost:3000/api/v3/callback/googledrive/auth&scope=openid+profile+https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fdrive&access_type=offline&prompt=consent
-//https://accounts.google.com/o/oauth2/auth?client_id=202264815644.apps.googleusercontent.com&response_type=code&redirect_uri=http%3A%2F%2F127.0.0.1%3A53682%2F&scope=openid+profile+https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fdrive+https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fphotoslibrary&access_type=offline&prompt=consent&state=MjAyMjY0ODE1NjQ0LmFwcHMuZ29vZ2xldXNlcmNvbnRlbnQuY29tOjpYNFozY2E4eGZXRGIxVm9vLUY5YTdaeEo6Omh0dHA6Ly8xMjcuMC4wLjE6NTM2ODIv
-
 // NewDriver 从存储策略初始化新的Driver实例
 func NewDriver(policy *model.Policy) (driver.Handler, error) {
 	return &Driver{

pkg/filesystem/driver/googledrive/oauth.go

@@ -14,26 +14,6 @@ import (
 	"time"
 )
 
-// Credential 获取token时返回的凭证
-type Credential struct {
-	ExpiresIn    int64  `json:"expires_in"`
-	Scope        string `json:"scope"`
-	AccessToken  string `json:"access_token"`
-	RefreshToken string `json:"refresh_token"`
-	UserID       string `json:"user_id"`
-}
-
-// OAuthError OAuth相关接口的错误响应
-type OAuthError struct {
-	ErrorType        string `json:"error"`
-	ErrorDescription string `json:"error_description"`
-}
-
-// Error 实现error接口
-func (err OAuthError) Error() string {
-	return err.ErrorDescription
-}
-
 // OAuthURL 获取OAuth认证页面URL
 func (client *Client) OAuthURL(ctx context.Context, scope []string) string {
 	query := url.Values{

pkg/filesystem/driver/googledrive/types.go

@@ -0,0 +1,43 @@
+package googledrive
+
+import "encoding/gob"
+
+// RespError 接口返回错误
+type RespError struct {
+	APIError APIError `json:"error"`
+}
+
+// APIError 接口返回的错误内容
+type APIError struct {
+	Code    string `json:"code"`
+	Message string `json:"message"`
+}
+
+// Error 实现error接口
+func (err RespError) Error() string {
+	return err.APIError.Message
+}
+
+// Credential 获取token时返回的凭证
+type Credential struct {
+	ExpiresIn    int64  `json:"expires_in"`
+	Scope        string `json:"scope"`
+	AccessToken  string `json:"access_token"`
+	RefreshToken string `json:"refresh_token"`
+	UserID       string `json:"user_id"`
+}
+
+// OAuthError OAuth相关接口的错误响应
+type OAuthError struct {
+	ErrorType        string `json:"error"`
+	ErrorDescription string `json:"error_description"`
+}
+
+// Error 实现error接口
+func (err OAuthError) Error() string {
+	return err.ErrorDescription
+}
+
+func init() {
+	gob.Register(Credential{})
+}