@@ -207,7 +207,7 @@ import DynamicPriceIcon from "../components/MaterialIcon/DynamicPrice.vue";
import TotalIcon from "../components/MaterialIcon/Total.vue";
import { TYPES, GROUPS, PERIODS, type Session } from "../components/Sessions/types";
import { defineComponent, type PropType } from "vue";
-import { CURRENCY } from "@/types/evcc";
+import { CURRENCY, type Notification } from "@/types/evcc";
export default defineComponent({
name: "Sessions",
diff --git a/i18n/de.json b/i18n/de.json
index 649ea0cf5..e88b79367 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -1,4 +1,22 @@
{
+ "authProviders": {
+ "authCode": "Autorisierungscode",
+ "authCodeHelp": "Kopiere diesen Code und verwende ihn im nächsten Schritt. Gültig für {duration}.",
+ "authorizationRequired": "Autorisierung erforderlich",
+ "buttonConnect": "Mit {provider} verbinden",
+ "buttonDisconnect": "Trennen",
+ "confirmLogout": "Sicher, dass du {title} trennen möchtest?",
+ "connect": "verbinden",
+ "disconnect": "trennen",
+ "loggedOut": "Erfolgreich abgemeldet",
+ "logoutFailed": "Abmeldung fehlgeschlagen",
+ "modalDescriptionLogin": "Schließe die Autorisierung ab, um eine Verbindung mit {provider} herzustellen.",
+ "modalDescriptionLogout": "Dies trennt dein {provider}-Konto und entfernt den Zugriff auf dessen Daten.",
+ "success": "Die Autorisierung mit {title} war erfolgreich.",
+ "successCloseModal": "Du kannst diesen Dialog jetzt schließen.",
+ "successCloseTab": "Du kannst diesen Tab jetzt schließen.",
+ "title": "Autorisierungsstatus"
+ },
"batterySettings": {
"batteryLevel": "Ladestand der Batterie",
"bufferStart": {
@@ -164,6 +182,8 @@
"cancel": "Abbrechen",
"clear": "Löschen",
"close": "Schließen",
+ "copied": "Kopiert!",
+ "copy": "Kopieren",
"customHelp": "Erstelle ein benutzerdefiniertes Gerät mit evcc's Plugin-System.",
"customOption": "Benutzerdefiniertes Gerät",
"delete": "Löschen",
@@ -694,12 +714,6 @@
},
"header": {
"about": "Über",
- "authProviders": {
- "confirmLogout": "Sicher, dass du {title} trennen möchtest?",
- "loggedOut": "Erfolgreich abgemeldet",
- "success": "Die Autorisierung mit {title} war erfolgreich. Du kannst diesen Tab jetzt schließen.",
- "title": "Autorisierungsstatus"
- },
"blog": "Blog",
"docs": "Dokumentation",
"github": "GitHub",
diff --git a/i18n/en.json b/i18n/en.json
index 439174f38..e2721878f 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1,4 +1,22 @@
{
+ "authProviders": {
+ "authCode": "Authentication Code",
+ "authCodeHelp": "Copy this code and use it in the next step. Valid for {duration}.",
+ "authorizationRequired": "Authorization Required",
+ "buttonConnect": "Connect to {provider}",
+ "buttonDisconnect": "Disconnect",
+ "confirmLogout": "Are you sure you want to disconnect {title}?",
+ "connect": "connect",
+ "disconnect": "disconnect",
+ "loggedOut": "Successfully logged out",
+ "logoutFailed": "Failed to logout",
+ "modalDescriptionLogin": "Complete the authorization process to establish connection with {provider}.",
+ "modalDescriptionLogout": "This will disconnect your {provider} account and remove access to its data.",
+ "success": "Authorization with {title} was successful.",
+ "successCloseModal": "You can now close this dialog.",
+ "successCloseTab": "You can now close this tab.",
+ "title": "Authorization Status"
+ },
"batterySettings": {
"batteryLevel": "Battery level",
"bufferStart": {
@@ -164,6 +182,8 @@
"cancel": "Cancel",
"clear": "Clear",
"close": "Close",
+ "copied": "Copied!",
+ "copy": "Copy",
"customHelp": "Create a user-defined device using evcc's plugin system.",
"customOption": "User-defined device",
"delete": "Delete",
@@ -694,12 +714,6 @@
},
"header": {
"about": "About",
- "authProviders": {
- "confirmLogout": "Are you sure you want to disconnect {title}?",
- "loggedOut": "Successfully logged out",
- "success": "Authorization with {title} was successful. You can now close this tab.",
- "title": "Authorization Status"
- },
"blog": "Blog",
"docs": "Documentation",
"github": "GitHub",
diff --git a/plugin/auth/demo.go b/plugin/auth/demo.go
index 454797671..a3764a545 100644
--- a/plugin/auth/demo.go
+++ b/plugin/auth/demo.go
@@ -2,11 +2,13 @@ package auth
import (
"context"
+ "fmt"
"net/url"
"time"
"github.com/evcc-io/evcc/api"
"github.com/evcc-io/evcc/server/providerauth"
+ "github.com/evcc-io/evcc/util"
"golang.org/x/oauth2"
)
@@ -15,22 +17,39 @@ func init() {
}
type demo struct {
- token *oauth2.Token
+ token *oauth2.Token
+ region string
+ method string
}
var demoInstance *demo
-func NewDemoFromConfig(_ context.Context, _ map[string]any) (oauth2.TokenSource, error) {
- return NewDemo()
+func NewDemoFromConfig(_ context.Context, other map[string]any) (oauth2.TokenSource, error) {
+ var cc struct {
+ Region string
+ Method string
+ }
+
+ if err := util.DecodeOther(other, &cc); err != nil {
+ return nil, err
+ }
+
+ return NewDemo(cc.Region, cc.Method)
}
-func NewDemo() (oauth2.TokenSource, error) {
+func NewDemo(region string, method string) (oauth2.TokenSource, error) {
// reuse instance (similar to oauth.go getInstance pattern)
if demoInstance != nil {
+ // update existing instance with new values
+ demoInstance.region = region
+ demoInstance.method = method
return demoInstance, nil
}
- demoInstance = new(demo)
+ demoInstance = &demo{
+ region: region,
+ method: method,
+ }
if _, err := providerauth.Register("demo", demoInstance); err != nil {
return nil, err
@@ -46,14 +65,32 @@ func (o *demo) Token() (*oauth2.Token, error) {
return o.token, nil
}
-func (o *demo) Login(_ string) (string, error) {
- // for demo, immediately authenticate without requiring external flow
+func (o *demo) Login(_ string) (string, *oauth2.DeviceAuthResponse, error) {
+ // Simulate error for ERROR region
+ if o.region == "ERROR" {
+ return "", nil, fmt.Errorf("region not supported")
+ }
+
+ // For demo, immediately authenticate without requiring external flow
o.token = &oauth2.Token{
AccessToken: "demo-token",
Expiry: time.Now().Add(24 * time.Hour),
}
+
// TODO use network settings after https://github.com/evcc-io/evcc/pull/25141
- return "http://localhost:7070/providerauth/callback", nil
+ uri := "http://localhost:7070/providerauth/callback"
+
+ if o.method == "device-code" {
+ // Device code flow: URI comes from DeviceAuthResponse
+ return "", &oauth2.DeviceAuthResponse{
+ UserCode: "12AB345",
+ VerificationURI: uri,
+ Expiry: time.Now().Add(10 * time.Minute),
+ }, nil
+ }
+
+ // Redirect flow: URI in first return value
+ return uri, nil, nil
}
func (o *demo) Logout() error {
diff --git a/plugin/auth/oauth.go b/plugin/auth/oauth.go
index fec95e0a4..6c960bd07 100644
--- a/plugin/auth/oauth.go
+++ b/plugin/auth/oauth.go
@@ -220,7 +220,7 @@ func (o *OAuth) HandleCallback(params url.Values) error {
}
// Login implements api.AuthProvider.
-func (o *OAuth) Login(state string) (string, error) {
+func (o *OAuth) Login(state string) (string, *oauth2.DeviceAuthResponse, error) {
o.mu.Lock()
defer o.mu.Unlock()
@@ -229,7 +229,7 @@ func (o *OAuth) Login(state string) (string, error) {
if o.deviceFlow {
da, err := o.oc.DeviceAuth(o.ctx, oauth2.S256ChallengeOption(o.cv))
if err != nil {
- return "", err
+ return "", nil, err
}
go func() {
@@ -248,14 +248,14 @@ func (o *OAuth) Login(state string) (string, error) {
o.updateToken(token)
}()
- return da.VerificationURIComplete, nil
+ return "", da, nil
}
if o.oc.Endpoint.AuthURL == "" {
- return "", errors.New("missing auth url")
+ return "", nil, errors.New("missing auth url")
}
- return o.oc.AuthCodeURL(state, oauth2.S256ChallengeOption(o.cv)), nil
+ return o.oc.AuthCodeURL(state, oauth2.S256ChallengeOption(o.cv)), nil, nil
}
// Logout implements api.AuthProvider.
diff --git a/server/providerauth/handler.go b/server/providerauth/handler.go
index bf17d6d07..ccd9adff9 100644
--- a/server/providerauth/handler.go
+++ b/server/providerauth/handler.go
@@ -18,7 +18,9 @@ type errorResponse struct {
}
type loginResponse struct {
- LoginUri string `json:"loginUri"`
+ LoginUri string `json:"loginUri"`
+ Code string `json:"code,omitempty"`
+ Expiry *time.Time `json:"expiry,omitempty"`
}
// jsonWrite writes a JSON response
@@ -104,13 +106,27 @@ func (a *Handler) handleLogin(w http.ResponseWriter, r *http.Request) {
delete(a.states, encryptedState)
})
- uri, err := provider.Login(encryptedState)
+ uri, da, err := provider.Login(encryptedState)
if err != nil {
jsonError(w, http.StatusBadRequest, err.Error())
return
}
- jsonWrite(w, loginResponse{LoginUri: uri})
+ res := loginResponse{
+ LoginUri: uri,
+ }
+
+ if da != nil {
+ res.Expiry = &da.Expiry
+ if da.VerificationURIComplete != "" {
+ res.LoginUri = da.VerificationURIComplete
+ } else {
+ res.LoginUri = da.VerificationURI
+ res.Code = da.UserCode
+ }
+ }
+
+ jsonWrite(w, res)
}
func (a *Handler) handleLogout(w http.ResponseWriter, r *http.Request) {
diff --git a/tests/config-device-auth-demo.tpl.yaml b/tests/config-device-auth-demo.tpl.yaml
index fc4472306..e5af390d7 100644
--- a/tests/config-device-auth-demo.tpl.yaml
+++ b/tests/config-device-auth-demo.tpl.yaml
@@ -6,18 +6,18 @@ products:
en: Auth Demo Meter
auth:
type: demo
- params: ["region", "server"]
+ params: ["region", "method"]
params:
- name: usage
choice: ["grid"]
- name: region
description:
generic: Region
- type: choice
- choice: ["EU", "US", "CN"]
- - name: server
+ choice: ["EU", "US", "CN", "ERROR"]
+ - name: method
description:
- generic: Server
+ generic: Authentication Method
+ choice: ["redirect", "device-code"]
- name: power
description:
generic: Power
diff --git a/tests/config-device-auth.spec.ts b/tests/config-device-auth.spec.ts
index 9ee178072..2c11013de 100644
--- a/tests/config-device-auth.spec.ts
+++ b/tests/config-device-auth.spec.ts
@@ -20,7 +20,7 @@ test.afterEach(async () => {
});
test.describe("config device auth", async () => {
- test("create grid meter with demo auth", async ({ page }) => {
+ test("create grid meter with redirect auth", async ({ page }) => {
await page.goto("/#/config");
await enableExperimental(page, true);
@@ -36,14 +36,15 @@ test.describe("config device auth", async () => {
// step 1: auth view
await expect(meterModal.getByLabel("Region")).toBeVisible();
- await expect(meterModal.getByLabel("Server")).toBeVisible();
+ await expect(meterModal.getByLabel("Authentication Method")).toBeVisible();
await expect(meterModal.getByLabel("Power")).not.toBeVisible();
await expect(meterModal.getByRole("button", { name: "Validate & save" })).not.toBeVisible();
await expect(meterModal.getByRole("button", { name: "Save" })).not.toBeVisible();
await meterModal.getByLabel("Region").selectOption("EU");
- await meterModal.getByLabel("Server").fill("my.server.org");
+ await meterModal.getByLabel("Authentication Method").selectOption("redirect");
await meterModal.getByRole("button", { name: "Prepare connection" }).click();
- await expect(meterModal.getByRole("link", { name: "Connect with localhost" })).toBeVisible();
+ await expect(meterModal.getByRole("link", { name: "Connect to localhost" })).toBeVisible();
+ await expect(meterModal.getByLabel("Authentication Code")).not.toBeVisible();
// we dont navigate to localhost, just trigger ui update because demo auth state is already established
await page.evaluate(() => {
@@ -52,7 +53,7 @@ test.describe("config device auth", async () => {
// step 2: show regular device form
await expect(meterModal.getByLabel("Region")).toHaveValue("EU");
- await expect(meterModal.getByLabel("Server")).toHaveValue("my.server.org");
+ await expect(meterModal.getByLabel("Authentication Method")).toHaveValue("redirect");
await expect(meterModal.getByLabel("Power")).toBeVisible();
await meterModal.getByLabel("Power").fill("5000");
await expect(meterModal.getByRole("button", { name: "Validate & save" })).toBeVisible();
@@ -70,7 +71,7 @@ test.describe("config device auth", async () => {
await page.getByTestId("grid").getByRole("button", { name: "edit" }).click();
await expectModalVisible(meterModal);
await expect(meterModal.getByLabel("Region")).toHaveValue("EU");
- await expect(meterModal.getByLabel("Server")).toHaveValue("my.server.org");
+ await expect(meterModal.getByLabel("Authentication Method")).toHaveValue("redirect");
await expect(meterModal.getByLabel("Power")).toHaveValue("5000");
await expect(meterModal.getByRole("button", { name: "Prepare connection" })).not.toBeVisible();
await expect(meterModal.getByRole("button", { name: "Validate & save" })).toBeVisible();
@@ -85,10 +86,55 @@ test.describe("config device auth", async () => {
await page.getByTestId("grid").getByRole("button", { name: "edit" }).click();
await expectModalVisible(meterModal);
await expect(meterModal.getByLabel("Region")).toHaveValue("EU");
- await expect(meterModal.getByLabel("Server")).toHaveValue("my.server.org");
+ await expect(meterModal.getByLabel("Authentication Method")).toHaveValue("redirect");
await expect(meterModal.getByLabel("Power")).not.toBeVisible();
- // note: prepare connection step is auto-executed, since all required fields (server, token) are already present
- await expect(meterModal.getByRole("link", { name: "Connect with localhost" })).toBeVisible();
+ // note: prepare connection step is auto-executed, since all required fields are already present
+ await expect(meterModal.getByRole("link", { name: "Connect to localhost" })).toBeVisible();
await expect(meterModal.getByRole("button", { name: "Validate & save" })).not.toBeVisible();
});
+
+ test("create grid meter with device-code auth", async ({ page }) => {
+ await page.goto("/#/config");
+ await enableExperimental(page, true);
+
+ // create a grid meter with device-code auth
+ await page.getByRole("button", { name: "Add grid meter" }).click();
+ const meterModal = page.getByTestId("meter-modal");
+ await expectModalVisible(meterModal);
+ await meterModal.getByLabel("Manufacturer").selectOption("Auth Demo Meter");
+
+ // select device-code method
+ await meterModal.getByLabel("Region").selectOption("EU");
+ await meterModal.getByLabel("Authentication Method").selectOption("device-code");
+ await meterModal.getByRole("button", { name: "Prepare connection" }).click();
+
+ // verify device code is displayed
+ await expect(meterModal.getByLabel("Authentication Code")).toHaveValue("12AB345");
+ await expect(meterModal).toContainText("Valid for");
+ await expect(meterModal).toContainText("Copy this code");
+ await expect(meterModal.getByRole("link", { name: "Connect to localhost" })).toBeVisible();
+ });
+
+ test("error region shows auth error", async ({ page }) => {
+ await page.goto("/#/config");
+ await enableExperimental(page, true);
+
+ await page.getByRole("button", { name: "Add grid meter" }).click();
+ const meterModal = page.getByTestId("meter-modal");
+ await expectModalVisible(meterModal);
+ await meterModal.getByLabel("Manufacturer").selectOption("Auth Demo Meter");
+ await meterModal.getByLabel("Region").selectOption("ERROR");
+ await meterModal.getByLabel("Authentication Method").selectOption("redirect");
+ await meterModal.getByRole("button", { name: "Prepare connection" }).click();
+
+ await expect(meterModal).toContainText("region not supported");
+ await expect(meterModal.getByRole("button", { name: "Prepare connection" })).toBeVisible();
+ await expect(meterModal.getByRole("link", { name: "Connect to localhost" })).not.toBeVisible();
+ await expect(meterModal.getByLabel("Authentication Code")).not.toBeVisible();
+ await expect(meterModal.getByLabel("Power")).not.toBeVisible();
+
+ // clear error on input change
+ await meterModal.getByLabel("Region").selectOption("EU");
+ await expect(meterModal).not.toContainText("region not supported");
+ });
});