shelflife-react-hooks 1.0.18 → 1.0.20

package/src/context/api/authApi.ts

@@ -1,155 +1,155 @@
-import type {
-    ChangePasswordErrorResponse,
-    ChangePasswordRequest,
-    LoginErrorResponse,
-    LoginRequest,
-    LoginResponse,
-    SignupError,
-    SignupRequest,
-    User
-} from '../../type/auth.js';
-import type { ErrorResponse } from '../../type/base.js';
-import { buildAuthHeaders, normalizeBaseUrl, readJson } from '../http.js';
-import { runWithRequestState, type RequestStateHandlers } from './requestState.js';
-
-type AuthApiConfig = RequestStateHandlers & {
-    baseUrl: string;
-    token: string | null;
-    setToken: (token: string | null) => void;
-    setUser: (user: User | null) => void;
-};
-
-export const loginRequest = async (
-    config: AuthApiConfig,
-    dto: LoginRequest
-): Promise<void> => runWithRequestState(config, async () => {
-    const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
-    const response = await fetch(`${normalizedBaseUrl}/api/auth/login`, {
-        method: 'POST',
-        headers: {
-            'Content-Type': 'application/json'
-        },
-        body: JSON.stringify(dto)
-    });
-
-    if (!response.ok) {
-        const error = await readJson<LoginErrorResponse>(response);
-
-        if (error?.error)
-            throw error;
-
-        throw new Error('Login failed');
-    }
-
-    const payload = await readJson<LoginResponse>(response);
-    if (!payload || !('token' in payload)) {
-        throw new Error('Login response missing token');
-    }
-
-    config.setToken(payload.token);
-
-    const meResponse = await fetch(`${normalizedBaseUrl}/api/auth/me`, {
-        headers: buildAuthHeaders(payload.token)
-    });
-
-    if (meResponse.ok) {
-        const mePayload = await readJson<User>(meResponse);
-        if (mePayload) {
-            config.setUser(mePayload);
-        }
-    }
-});
-
-export const signupRequest = async (
-    config: AuthApiConfig,
-    dto: SignupRequest
-): Promise<User> => runWithRequestState(config, async () => {
-    const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
-    const response = await fetch(`${normalizedBaseUrl}/api/auth/signup`, {
-        method: 'POST',
-        headers: {
-            'Content-Type': 'application/json'
-        },
-        body: JSON.stringify(dto)
-    });
-
-    if (!response.ok) {
-        const error = await readJson<SignupError>(response);
-
-        if (error?.email || error?.password || error?.passwordRepeat || error?.username )
-            throw error;
-
-        throw new Error('Signup failed');
-    }
-
-    const payload = await readJson<User>(response);
-    if (!payload) {
-        throw new Error('Signup response missing user');
-    }
-
-    return payload;
-});
-
-export const changePasswordRequest = async (
-    config: AuthApiConfig,
-    dto: ChangePasswordRequest
-): Promise<void> => runWithRequestState(config, async () => {
-    const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
-    const response = await fetch(`${normalizedBaseUrl}/api/auth/password/change`, {
-        method: 'POST',
-        headers: {
-            ...buildAuthHeaders(config.token),
-            'Content-Type': 'application/json'
-        },
-        body: JSON.stringify(dto)
-    });
-
-    if (!response.ok) {
-        const error = await readJson<ChangePasswordErrorResponse>(response);
-
-        if (error?.oldPassword || error?.newPassword || error?.newPasswordRepeat)
-            throw error;
-
-        throw new Error('Change password failed');
-    }
-});
-
-export const getMeRequest = async (config: AuthApiConfig): Promise<User | null> => runWithRequestState(
-    config,
-    async () => {
-        const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
-        const response = await fetch(`${normalizedBaseUrl}/api/auth/me`, {
-            headers: buildAuthHeaders(config.token)
-        });
-
-        if (!response.ok) {
-            config.setUser(null);
-            return null;
-        }
-
-        const payload = await readJson<User>(response);
-        if (!payload) {
-            config.setUser(null);
-            return null;
-        }
-
-        config.setUser(payload);
-        return payload;
-    }
-);
-
-export const logoutRequest = async (config: AuthApiConfig): Promise<void> => runWithRequestState(
-    config,
-    async () => {
-        const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
-        if (config.token) {
-            await fetch(`${normalizedBaseUrl}/api/auth/logout`, {
-                method: 'POST',
-                headers: buildAuthHeaders(config.token)
-            });
-        }
-
-        config.setToken(null);
-        config.setUser(null);
-    }
-);
+import type {
+    ChangePasswordErrorResponse,
+    ChangePasswordRequest,
+    LoginErrorResponse,
+    LoginRequest,
+    LoginResponse,
+    SignupError,
+    SignupRequest,
+    User
+} from '../../type/auth.js';
+import type { ErrorResponse } from '../../type/base.js';
+import { buildAuthHeaders, normalizeBaseUrl, readJson } from '../http.js';
+import { runWithRequestState, type RequestStateHandlers } from './requestState.js';
+
+type AuthApiConfig = RequestStateHandlers & {
+    baseUrl: string;
+    token: string | null;
+    setToken: (token: string | null) => void;
+    setUser: (user: User | null) => void;
+};
+
+export const loginRequest = async (
+    config: AuthApiConfig,
+    dto: LoginRequest
+): Promise<void> => runWithRequestState(config, async () => {
+    const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
+    const response = await fetch(`${normalizedBaseUrl}/api/auth/login`, {
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/json'
+        },
+        body: JSON.stringify(dto)
+    });
+
+    if (!response.ok) {
+        const error = await readJson<LoginErrorResponse>(response);
+
+        if (error?.error)
+            throw error;
+
+        throw new Error('Login failed');
+    }
+
+    const payload = await readJson<LoginResponse>(response);
+    if (!payload || !('token' in payload)) {
+        throw new Error('Login response missing token');
+    }
+
+    config.setToken(payload.token);
+
+    const meResponse = await fetch(`${normalizedBaseUrl}/api/auth/me`, {
+        headers: buildAuthHeaders(payload.token)
+    });
+
+    if (meResponse.ok) {
+        const mePayload = await readJson<User>(meResponse);
+        if (mePayload) {
+            config.setUser(mePayload);
+        }
+    }
+});
+
+export const signupRequest = async (
+    config: AuthApiConfig,
+    dto: SignupRequest
+): Promise<User> => runWithRequestState(config, async () => {
+    const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
+    const response = await fetch(`${normalizedBaseUrl}/api/auth/signup`, {
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/json'
+        },
+        body: JSON.stringify(dto)
+    });
+
+    if (!response.ok) {
+        const error = await readJson<SignupError>(response);
+
+        if (error?.email || error?.password || error?.passwordRepeat || error?.username )
+            throw error;
+
+        throw new Error('Signup failed');
+    }
+
+    const payload = await readJson<User>(response);
+    if (!payload) {
+        throw new Error('Signup response missing user');
+    }
+
+    return payload;
+});
+
+export const changePasswordRequest = async (
+    config: AuthApiConfig,
+    dto: ChangePasswordRequest
+): Promise<void> => runWithRequestState(config, async () => {
+    const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
+    const response = await fetch(`${normalizedBaseUrl}/api/auth/password/change`, {
+        method: 'POST',
+        headers: {
+            ...buildAuthHeaders(config.token),
+            'Content-Type': 'application/json'
+        },
+        body: JSON.stringify(dto)
+    });
+
+    if (!response.ok) {
+        const error = await readJson<ChangePasswordErrorResponse>(response);
+
+        if (error?.oldPassword || error?.newPassword || error?.newPasswordRepeat)
+            throw error;
+
+        throw new Error('Change password failed');
+    }
+});
+
+export const getMeRequest = async (config: AuthApiConfig): Promise<User | null> => runWithRequestState(
+    config,
+    async () => {
+        const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
+        const response = await fetch(`${normalizedBaseUrl}/api/auth/me`, {
+            headers: buildAuthHeaders(config.token)
+        });
+
+        if (!response.ok) {
+            config.setUser(null);
+            return null;
+        }
+
+        const payload = await readJson<User>(response);
+        if (!payload) {
+            config.setUser(null);
+            return null;
+        }
+
+        config.setUser(payload);
+        return payload;
+    }
+);
+
+export const logoutRequest = async (config: AuthApiConfig): Promise<void> => runWithRequestState(
+    config,
+    async () => {
+        const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
+        if (config.token) {
+            await fetch(`${normalizedBaseUrl}/api/auth/logout`, {
+                method: 'POST',
+                headers: buildAuthHeaders(config.token)
+            });
+        }
+
+        config.setToken(null);
+        config.setUser(null);
+    }
+);

package/src/context/api/inviteApi.ts

@@ -1,65 +1,65 @@
-import type { StorageMember } from '../../type/models.js';
-import { buildAuthHeaders, normalizeBaseUrl, readJson } from '../http.js';
-import { runWithRequestState, type RequestStateHandlers } from './requestState.js';
-
-type InviteApiConfig = RequestStateHandlers & {
-    baseUrl: string;
-    token: string | null;
-    setInvites: (value: StorageMember[] | ((items: StorageMember[]) => StorageMember[])) => void;
-};
-
-export const fetchInvitesRequest = async (config: InviteApiConfig): Promise<StorageMember[]> => runWithRequestState(
-    config,
-    async () => {
-        const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
-        const response = await fetch(`${normalizedBaseUrl}/api/storages/invites`, {
-            headers: buildAuthHeaders(config.token)
-        });
-
-        if (!response.ok) {
-            throw new Error('Failed to fetch invites');
-        }
-
-        const payload = await readJson<StorageMember[]>(response);
-        if (payload) {
-            config.setInvites(payload);
-            return payload;
-        }
-
-        return [];
-    }
-);
-
-export const acceptInviteRequest = async (
-    config: InviteApiConfig,
-    id: number
-): Promise<void> => runWithRequestState(config, async () => {
-    const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
-    const response = await fetch(`${normalizedBaseUrl}/api/storages/invites/${id}`, {
-        method: 'POST',
-        headers: buildAuthHeaders(config.token)
-    });
-
-    if (!response.ok) {
-        throw new Error('Failed to accept invite');
-    }
-
-    config.setInvites((previous) => previous.filter((invite) => invite.id !== id));
-});
-
-export const declineInviteRequest = async (
-    config: InviteApiConfig,
-    id: number
-): Promise<void> => runWithRequestState(config, async () => {
-    const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
-    const response = await fetch(`${normalizedBaseUrl}/api/storages/invites/${id}`, {
-        method: 'DELETE',
-        headers: buildAuthHeaders(config.token)
-    });
-
-    if (!response.ok) {
-        throw new Error('Failed to decline invite');
-    }
-
-    config.setInvites((previous) => previous.filter((invite) => invite.id !== id));
-});
+import type { StorageMember } from '../../type/models.js';
+import { buildAuthHeaders, normalizeBaseUrl, readJson } from '../http.js';
+import { runWithRequestState, type RequestStateHandlers } from './requestState.js';
+
+type InviteApiConfig = RequestStateHandlers & {
+    baseUrl: string;
+    token: string | null;
+    setInvites: (value: StorageMember[] | ((items: StorageMember[]) => StorageMember[])) => void;
+};
+
+export const fetchInvitesRequest = async (config: InviteApiConfig): Promise<StorageMember[]> => runWithRequestState(
+    config,
+    async () => {
+        const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
+        const response = await fetch(`${normalizedBaseUrl}/api/storages/invites`, {
+            headers: buildAuthHeaders(config.token)
+        });
+
+        if (!response.ok) {
+            throw new Error('Failed to fetch invites');
+        }
+
+        const payload = await readJson<StorageMember[]>(response);
+        if (payload) {
+            config.setInvites(payload);
+            return payload;
+        }
+
+        return [];
+    }
+);
+
+export const acceptInviteRequest = async (
+    config: InviteApiConfig,
+    id: number
+): Promise<void> => runWithRequestState(config, async () => {
+    const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
+    const response = await fetch(`${normalizedBaseUrl}/api/storages/invites/${id}`, {
+        method: 'POST',
+        headers: buildAuthHeaders(config.token)
+    });
+
+    if (!response.ok) {
+        throw new Error('Failed to accept invite');
+    }
+
+    config.setInvites((previous) => previous.filter((invite) => invite.id !== id));
+});
+
+export const declineInviteRequest = async (
+    config: InviteApiConfig,
+    id: number
+): Promise<void> => runWithRequestState(config, async () => {
+    const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
+    const response = await fetch(`${normalizedBaseUrl}/api/storages/invites/${id}`, {
+        method: 'DELETE',
+        headers: buildAuthHeaders(config.token)
+    });
+
+    if (!response.ok) {
+        throw new Error('Failed to decline invite');
+    }
+
+    config.setInvites((previous) => previous.filter((invite) => invite.id !== id));
+});