Dockery/Homarr
1
0
Fork 0
mirror of https://github.com/ajnart/homarr.git synced 2025-10-26 08:06:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2278 from DR-Blogs/PiHole-v6-API-reintegration

Browse Source 
Update PiHole authentication. (PiHole v6)
This commit is contained in:
Thomas Camlong
2025-03-21 20:04:03 +01:00
committed by GitHub
parent 1d3a4af259 9be9e3963a
commit 8da6d33c61
1 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/tools/server/sdk/pihole/piHole.ts
View File

@@ -12,26 +12,43 @@ export class PiHoleClient {
this.baseHostName = trimStringEnding(hostname, ['/admin/index.php', '/admin', '/']);
}
async getSummary() {
const response = await fetch(
new URL(`${this.baseHostName}/admin/api.php?summaryRaw&auth=${this.apiToken}`)
);
async getSummary() {
const authResponse = await fetch(`${this.baseHostName}/api/auth`, {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({ password: this.apiToken })
});
if (response.status !== 200) {
throw new Error(`Status code does not indicate success: ${response.status}`);
}
if (!authResponse.ok) {
throw new Error(`Authentication failed: ${authResponse.status}`);
}
const json = await response.json();
const authJson = await authResponse.json();
if (!authJson.session?.valid || !authJson.session.sid) {
throw new Error(`Invalid session response: ${JSON.stringify(authJson)}`);
}
if (Array.isArray(json)) {
throw new Error(
`Response does not indicate success. Authentication is most likely invalid: ${json}`
const sessionId = authJson.session.sid;
const response = await fetch(
new URL(`${this.baseHostName}/api.php?summaryRaw&auth=${sessionId}`)
);
}
return json as PiHoleApiSummaryResponse;
if (response.status !== 200) {
throw new Error(`Failed to fetch summary: ${response.status}`);
}
const json = await response.json();
if (Array.isArray(json)) {
throw new Error(
`Response does not indicate success. Authentication might be invalid: ${json}`
);
}
return json as PiHoleApiSummaryResponse;
}
async enable() {
const response = await this.sendStatusChangeRequest('enable');
return response.status === 'enabled';
@@ -48,8 +65,8 @@ export class PiHoleClient {
): Promise<PiHoleApiStatusChangeResponse> {
const response = await fetch(
duration !== 0
? `${this.baseHostName}/admin/api.php?${action}=${duration}&auth=${this.apiToken}`
: `${this.baseHostName}/admin/api.php?${action}&auth=${this.apiToken}`
? `${this.baseHostName}/api?${action}=${duration}&auth=${this.apiToken}`
: `${this.baseHostName}/api?${action}&auth=${this.apiToken}`
);
if (response.status !== 200) {