Skip to content

Fix one drive upload bug #677

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix one drive upload bug #677

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions src/duplicacy_oneclient.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,15 @@ func NewOneDriveClient(tokenFile string, isBusiness bool, client_id string, clie
return client, nil
}

func (client *OneDriveClient) call_noauth(url string, method string, input interface{}, contentType string) (io.ReadCloser, int64, error) {
return client.call_ext(url, method, input, contentType, false)
}

func (client *OneDriveClient) call(url string, method string, input interface{}, contentType string) (io.ReadCloser, int64, error) {
return client.call_ext(url, method, input, contentType, true)
}

func (client *OneDriveClient) call_ext(url string, method string, input interface{}, contentType string, addAuth bool) (io.ReadCloser, int64, error) {

var response *http.Response

Expand Down Expand Up @@ -141,7 +149,7 @@ func (client *OneDriveClient) call(url string, method string, input interface{},
request.Header.Set("Content-Range", fmt.Sprintf("bytes 0-%d/%d", reader.Length() - 1, reader.Length()))
}

if url != client.RefreshTokenURL {
if addAuth {
client.TokenLock.Lock()
request.Header.Set("Authorization", "Bearer "+client.Token.AccessToken)
client.TokenLock.Unlock()
Expand Down Expand Up @@ -239,7 +247,7 @@ func (client *OneDriveClient) RefreshToken(force bool) (err error) {
}

if (client.OAConfig == nil) {
readCloser, _, err := client.call(client.RefreshTokenURL, "POST", client.Token, "")
readCloser, _, err := client.call_noauth(client.RefreshTokenURL, "POST", client.Token, "")
if err != nil {
return fmt.Errorf("failed to refresh the access token: %v", err)
}
Expand Down Expand Up @@ -417,7 +425,7 @@ func (client *OneDriveClient) CreateUploadSession(path string) (uploadURL string

func (client *OneDriveClient) UploadFileSession(uploadURL string, content []byte, rateLimit int) (err error) {

readCloser, _, err := client.call(uploadURL, "PUT", CreateRateLimitedReader(content, rateLimit), "")
readCloser, _, err := client.call_noauth(uploadURL, "PUT", CreateRateLimitedReader(content, rateLimit), "")
if err != nil {
return err
}
Expand Down