mudhorn/oh-my-posh
1
0
Fork 0
mirror of https://github.com/JanDeDobbeleer/oh-my-posh.git synced 2025-01-03 07:17:26 -08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix(http): correct logic for authentication header

Browse source
This commit is contained in:
Jan De Dobbeleer 2022-08-18 08:50:56 +02:00 committed by GitHub
parent 53e5fad486
commit 04f7528f55
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/http/oauth.go
View file

@ -86,25 +86,26 @@ func (o *OAuthRequest) refreshToken(refreshToken string) (string, error) {
} }
func OauthResult[a any](o *OAuthRequest, url string, body io.Reader, requestModifiers ...environment.HTTPRequestModifier) (a, error) { func OauthResult[a any](o *OAuthRequest, url string, body io.Reader, requestModifiers ...environment.HTTPRequestModifier) (a, error) {
addToken := func() error { if data, err := getCacheValue[a](&o.Request, url); err == nil {
accessToken, err := o.getAccessToken() return data, nil
if err != nil {
return err
}
// add token to header for authentication
addAuthHeader := func(request *http.Request) {
request.Header.Add("Authorization", "Bearer "+accessToken)
}
if requestModifiers == nil {
requestModifiers = []environment.HTTPRequestModifier{}
}
requestModifiers = append(requestModifiers, addAuthHeader)
return nil
} }
return do[a](&o.Request, url, body, addToken, requestModifiers...) accessToken, err := o.getAccessToken()
if err != nil {
var data a
return data, err
}
// add token to header for authentication
addAuthHeader := func(request *http.Request) {
request.Header.Add("Authorization", "Bearer "+accessToken)
}
if requestModifiers == nil {
requestModifiers = []environment.HTTPRequestModifier{}
}
requestModifiers = append(requestModifiers, addAuthHeader)
return do[a](&o.Request, url, body, requestModifiers...)
} }

48
src/http/request.go
View file

@ -19,41 +19,34 @@ func (r *Request) Init(env environment.Environment, props properties.Properties)
} }
func Do[a any](r *Request, url string, requestModifiers ...environment.HTTPRequestModifier) (a, error) { func Do[a any](r *Request, url string, requestModifiers ...environment.HTTPRequestModifier) (a, error) {
return do[a](r, url, nil, nil, requestModifiers...) if data, err := getCacheValue[a](r, url); err == nil {
return data, nil
}
return do[a](r, url, nil, requestModifiers...)
} }
func do[a any](r *Request, url string, body io.Reader, preRequestFunc func() error, requestModifiers ...environment.HTTPRequestModifier) (a, error) { func getCacheValue[a any](r *Request, key string) (a, error) {
var data a var data a
getCacheValue := func(key string) (a, error) {
if val, found := r.env.Cache().Get(key); found {
err := json.Unmarshal([]byte(val), &data)
if err != nil {
r.env.Log(environment.Error, "OAuth", err.Error())
return data, err
}
return data, nil
}
err := errors.New("no data in cache")
r.env.Log(environment.Error, "OAuth", err.Error())
return data, err
}
httpTimeout := r.props.GetInt(properties.HTTPTimeout, properties.DefaultHTTPTimeout)
// No need to check more than every 30 minutes by default
cacheTimeout := r.props.GetInt(properties.CacheTimeout, 30) cacheTimeout := r.props.GetInt(properties.CacheTimeout, 30)
if cacheTimeout > 0 { if cacheTimeout <= 0 {
if data, err := getCacheValue(url); err == nil { return data, errors.New("no cache needed")
return data, nil
}
} }
if val, found := r.env.Cache().Get(key); found {
if preRequestFunc != nil { err := json.Unmarshal([]byte(val), &data)
if err := preRequestFunc(); err != nil { if err != nil {
r.env.Log(environment.Error, "OAuth", err.Error())
return data, err return data, err
} }
return data, nil
} }
err := errors.New("no data in cache")
r.env.Log(environment.Error, "OAuth", err.Error())
return data, err
}
func do[a any](r *Request, url string, body io.Reader, requestModifiers ...environment.HTTPRequestModifier) (a, error) {
var data a
httpTimeout := r.props.GetInt(properties.HTTPTimeout, properties.DefaultHTTPTimeout)
responseBody, err := r.env.HTTPRequest(url, body, httpTimeout, requestModifiers...) responseBody, err := r.env.HTTPRequest(url, body, httpTimeout, requestModifiers...)
if err != nil { if err != nil {
@ -67,6 +60,7 @@ func do[a any](r *Request, url string, body io.Reader, preRequestFunc func() err
return data, err return data, err
} }
cacheTimeout := r.props.GetInt(properties.CacheTimeout, 30)
if cacheTimeout > 0 { if cacheTimeout > 0 {
r.env.Cache().Set(url, string(responseBody), cacheTimeout) r.env.Cache().Set(url, string(responseBody), cacheTimeout)
} }