patrick/OpenDTU
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Password protection for inverter settings API

Browse Source
This commit is contained in:
Thomas Basler 2022-11-03 21:44:01 +01:00
parent 902e632f51
commit a646eae51a
3 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/WebApi_inverter.cpp
View File

@ -8,6 +8,7 @@
#include "Configuration.h"
#include "Hoymiles.h"
#include "MqttHassPublishing.h"
#include "WebApi.h"
#include "helper.h"
void WebApiInverterClass::init(AsyncWebServer* server)
@ -28,6 +29,10 @@ void WebApiInverterClass::loop()
void WebApiInverterClass::onInverterList(AsyncWebServerRequest* request)
{
if (!WebApi.checkCredentials(request)) {
return;
}
AsyncJsonResponse* response = new AsyncJsonResponse(false, 4096U);
JsonObject root = response->getRoot();
JsonArray data = root.createNestedArray(F("inverter"));
@ -66,6 +71,10 @@ void WebApiInverterClass::onInverterList(AsyncWebServerRequest* request)
void WebApiInverterClass::onInverterAdd(AsyncWebServerRequest* request)
{
if (!WebApi.checkCredentials(request)) {
return;
}
AsyncJsonResponse* response = new AsyncJsonResponse();
JsonObject retMsg = response->getRoot();
retMsg[F("type")] = F("warning");
@ -151,6 +160,10 @@ void WebApiInverterClass::onInverterAdd(AsyncWebServerRequest* request)
void WebApiInverterClass::onInverterEdit(AsyncWebServerRequest* request)
{
if (!WebApi.checkCredentials(request)) {
return;
}
AsyncJsonResponse* response = new AsyncJsonResponse();
JsonObject retMsg = response->getRoot();
retMsg[F("type")] = F("warning");
@ -265,6 +278,10 @@ void WebApiInverterClass::onInverterEdit(AsyncWebServerRequest* request)
void WebApiInverterClass::onInverterDelete(AsyncWebServerRequest* request)
{
if (!WebApi.checkCredentials(request)) {
return;
}
AsyncJsonResponse* response = new AsyncJsonResponse();
JsonObject retMsg = response->getRoot();
retMsg[F("type")] = F("warning");

2
webapp/src/router/index.ts
View File

@ -100,7 +100,7 @@ const router = createRouter({
router.beforeEach((to, from, next) => {
// redirect to login page if not logged in and trying to access a restricted page
const publicPages = ['/', '/login', '/about', '/info/network', '/info/system', '/info/ntp', '/info/mqtt',
'/settings/inverter', '/firmware/upgrade', '/settings/config', ];
'/firmware/upgrade', '/settings/config', ];
const authRequired = !publicPages.includes(to.path);
const loggedIn = localStorage.getItem('user');

32
webapp/src/views/InverterAdminView.vue
View File

@ -147,6 +147,7 @@ import {
} from 'bootstrap-icons-vue';
import * as bootstrap from 'bootstrap';
import BootstrapAlert from "@/components/BootstrapAlert.vue";
import { handleResponse, authHeader } from '@/utils/authentication';
declare interface Inverter {
id: string,
@ -196,8 +197,8 @@ export default defineComponent({
methods: {
getInverters() {
this.dataLoading = true;
fetch("/api/inverter/list")
.then((response) => response.json())
fetch("/api/inverter/list", { headers: authHeader() })
.then(handleResponse)
.then((data) => {
this.inverters = data.inverter;
this.dataLoading = false;
@ -209,15 +210,10 @@ export default defineComponent({
fetch("/api/inverter/add", {
method: "POST",
headers: authHeader(),
body: formData,
})
.then(function (response) {
if (response.status != 200) {
throw response.status;
} else {
return response.json();
}
})
.then(handleResponse)
.then(
(response) => {
this.alertMessage = response.message;
@ -250,15 +246,10 @@ export default defineComponent({
fetch("/api/inverter/del", {
method: "POST",
headers: authHeader(),
body: formData,
})
.then(function (response) {
if (response.status != 200) {
throw response.status;
} else {
return response.json();
}
})
.then(handleResponse)
.then(
(response) => {
this.alertMessage = response.message;
@ -295,15 +286,10 @@ export default defineComponent({
fetch("/api/inverter/edit", {
method: "POST",
headers: authHeader(),
body: formData,
})
.then(function (response) {
if (response.status != 200) {
throw response.status;
} else {
return response.json();
}
})
.then(handleResponse)
.then(
(response) => {
this.alertMessage = response.message;