From 88cb2b3314a9be5b70dbe74efb24c1e0d07c7f7d Mon Sep 17 00:00:00 2001 From: andig Date: Sun, 14 Aug 2022 10:25:24 +0200 Subject: [PATCH] chore: rename ProviderLogin api to AuthProvider --- api/api.go | 4 ++-- cmd/config.go | 4 ++-- vehicle/mercedes.go | 8 ++++---- vehicle/mercedes/identity.go | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/api/api.go b/api/api.go index 0b47130ca..41195f949 100644 --- a/api/api.go +++ b/api/api.go @@ -189,8 +189,8 @@ type Tariff interface { CurrentPrice() (float64, error) // EUR/kWh, CHF/kWh, ... } -// ProviderLogin is the ability to provide OAuth authentication through the ui -type ProviderLogin interface { +// AuthProvider is the ability to provide OAuth authentication through the ui +type AuthProvider interface { SetCallbackParams(baseURL, redirectURL string, authenticated chan<- bool) LoginHandler() http.HandlerFunc LogoutHandler() http.HandlerFunc diff --git a/cmd/config.go b/cmd/config.go index 6ec86aa0e..ed913dd3e 100644 --- a/cmd/config.go +++ b/cmd/config.go @@ -239,7 +239,7 @@ func (cp *ConfigProvider) configureVehicles(conf config) error { return nil } -// webControl handles routing for devices. For now only api.ProviderLogin related routes +// webControl handles routing for devices. For now only api.AuthProvider related routes func (cp *ConfigProvider) webControl(conf networkConfig, router *mux.Router, paramC chan<- util.Param) { auth := router.PathPrefix("/oauth").Subrouter() auth.Use(handlers.CompressHandler) @@ -258,7 +258,7 @@ func (cp *ConfigProvider) webControl(conf networkConfig, router *mux.Router, par var id int for _, v := range cp.vehicles { - if provider, ok := v.(api.ProviderLogin); ok { + if provider, ok := v.(api.AuthProvider); ok { id += 1 basePath := fmt.Sprintf("vehicles/%d", id) diff --git a/vehicle/mercedes.go b/vehicle/mercedes.go index 4c276783d..a6aefe3e9 100644 --- a/vehicle/mercedes.go +++ b/vehicle/mercedes.go @@ -13,7 +13,7 @@ import ( // Mercedes is an api.Vehicle implementation for Mercedes cars type Mercedes struct { *embed - api.ProviderLogin + api.AuthProvider *mercedes.Provider } @@ -64,9 +64,9 @@ func NewMercedesFromConfig(other map[string]interface{}) (api.Vehicle, error) { api := mercedes.NewAPI(log, identity, cc.Sandbox) v := &Mercedes{ - embed: &cc.embed, - Provider: mercedes.NewProvider(api, strings.ToUpper(cc.VIN), cc.Cache), - ProviderLogin: identity, // expose the OAuth2 login + embed: &cc.embed, + Provider: mercedes.NewProvider(api, strings.ToUpper(cc.VIN), cc.Cache), + AuthProvider: identity, // expose the OAuth2 login } return v, nil diff --git a/vehicle/mercedes/identity.go b/vehicle/mercedes/identity.go index dfa425996..3ee1cca72 100644 --- a/vehicle/mercedes/identity.go +++ b/vehicle/mercedes/identity.go @@ -76,7 +76,7 @@ func (v *Identity) invalidToken() { } } -var _ api.ProviderLogin = (*Identity)(nil) +var _ api.AuthProvider = (*Identity)(nil) func (v *Identity) SetCallbackParams(baseURL, redirectURL string, authC chan<- bool) { v.baseURL = baseURL