refactor: seperated cloning from settings

backend/app/git/__init__.py

@@ -4,6 +4,9 @@ from .status.diff import get_diff
 from .branches.branches import Branch_Manager
 from .operations.operations import GitOperations
 from .unlink_repo import unlink_repository
+from .clone_repo import clone_repository
+from .authenticate import validate_git_token
+from ..settings_utils import save_settings
 import logging
 
 logger = logging.getLogger(__name__)
@@ -15,6 +18,41 @@ REPO_PATH = '/app/data/db'
 branch_manager = Branch_Manager(REPO_PATH)
 git_operations = GitOperations(REPO_PATH)
 
+@bp.route('/clone', methods=['POST'])
+def handle_clone_repository():
+    try:
+        new_settings = request.json
+        logger.info(f"Received new settings: {new_settings}")
+
+        # Validate required fields
+        required_fields = ['gitRepo', 'gitToken']
+        for field in required_fields:
+            if field not in new_settings:
+                logger.error(f"Missing required field: {field}")
+                return jsonify({"error": f"Missing required field: {field}"}), 400
+
+        # Validate Git token
+        if not validate_git_token(new_settings['gitRepo'], new_settings['gitToken']):
+            logger.warning("Invalid Git token provided")
+            return jsonify({"error": "Invalid Git token. Please check your credentials and try again."}), 401
+
+        # Attempt to clone the repository
+        success, message = clone_repository(new_settings['gitRepo'], REPO_PATH, new_settings['gitToken'])
+
+        if success:
+            # Only save the settings if the clone was successful
+            save_settings(new_settings)
+            logger.info("Settings updated and repository cloned successfully")
+            return jsonify({"message": "Repository cloned and settings updated successfully"}), 200
+        else:
+            logger.error(f"Failed to clone repository: {message}")
+            return jsonify({"error": message}), 400
+
+    except Exception as e:
+        logger.exception("Unexpected error in clone_repository")
+        return jsonify({"error": f"Failed to clone repository: {str(e)}"}), 500
+
+
 @bp.route('/status', methods=['GET'])
 def get_status():
     logger.debug("Received request for git status")

backend/app/git/unlink_repo.py

@@ -3,25 +3,31 @@ import shutil
 from flask import Blueprint, jsonify
 import logging
 
+# Import settings utilities
+from ..settings_utils import save_settings, load_settings
+
 logger = logging.getLogger(__name__)
 
-repo_bp = Blueprint('repository', __name__, url_prefix='/repository')
-
-def unlink_repository(settings_manager):
+def unlink_repository(repo_path):
     try:
+        # Load current settings
+        settings = load_settings()
+        if not settings:
+            return False, "Settings file not found or could not be loaded"
+
         # Remove the .git folder
-        git_folder = os.path.join(settings_manager.repo_path, '.git')
+        git_folder = os.path.join(repo_path, '.git')
         if os.path.exists(git_folder):
             shutil.rmtree(git_folder)
-            logger.info(f"Removed .git folder from {settings_manager.repo_path}")
+            logger.info(f"Removed .git folder from {repo_path}")
 
         # Update settings
-        settings_manager.settings.pop('gitRepo', None)
-        settings_manager.settings.pop('gitToken', None)
-        settings_manager.save_settings(settings_manager.settings)
+        settings.pop('gitRepo', None)
+        settings.pop('gitToken', None)
+        save_settings(settings)
         logger.info("Updated settings to remove git information")
 
         return True, "Repository successfully unlinked"
     except Exception as e:
         logger.error(f"Error unlinking repository: {str(e)}", exc_info=True)
-        return False, f"Error unlinking repository: {str(e)}"
+        return False, f"Error unlinking repository: {str(e)}"