@@ -32,11 +32,9 @@ func (d *Degoo) Init(ctx context.Context) error {
3232
3333 d .client = base .HttpClient
3434
35- if d .Token == "" {
36- err := d .login (ctx )
37- if err != nil {
38- return err
39- }
35+ // Ensure we have a valid token (will login if needed or refresh if expired)
36+ if err := d .ensureValidToken (ctx ); err != nil {
37+ return fmt .Errorf ("failed to initialize token: %w" , err )
4038 }
4139
4240 return d .getDevices (ctx )
@@ -87,7 +85,7 @@ func (d *Degoo) MakeDir(ctx context.Context, parentDir model.Obj, dirName string
8785 const query = `mutation SetUploadFile3($Token: String!, $FileInfos: [FileInfoUpload3]!) { setUploadFile3(Token: $Token, FileInfos: $FileInfos) }`
8886
8987 variables := map [string ]interface {}{
90- "Token" : d .Token ,
88+ "Token" : d .AccessToken ,
9189 "FileInfos" : []map [string ]interface {}{
9290 {
9391 "Checksum" : folderChecksum ,
@@ -111,7 +109,7 @@ func (d *Degoo) Move(ctx context.Context, srcObj, dstDir model.Obj) (model.Obj,
111109 const query = `mutation SetMoveFile($Token: String!, $Copy: Boolean, $NewParentID: String!, $FileIDs: [String]!) { setMoveFile(Token: $Token, Copy: $Copy, NewParentID: $NewParentID, FileIDs: $FileIDs) }`
112110
113111 variables := map [string ]interface {}{
114- "Token" : d .Token ,
112+ "Token" : d .AccessToken ,
115113 "Copy" : false ,
116114 "NewParentID" : dstDir .GetID (),
117115 "FileIDs" : []string {srcObj .GetID ()},
@@ -129,7 +127,7 @@ func (d *Degoo) Rename(ctx context.Context, srcObj model.Obj, newName string) er
129127 const query = `mutation SetRenameFile($Token: String!, $FileRenames: [FileRenameInfo]!) { setRenameFile(Token: $Token, FileRenames: $FileRenames) }`
130128
131129 variables := map [string ]interface {}{
132- "Token" : d .Token ,
130+ "Token" : d .AccessToken ,
133131 "FileRenames" : []DegooFileRenameInfo {
134132 {
135133 ID : srcObj .GetID (),
@@ -155,7 +153,7 @@ func (d *Degoo) Remove(ctx context.Context, obj model.Obj) error {
155153 const query = `mutation SetDeleteFile5($Token: String!, $IsInRecycleBin: Boolean!, $IDs: [IDType]!) { setDeleteFile5(Token: $Token, IsInRecycleBin: $IsInRecycleBin, IDs: $IDs) }`
156154
157155 variables := map [string ]interface {}{
158- "Token" : d .Token ,
156+ "Token" : d .AccessToken ,
159157 "IsInRecycleBin" : false ,
160158 "IDs" : []map [string ]string {{"FileID" : obj .GetID ()}},
161159 }
0 commit comments