Skip to content

Fix for changes to b2_authorize_account and b2_list_buckets. #8

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
clgillis wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix for changes to b2_authorize_account and b2_list_buckets. #8

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8f0cf1c
b2_authorize_user use AppKeyID and LoginInfo.AccountID for everthing …
clgillis Sep 12, 2018
2ee0ce2
Merge pull request #1 from clgillis/b2listpatch
clgillis Sep 12, 2018
63c2857
fix reference to loginInfo.AccountID
clgillis Sep 12, 2018
2056054
fixed b2 issue
clgillis Sep 13, 2018
1ae8d9b
Merge pull request #2 from clgillis/b2listpatch
clgillis Sep 13, 2018
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
13 changes: 7 additions & 6 deletions b2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ func (c *Client) doRequest(endpoint string, params map[string]interface{}) (*htt
return nil, err
}
// Reduce debug log noise
delete(params, "accountID")
// delete(params, "accountID")
delete(params, "bucketID")

apiURL := c.loginInfo.Load().(*LoginInfo).ApiURL
Expand Down Expand Up @@ -298,7 +298,7 @@ func (c *Client) BucketByID(id string) *Bucket {
// found and createIfNotExists is true, CreateBucket is called with allPublic set
// to false. Otherwise, an error is returned.
func (c *Client) BucketByName(name string, createIfNotExists bool) (*BucketInfo, error) {
bs, err := c.Buckets()
bs, err := c.Buckets(name)
if err != nil {
return nil, err
}
Expand All @@ -314,9 +314,10 @@ func (c *Client) BucketByName(name string, createIfNotExists bool) (*BucketInfo,
}

// Buckets returns a list of buckets sorted by name.
func (c *Client) Buckets() ([]*BucketInfo, error) {
func (c *Client) Buckets(name string) ([]*BucketInfo, error) {
res, err := c.doRequest("b2_list_buckets", map[string]interface{}{
"accountId": c.accountID,
"accountId": c.loginInfo.Load().(*LoginInfo).AccountID,
"bucketName": name,
})
if err != nil {
return nil, err
Expand Down Expand Up @@ -352,7 +353,7 @@ func (c *Client) CreateBucket(name string, allPublic bool) (*BucketInfo, error)
bucketType = "allPublic"
}
res, err := c.doRequest("b2_create_bucket", map[string]interface{}{
"accountId": c.accountID,
"accountId": c.loginInfo.Load().(*LoginInfo).AccountID,
"bucketName": name,
"bucketType": bucketType,
})
Expand All @@ -379,7 +380,7 @@ func (c *Client) CreateBucket(name string, allPublic bool) (*BucketInfo, error)
// becomes invalid and any other calls will fail.
func (b *Bucket) Delete() error {
res, err := b.c.doRequest("b2_delete_bucket", map[string]interface{}{
"accountId": b.c.accountID,
"accountId": b.c.loginInfo.Load().(*LoginInfo).AccountID,
"bucketId": b.ID,
})
if err != nil {
Expand Down