idanoo/autobrr
1
0
Fork 0
mirror of https://github.com/idanoo/autobrr synced 2025-07-23 08:49:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(user): change username (#1502)

Browse source 
* fix(user): change username

* fix(user): api client error improvements

* fix(user): api client error improvements
This commit is contained in:
ze0s 2024-04-12 15:09:40 +02:00 • committed by GitHub
parent da53230077
commit 5857945e71
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
internal/auth/service.go
View file

@ -134,12 +134,14 @@ func (s *service) UpdateUser(ctx context.Context, req domain.UpdateUserRequest)
return errors.Errorf("invalid login: %s", req.UsernameCurrent) return errors.Errorf("invalid login: %s", req.UsernameCurrent)
} }
hashed, err := s.CreateHash(req.PasswordNew) if req.PasswordNew != "" {
if err != nil { hashed, err := s.CreateHash(req.PasswordNew)
return errors.New("failed to hash password") if err != nil {
} return errors.New("failed to hash password")
}
req.PasswordNewHash = hashed req.PasswordNewHash = hashed
}
if err := s.userSvc.Update(ctx, req); err != nil { if err := s.userSvc.Update(ctx, req); err != nil {
s.log.Error().Err(err).Msgf("could not change password for user: %s", req.UsernameCurrent) s.log.Error().Err(err).Msgf("could not change password for user: %s", req.UsernameCurrent)

14
web/src/api/APIClient.ts
View file

@ -81,23 +81,22 @@ export async function HttpClient<T = unknown>(
const response = await window.fetch(`${baseUrl()}${endpoint}`, init); const response = await window.fetch(`${baseUrl()}${endpoint}`, init);
const isJson = response.headers.get("Content-Type")?.includes("application/json");
const json = isJson ? await response.json() : null;
switch (response.status) { switch (response.status) {
case 204: { case 204: {
// 204 contains no data, but indicates success // 204 contains no data, but indicates success
return Promise.resolve<T>({} as T); return Promise.resolve<T>({} as T);
} }
case 401: { case 401: {
return Promise.reject(response); return Promise.reject<T>(json as T);
// return Promise.reject(new Error(`[401] Unauthorized: "${endpoint}"`));
} }
case 403: { case 403: {
return Promise.reject(response); return Promise.reject<T>(json as T);
} }
case 404: { case 404: {
const isJson = response.headers.get("Content-Type")?.includes("application/json");
const json = isJson ? await response.json() : null;
return Promise.reject<T>(json as T); return Promise.reject<T>(json as T);
// return Promise.reject(new Error(`[404] Not Found: "${endpoint}"`));
} }
case 500: { case 500: {
const health = await window.fetch(`${baseUrl()}api/healthz/liveness`); const health = await window.fetch(`${baseUrl()}api/healthz/liveness`);
@ -116,9 +115,6 @@ export async function HttpClient<T = unknown>(
break; break;
} }
const isJson = response.headers.get("Content-Type")?.includes("application/json");
const json = isJson ? await response.json() : null;
// Resolve on success // Resolve on success
if (response.status >= 200 && response.status < 300) { if (response.status >= 200 && response.status < 300) {
if (isJson) { if (isJson) {

6
web/src/api/QueryClient.tsx
View file

@ -52,6 +52,12 @@ export const queryClient = new QueryClient({
}, },
mutations: { mutations: {
onError: (error) => { onError: (error) => {
console.log("mutation error: ", error)
if (error instanceof Response) {
return
}
// Use a format string to convert the error object to a proper string without much hassle. // Use a format string to convert the error object to a proper string without much hassle.
const message = ( const message = (
typeof (error) === "object" && typeof ((error as Error).message) ? typeof (error) === "object" && typeof ((error as Error).message) ?