lunny/git-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

push the error wrapping down to the lower level credential functions

Browse Source
This commit is contained in:
risk danger olson 2015-09-01 12:49:00 -06:00
parent 5deede16d4
commit 71813f6de1
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lfs/client.go
View File

@ -396,7 +396,7 @@ func doApiBatchRequest(req *http.Request) (*http.Response, []*objectResource, er
func doStorageRequest(req *http.Request) (*http.Response, error) { func doStorageRequest(req *http.Request) (*http.Response, error) {
creds, err := getCreds(req) creds, err := getCreds(req)
if err != nil { if err != nil {
return nil, Error(err) return nil, err
} }
return doHttpRequest(req, creds) return doHttpRequest(req, creds)
@ -450,7 +450,7 @@ func doApiRequestWithRedirects(req *http.Request, via []*http.Request, useCreds
if useCreds { if useCreds {
c, err := getCredsForAPI(req) c, err := getCredsForAPI(req)
if err != nil { if err != nil {
return nil, Error(err) return nil, err
} }
creds = c creds = c
} }

19
lfs/credentials.go
View File

@ -19,7 +19,7 @@ func getCreds(req *http.Request) (Creds, error) {
creds, err := fillCredentials(req.URL) creds, err := fillCredentials(req.URL)
if err != nil { if err != nil {
return nil, err return nil, Error(err)
} }
setRequestAuth(req, creds["username"], creds["password"]) setRequestAuth(req, creds["username"], creds["password"])
@ -42,16 +42,23 @@ func getCredsForAPI(req *http.Request) (Creds, error) {
} }
credsUrl, err := getCredURLForAPI(req) credsUrl, err := getCredURLForAPI(req)
if err != nil || credsUrl == nil { if err != nil {
return nil, err return nil, Error(err)
}
if credsUrl == nil {
return nil, nil
} }
creds, err := fillCredentials(credsUrl) creds, err := fillCredentials(credsUrl)
if err != nil || creds == nil { if err != nil {
return nil, err return nil, Error(err)
}
if creds != nil {
setRequestAuth(req, creds["username"], creds["password"])
} }
setRequestAuth(req, creds["username"], creds["password"])
return creds, nil return creds, nil
} }