apunkt/SurfSense
1
0
Fork 0
mirror of https://github.com/MODSetter/SurfSense.git synced 2026-05-01 20:03:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

update login form

Browse source
This commit is contained in:
thierryverse 2025-11-15 02:57:41 +02:00
parent 41a938cec0
commit b35a5aa589
4 changed files with 67 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

19
surfsense_web/lib/apis/auth-api.service.ts
View file

@ -19,11 +19,20 @@ export class AuthApiService {
// Format a user frendly error message
const errorMessage = parsedRequest.error.errors.map((err) => err.message).join(", ");
throw new ValidationError(`Invalid request: ${errorMessage}`, undefined, "VALLIDATION_ERROR");
throw new ValidationError(`Invalid request: ${errorMessage}`);
}
return baseApiService.post(`/auth/jwt/login`, parsedRequest.data, loginResponse, {
contentType: "application/x-www-form-urlencoded",
// Create form data for the API request
const formData = new URLSearchParams();
formData.append("username", request.username);
formData.append("password", request.password);
formData.append("grant_type", "password");
return baseApiService.post(`/auth/jwt/login`, loginResponse, {
body: formData.toString(),
headers: {
"Content-Type": "application/x-www-form-urlencoded",
},
});
};
@ -39,7 +48,9 @@ export class AuthApiService {
throw new ValidationError(`Invalid request: ${errorMessage}`);
}
return baseApiService.post(`/auth/register`, parsedRequest.data, registerResponse);
return baseApiService.post(`/auth/register`, registerResponse, {
body: parsedRequest.data,
});
};
}

39
surfsense_web/lib/apis/base-api.service.ts
View file

@ -20,7 +20,7 @@ export class BaseApiService {
bearerToken: string;
baseUrl: string;
noAuthEndpoints: string[] = ["/auth/jwt/login", "/auth/register"];
noAuthEndpoints: string[] = ["/auth/jwt/login", "/auth/register", "/auth/refresh"]; // Add more endpoints as needed
constructor(bearerToken: string, baseUrl: string) {
this.bearerToken = bearerToken;
@ -33,7 +33,6 @@ export class BaseApiService {
async request<T>(
url: string,
body?: any,
responseSchema?: z.ZodSchema<T>,
options?: RequestOptions
): Promise<T> {
@ -55,25 +54,6 @@ export class BaseApiService {
},
};
// biome-ignore lint/suspicious: Unknown
let requestBody;
// Serialize body
if (body) {
if (mergedOptions.headers?.["Content-Type"].toLocaleLowerCase() === "application/json") {
requestBody = JSON.stringify(body);
}
if (
mergedOptions.headers?.["Content-Type"].toLocaleLowerCase() ===
"application/x-www-form-urlencoded"
) {
requestBody = new URLSearchParams(body);
}
mergedOptions.body = requestBody;
}
if (!this.baseUrl) {
throw new AppError("Base URL is not set.");
}
@ -161,7 +141,7 @@ export class BaseApiService {
responseSchema?: z.ZodSchema<T>,
options?: Omit<RequestOptions, "method">
) {
return this.request(url, undefined, responseSchema, {
return this.request(url, responseSchema, {
...options,
method: "GET",
});
@ -169,37 +149,34 @@ export class BaseApiService {
async post<T>(
url: string,
body?: any,
responseSchema?: z.ZodSchema<T>,
options?: Omit<RequestOptions, "method">
) {
return this.request(url, body, responseSchema, {
...options,
return this.request(url, responseSchema, {
method: "POST",
...options,
});
}
async put<T>(
url: string,
body?: any,
responseSchema?: z.ZodSchema<T>,
options?: Omit<RequestOptions, "method">
) {
return this.request(url, body, responseSchema, {
...options,
return this.request(url, responseSchema, {
method: "PUT",
...options,
});
}
async delete<T>(
url: string,
body?: any,
responseSchema?: z.ZodSchema<T>,
options?: Omit<RequestOptions, "method">
) {
return this.request(url, body, responseSchema, {
...options,
return this.request(url, responseSchema, {
method: "DELETE",
...options,
});
}
}