Merge pull request #62 from Script-languages/fix-auth

Replace `apiFetch` with `apiGet` in `fetchSettingsState` function

Author: Axan18

backend/app/routes/progress.py

@@ -1,12 +1,12 @@
-from flask import Blueprint, jsonify, request
+from flask import Blueprint, jsonify, request, g
 from app.services.progress_service import ProgressService
 from app.routes.authorization import token_required
 
 progress_bp = Blueprint('progress', __name__)
 
 @progress_bp.route('/api/progress', methods=['GET'])
 @token_required
-def get_progress(current_user):
+def get_progress():
     """
     Endpoint to retrieve user progress data.
 
@@ -25,7 +25,7 @@ def get_progress(current_user):
         timezone = request.headers.get('X-Timezone', 'Europe/Warsaw')
 
         # Get progress data
-        progress_dto = ProgressService.get_user_progress_data(current_user, timezone)
+        progress_dto = ProgressService.get_user_progress_data(g.current_user, timezone)
         serialized_data = ProgressService.serialize_progress_response(progress_dto)
 
         return jsonify(serialized_data), 200

backend/app/routes/user_addiction.py

@@ -1,4 +1,4 @@
-from flask import Blueprint, jsonify, request
+from flask import Blueprint, jsonify, request, g
 from marshmallow import ValidationError
 
 from app.services.user_addiction_service import (
@@ -14,7 +14,7 @@
 
 @user_addiction_bp.route('/api/user/addiction', methods=['POST'])
 @token_required
-def add_user_addiction(current_user):
+def add_user_addiction():
     """
     Endpoint to add addiction to user.
 
@@ -39,7 +39,7 @@ def add_user_addiction(current_user):
 
         # Add user addiction
         user_addiction_dto = UserAddictionService.add_user_addiction(
-            username=current_user,
+            username=g.current_user,
             addiction_name=addiction_name,
             start_date=start_date,
             cost_per_day=cost_per_day

frontend/src/api/sendRequest.ts

@@ -12,7 +12,7 @@ export function fetchHabits() {
 }
 
 export function fetchSettingsState(){
-  return apiFetch<UserSettings>(`${API_BASE_URL}/api/settings`)
+  return apiGet<UserSettings>(`${API_BASE_URL}/api/settings`)
 }
 
 export async function setHabit<TBody, TResponse>(body: TBody): Promise<TResponse> {