diff --git a/backend/api/user_login.py b/backend/api/user_login.py index 588d159..e5514b0 100644 --- a/backend/api/user_login.py +++ b/backend/api/user_login.py @@ -68,7 +68,7 @@ class PollOnlineView(APIView): user = request.user try: data = request.data - ip_address = data['ip'] + ip_address = data["ip"] print("Local IP found in request") except Exception as e: ip_address = get_client_ip(request) diff --git a/backend/api/utils/get_client_ip.py b/backend/api/utils/get_client_ip.py index 172b5a7..56cbaf0 100644 --- a/backend/api/utils/get_client_ip.py +++ b/backend/api/utils/get_client_ip.py @@ -15,7 +15,7 @@ def update_user_ip(request): user = request.user try: data = request.data - ip_address = data['ip'] + ip_address = data["ip"] print("Local IP found in request") except Exception as e: ip_address = get_client_ip(request) diff --git a/backend/peer_notes/settings.py b/backend/peer_notes/settings.py index 2b2c292..2f2d9d0 100644 --- a/backend/peer_notes/settings.py +++ b/backend/peer_notes/settings.py @@ -29,7 +29,6 @@ ALLOWED_HOSTS = ["*"] # ALLOWED_HOSTS = [] - # Application definition INSTALLED_APPS = [ diff --git a/backend/requirements.txt b/backend/requirements.txt index 18e1795..d316bf1 100644 --- a/backend/requirements.txt +++ b/backend/requirements.txt @@ -19,3 +19,5 @@ tomli==2.0.1 typing_extensions==4.10.0 Werkzeug==3.0.1 zipp==3.17.0 +flask +flask-cors \ No newline at end of file diff --git a/file_peer/peer_service.py b/file_peer/peer_service.py index 20d75b6..4e1fb15 100644 --- a/file_peer/peer_service.py +++ b/file_peer/peer_service.py @@ -4,108 +4,116 @@ import socket import shutil import os +from flask_cors import CORS + app = Flask(__name__) +# Enable CORS for all routes +CORS(app) -@app.route('/copy-file', methods = ['POST']) + +@app.route("/copy-file", methods=["POST"]) def copy_file(): try: data = request.json - source_file = data['file_path'] - id = data['file_id'] + source_file = data["file_path"] + id = data["file_id"] if not os.path.exists(source_file): return f"Source file does not exist at {source_file}", 400 filename = os.path.basename(source_file) - destination_path = os.path.join('./uploads/', str(id) +'_' + filename) + destination_path = os.path.join("./uploads/", str(id) + "_" + filename) shutil.copyfile(source_file, destination_path) return "File Moved successfully", 200 except Exception as e: - print(f'An error occured: {e}') + print(f"An error occured: {e}") return "An error occured", 400 -@app.route('/ip', methods=["GET"]) +@app.route("/ip", methods=["GET"]) def get_internal_ip(): internal_ip = None try: s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) - s.connect(("8.8.8.8", 80)) + s.connect(("8.8.8.8", 80)) internal_ip = s.getsockname()[0] s.close() except Exception as e: print("Error:", e) return internal_ip, 200 -@app.route('/send', methods=['GET']) + +@app.route("/send", methods=["GET"]) def send(): - file_id = request.args.get('id') - filename = request.args.get('filename') + file_id = request.args.get("id") + filename = request.args.get("filename") - file_path = './uploads/' + file_id + '_' + filename - - return send_file(file_path, as_attachment=True, download_name = str(file_id)+'_'+filename) + file_path = "./uploads/" + file_id + "_" + filename -@app.route('/request', methods=['GET']) + return send_file( + file_path, as_attachment=True, download_name=str(file_id) + "_" + filename + ) + + +@app.route("/request", methods=["GET"]) def request_file(): data = request.json - file_id = data['id'] - filename = data['filename'] - ip = data['ip'] - + file_id = data["id"] + filename = data["filename"] + ip = data["ip"] url = f"http://{ip}:8080/send" params = { - 'id': file_id, - 'filename': filename, + "id": file_id, + "filename": filename, } response = requests.get(url, params=params) - file_path = './uploads/' + str(file_id) + '_' + filename + file_path = "./uploads/" + str(file_id) + "_" + filename if response.status_code == 200: if os.path.exists(file_path): return "File with name already exists", 200 - - with open(file_path, 'wb') as f: + + with open(file_path, "wb") as f: f.write(response.content) print("File downloaded successfully") - return f'File Downloaded to location to location {file_path}', 200 + return f"File Downloaded to location to location {file_path}", 200 else: error = response.text print("Error:", error) return error, response.status_code - -@app.route('/request-tests', methods=['GET']) + + +@app.route("/request-tests", methods=["GET"]) def request_test_(): data = request.json - file_id = data['id'] - filename = data['filename'] - ip = data['ip'] - new_filename = data['new_filename'] - + file_id = data["id"] + filename = data["filename"] + ip = data["ip"] + new_filename = data["new_filename"] url = f"http://{ip}:8080/send" params = { - 'id': file_id, - 'filename': filename, + "id": file_id, + "filename": filename, } response = requests.get(url, params=params) - file_path = './uploads/' + str(file_id) + '_' + new_filename + file_path = "./uploads/" + str(file_id) + "_" + new_filename if response.status_code == 200: if os.path.exists(file_path): return "File with name already exists", 200 - - with open(file_path, 'wb') as f: + + with open(file_path, "wb") as f: f.write(response.content) print("File downloaded successfully") - return f'File Downloaded to location to location {file_path}', 200 + return f"File Downloaded to location to location {file_path}", 200 else: error = response.text print("Error:", error) return error, response.status_code -if __name__ == '__main__': - app.run(debug=True, host= '0.0.0.0', port=8080) +if __name__ == "__main__": + app.run(debug=True, host="0.0.0.0", port=8080)