Stefan/evcc-io
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Porsche: refactor token refresh (#9802)

Browse source
This commit is contained in:
andig 2023-09-09 09:37:32 +02:00 • committed by GitHub
parent 98bacd3c21
commit d688134189
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
vehicle/porsche.go
View file

@ -39,9 +39,7 @@ func NewPorscheFromConfig(other map[string]interface{}) (api.Vehicle, error) {
}
log := util.NewLogger("porsche").Redact(cc.User, cc.Password, cc.VIN)
identity := porsche.NewIdentity(log)
ts, err := identity.Login(porsche.OAuth2Config, cc.User, cc.Password)
ts, err := porsche.NewIdentity(log, cc.User, cc.Password)
if err != nil {
return nil, fmt.Errorf("login failed: %w", err)
}

40
vehicle/porsche/identity.go
View file

@ -8,7 +8,6 @@ import (
"net/http"
"net/http/cookiejar"
"net/url"
"time"
"github.com/PuerkitoBio/goquery"
"github.com/evcc-io/evcc/util"
@ -22,8 +21,6 @@ import (
const (
OAuthURI = "https://identity.porsche.com"
ClientID = "UYsK00My6bCqJdbQhTQ0PbWmcSdIAMig"
maxTokenLifetime = 24 * time.Hour // avoid token refresh for the time being, as refresh currently always fails
)
// https://identity.porsche.com/.well-known/openid-configuration
@ -44,19 +41,24 @@ var (
type Identity struct {
log *util.Logger
*request.Helper
user, password string
}
// NewIdentity creates Porsche identity
func NewIdentity(log *util.Logger) *Identity {
func NewIdentity(log *util.Logger, user, password string) (oauth2.TokenSource, error) {
v := &Identity{
log: log,
Helper: request.NewHelper(log),
log: log,
Helper: request.NewHelper(log),
user: user,
password: password,
}
return v
token, err := v.login()
return oauth.RefreshTokenSource(token, v), err
}
func (v *Identity) Login(oc *oauth2.Config, user, password string) (oauth2.TokenSource, error) {
func (v *Identity) login() (*oauth2.Token, error) {
cv, err := cv.CreateCodeVerifier()
if err != nil {
return nil, err
@ -99,9 +101,9 @@ func (v *Identity) Login(oc *oauth2.Config, user, password string) (oauth2.Token
} {
query.Set(k, v)
}
query.Set("client_id", oc.ClientID)
query.Set("username", user)
query.Set("password", password)
query.Set("client_id", OAuth2Config.ClientID)
query.Set("username", v.user)
query.Set("password", v.password)
uri = fmt.Sprintf("%s/usernamepassword/login", OAuthURI)
resp, err = v.PostForm(uri, query)
@ -152,15 +154,19 @@ func (v *Identity) Login(oc *oauth2.Config, user, password string) (oauth2.Token
ctx, cancel := context.WithTimeout(cctx, request.Timeout)
defer cancel()
token, err := oc.Exchange(ctx, code,
return OAuth2Config.Exchange(ctx, code,
oauth2.SetAuthURLParam("code_verifier", cv.CodeChallengePlain()),
)
}
func (v *Identity) RefreshToken(token *oauth2.Token) (*oauth2.Token, error) {
ctx := context.WithValue(context.Background(), oauth2.HTTPClient, v.Client)
ts := oauth2.ReuseTokenSource(token, OAuth2Config.TokenSource(ctx, token))
token, err := ts.Token()
if err != nil {
return nil, err
token, err = v.login()
}
ts := oauth2.ReuseTokenSourceWithExpiry(token, oc.TokenSource(cctx, token), 15*time.Minute)
go oauth.Refresh(v.log, token, ts, maxTokenLifetime)
return ts, err
return token, err
}