frontend/lib: reorganizing api calls before introducing query cache

Which means:

- Splitting types into another file
- Organizing internal code between what's local and what's not
- Adding a barrel file as well

Might evaluate to split even further, into different groups of files,
and combine it later, so for example have all mood-related calls in a
single place, users, auth, tokens, etc

Pedro Lucas Porcellis porcellis@eletrotupi.com 1 month ago d706da942de64ad47412e67cb183d34e5e1fd05e

Parents: 17dd47a

3 file(s) changed

frontend/lib/api/client.ts +43 -51
frontend/lib/api/index.ts +12 -0
frontend/lib/api/types.ts +73 -0

frontend/lib/api/client.ts

@@ -1,27 +1,21 @@
    import * as SecureStore from 'expo-secure-store';
  + import {
  +   User,
  +   AuthResponse,
  +   VerifyTokenResponse,
  +   SignUpPayload,
  +   ResetPasswordRequestResponse,
  +   ResetPasswordResponse,
  +   UserUpdatePayload,
  +   UserUpdateResponse,
  +   MoodComponentPayload,
  +   MoodEntryPayload,
  +   PaginatedResponse
  + } from '@/lib/api/types';
    
    const API_BASE_URL = process.env.EXPO_PUBLIC_API_BASE_URL;
    const TOKEN_KEY = process.env.EXPO_PUBLIC_TOKEN_KEY; // Gary B.B Coleman fucking slaps
    
  - export interface User {
  -   id: number;
  -   email: string;
  -   firstName: string;
  -   lastName?: string;
  -   updatedAt: Date;
  -   avatarKey?: string;
  -   avatarURL?: string;
  - }
  - 
  - export interface AuthResponse {
  -   token: string;
  -   user: User;
  - }
  - 
  - export interface UserUpdateResponse {
  -   user: User
  - }
  - 
    class ApiClient {
      private async getStoredToken(): Promise<string | null> {
        try {

@@ -49,6 +43,11 @@ console.error('Failed to remove token:', error);
        }
      }
    
  +   async getStoredAuthData(): Promise<{ token: string | null }> {
  +     const token = await this.getStoredToken();
  +     return { token };
  +   }
  + 
      private async request<T>(
        endpoint: string,
        options: RequestInit = {}

@@ -79,22 +78,7 @@
        return response.json();
      }
    
  -   async avatar(formData: FormData): Promise<void> {
  -     return await this.request(`/users/me/avatar`, {
  -       method: 'POST',
  -       body: formData,
  -       headers: {
  -         'Content-Type': 'multipart/form-data',
  -       } as any,
  -     })
  -   }
  - 
  -   async removeAvatar(): Promise<void> {
  -     return await this.request(`/users/me/avatar`, {
  -       method: 'DELETE'
  -     });
  -   }
  - 
  +   // Auth
      async login(email: string, password: string): Promise<AuthResponse> {
        const response = await this.request<AuthResponse>('/auth/login', {
          method: 'POST',

@@ -105,36 +89,31 @@ await this.storeToken(response.token);
        return response;
      }
    
  -   async signup(userData: {
  -     first_name: string;
  -     last_name?: string;
  -     email: string;
  -     password: string;
  -   }): Promise<AuthResponse> {
  +   async signup(data: SignUpPayload): Promise<AuthResponse> {
        const response = await this.request<AuthResponse>('/users', {
          method: 'POST',
  -       body: JSON.stringify(userData),
  +       body: JSON.stringify(data),
        });
    
        await this.storeToken(response.token);
        return response;
      }
    
  -   async forgotPassword(email: string): Promise<{ message: string; token?: string }> {
  +   async forgotPassword(email: string): Promise<ResetPasswordRequestResponse> {
        return this.request('/auth/forgot-password', {
          method: 'POST',
          body: JSON.stringify({ email }),
        });
      }
    
  -   async resetPassword(token: string, password: string): Promise<{ message: string }> {
  +   async resetPassword(token: string, password: string): Promise<ResetPasswordResponse> {
        return this.request('/auth/reset-password', {
          method: 'POST',
          body: JSON.stringify({ token, newPassword: password }),
        });
      }
    
  -   async verifyToken(): Promise<{ valid: boolean; userId?: number; email?: string }> {
  +   async verifyToken(): Promise<VerifyTokenResponse> {
        try {
          return await this.request('/auth/verify');
        } catch (error) {

@@ -148,18 +127,31 @@ async logout(): Promise<void> {
        await this.removeToken();
      }
    
  -   async getStoredAuthData(): Promise<{ token: string | null }> {
  -     const token = await this.getStoredToken();
  -     return { token };
  -   }
  - 
  -   async updateUser(user): Promise<void> {
  +   // User-related
  +   async updateUser(user: UserUpdatePayload): Promise<User> {
        return await this.request(`/users/${user.id}`, {
          method: 'PUT',
          body: JSON.stringify({ user })
        })
      }
    
  +   async avatar(formData: FormData): Promise<void> {
  +     return await this.request(`/users/me/avatar`, {
  +       method: 'POST',
  +       body: formData,
  +       headers: {
  +         'Content-Type': 'multipart/form-data',
  +       } as any,
  +     })
  +   }
  + 
  +   async removeAvatar(): Promise<void> {
  +     return await this.request(`/users/me/avatar`, {
  +       method: 'DELETE'
  +     });
  +   }
  + 
  +   // Mood-related
      async createMoodEntry(moodEntry): Promise<void> {
        return await this.request(`/moods`, {
          method: 'POST',

frontend/lib/api/index.ts

@@ -0,0 +1,12 @@
  + export {
  +   apiClient
  + } from '@/lib/api/client';
  + 
  + export type {
  +   User,
  +   AuthResponse,
  +   MoodEntryPayload,
  +   MoodComponentPayload,
  +   PaginatedResponse,
  +   UserUpdateResponse
  + } from '@/lib/api/types';

frontend/lib/api/types.ts

@@ -0,0 +1,73 @@
  + export interface User {
  +   id: number;
  +   email: string;
  +   firstName: string;
  +   lastName?: string;
  +   updatedAt: Date;
  +   avatarKey?: string;
  +   avatarURL?: string;
  + };
  + 
  + // Auth
  + export interface AuthResponse {
  +   token: string;
  +   user: User;
  + };
  + 
  + export interface VerifyTokenResponse {
  +   valid: boolean;
  +   userId?: number;
  +   email?: string;
  +   user: Pick<User, 'firstName' | 'lastName'>;
  + };
  + 
  + export interface SignUpPayload {
  +   firstName: string;
  +   lastName?: string;
  +   email: string;
  +   password: string;
  + };
  + 
  + export interface ResetPasswordRequestResponse {
  +   message: string;
  +   token?: string;
  + };
  + 
  + export interface ResetPasswordResponse {
  +   message: string;
  + };
  + 
  + // User
  + export interface UserUpdatePayload extends Partial<User> {
  +   id: number;
  + }
  + 
  + export interface UserUpdateResponse {
  +   user: User
  + };
  + 
  + // Mood entries
  + export interface MoodComponentPayload {
  +   component: string;
  +   intensity: string;
  + };
  + 
  + 
  + export interface MoodEntryPayload {
  +   annotation: string;
  +   moment: Date;
  +   selectedMood: string;
  +   anxietyLevel: number;
  +   energyLevel: number;
  +   stressLevel: number;
  +   moodComponents: MoodComponentPayload[]
  + };
  + 
  + 
  + // Generic stuff
  + export interface PaginatedResponse<T> {
  +   entries: T[];
  +   total: number;
  +   page: number;
  +   nextPage: number | null;
  + };