integrate oauth to full-stack

backend/.gitignore

@@ -0,0 +1 @@
+/myenv

backend/app/.gitignore

@@ -1,4 +1,7 @@
 .venv*
 *__pycache__*
 .env
-
+flask_session/
+services/.env
+services/google_secret_key.json
+note.txt

backend/app/app.py

@@ -1,24 +1,36 @@
+import os
 from flask import Flask
-from routes.user import user_bp
-from routes.folder import folder_bp
-from routes.file import file_bp
-from utils.db import CosmosDB
+from pymongo import MongoClient
 from config import Config
+from dotenv import load_dotenv
+
 
-def create_app():
-    app = Flask(__name__)
-    app.config.from_object(Config)
 
-    # Initialize Azure Cosmos DB
-    CosmosDB.init_app(app)
+app = Flask(__name__)
+app.config.from_object(Config)
+app.app_context()
+
+# Initialize Azure Cosmos DB
+# CosmosDB.init_app(app)
+app.secret_key = app.config["GOOGLE_SECRET_KEY"]
+mongo = MongoClient(app.config['MONGO_DB_URI'])
+db = mongo[app.config['MONGO_DB_NAME']]
+
+def create_app():
+    from routes.user import user_bp
+    from routes.folder import folder_bp
 
     # Register blueprints
+    from routes.user import user_bp
+    from routes.folder import folder_bp
+    from routes.search import search_bp
+    from routes.oauth import oauth_bp
+
     app.register_blueprint(user_bp, url_prefix='/users')
     app.register_blueprint(folder_bp, url_prefix='/folders')
-    app.register_blueprint(file_bp, url_prefix='/files')
-
+    app.register_blueprint(oauth_bp, url_prefix='/oauth')
     return app
 
 if __name__ == '__main__':
     app = create_app()
-    app.run(debug=True)
+    app.run(debug=True)

backend/app/config.py

@@ -4,9 +4,9 @@
 class Config:
     load_dotenv()
 
-    COSMOS_DB_URI = os.getenv('COSMOS_DB_URI')
-    COSMOS_DB_KEY = os.getenv('COSMOS_DB_KEY')
-    COSMOS_DB_DATABASE_NAME = os.getenv('COSMOS_DB_DATABASE_NAME')
-    # COSMOS_CONTAINER_NAME = os.getenv('COSMOS_CONTAINER_NAME', 'Users')
-
-    print(222, os.getenv('COSMOS_DB_URI'))
+    # COSMOS_DB_URI = os.getenv('COSMOS_DB_URI')
+    # COSMOS_DB_KEY = os.getenv('COSMOS_DB_KEY')
+    # COSMOS_DB_DATABASE_NAME = os.getenv('COSMOS_DB_DATABASE_NAME')
+    GOOGLE_SECRET_KEY = os.getenv("GOOGLE_SECRET_KEY")
+    MONGO_DB_URI = os.getenv('MONGO_DB_URI')
+    MONGO_DB_NAME = os.getenv('MONGO_DB_NAME')

backend/app/models/folder.py

@@ -1,9 +1,8 @@
 import datetime
-import uuid
 
 class Folder:
-    def __init__(self, name, summary):
-        self.id = str(uuid.uuid4())
+    def __init__(self, user_id, name, summary):
+        self.user_id = user_id
         self.name = name
         self.last_synced_at = datetime.datetime.now()
         self.summary = summary
@@ -13,7 +12,7 @@ def __init__(self, name, summary):
 
     def to_dict(self):
         return {
-            'id': self.id,
+            'user_id': self.user_id,
             'name': self.name,
             'last_synced_at': self.last_synced_at,
             'summary': self.summary,

backend/app/models/user.py

@@ -1,9 +1,7 @@
 import datetime
-import uuid
 
 class User:
     def __init__(self, email, name):
-        self.id = str(uuid.uuid4())
         self.email = email
         self.name = name
         self.is_deactivated = False
@@ -12,9 +10,11 @@ def __init__(self, email, name):
 
     def to_dict(self):
         return {
-            'id': self.id,
             'email': self.email,
-            'name': self.name
+            'name': self.name,
+            'is_deactivated': self.is_deactivated,
+            'created_at': self.created_at,
+            'updated_at': self.updated_at
         }
 
     # Create User object from dict

backend/app/requirements.txt

@@ -1,4 +1,14 @@
-flask
 azure-core
 azure-cosmos
-python-dotenv
+flask==3.0.3
+pymongo==4.7.2
+python-dotenv==1.0.1
+google-auth-oauthlib 
+google-auth-httplib2 
+google-api-python-client
+requests_oauthlib
+Flask-Session
+pyjwt
+flask-cors
+whoosh
+

backend/app/routes/folder.py

@@ -7,59 +7,105 @@
 # folders
 @folder_bp.route('/', methods=['POST'])
 def add_folder():
-    data = request.json
-    folder = folder_service.create_folder(data['name'], data['summary'])
-    return jsonify(folder.to_dict()), 201
+    data = request.get_json()
+    folder = folder_service.create_folder(data['user_id'], data['name'], data['summary'])
+    return jsonify(folder), 201
+
+@folder_bp.route('/all/<user_id>', methods=['GET'])
+def get_folders_by_user_id(user_id):
+    folders = folder_service.get_folders_by_user_id(user_id)
+    if not folders:
+        return jsonify({"error": "Folders not found"}), 404
+    return jsonify(folders)
 
-@folder_bp.route('/all', methods=['GET'])
-def get_folders():
-    return jsonify(folder_service.get_folders())
+@folder_bp.route('/<folder_id>/', methods=['GET'])
+def get_folder(folder_id):
+    folder = folder_service.get_folder_by_id(folder_id)
+    if not folder:
+        return jsonify({"error": "Folder not found"}), 404
+    return jsonify(folder)
+
+@folder_bp.route('/<folder_id>/', methods=['PUT'])
+def update_folder(folder_id):
+    data = request.json
+    folder = folder_service.update_folder_by_id(folder_id, data)
+    if not folder:
+        return jsonify({"error": "Folder not found"}), 404
+    return jsonify(folder)
 
-@folder_bp.route('/<folder_name>', methods=['GET'])
-def get_folder(folder_name):
-    return jsonify(folder_service.get_folder_by_name(folder_name))
+@folder_bp.route('/<folder_id>/', methods=['DELETE'])
+def delete_folder(folder_id):
+    folder = folder_service.delete_folder_by_id(folder_id)
+    if not folder:
+        return jsonify({"error": "Folder not found"}), 404
+    return jsonify({"message": "Folder deleted successfully"})
 
 # folder web_urls
-@folder_bp.route('/<folder_name>/web_urls', methods=['GET'])
-def get_folder_web_urls(folder_name):
-    return jsonify(folder_service.get_web_urls(folder_name))
+@folder_bp.route('/<folder_id>/web_urls', methods=['GET'])
+def get_folder_web_urls(folder_id):
+    web_urls = folder_service.get_web_urls(folder_id)
+    if web_urls == None:
+        return jsonify({"error": "Web URLs not found"}), 404
+    return jsonify(web_urls)
 
-@folder_bp.route('/<folder_name>/web_urls/add', methods=['PUT'])
-def add_folder_web_urls(folder_name):
+@folder_bp.route('/<folder_id>/web_urls', methods=['PUT'])
+def add_folder_web_urls(folder_id):
     data = request.json
-    return jsonify(folder_service.add_web_urls(folder_name, data['web_urls']))
+    folder = folder_service.add_web_urls(folder_id, data['web_urls'])
+    if not folder:
+        return jsonify({"error": "Folder not found"}), 404
+    return jsonify(folder)
 
-@folder_bp.route('/<folder_name>/web_urls/delete', methods=['PUT'])
-def delete_folder_web_urls(folder_name):
-    data = request.json
-    return jsonify(folder_service.delete_web_urls(folder_name, data['web_urls'])) 
+@folder_bp.route('/<folder_id>/web_urls', methods=['DELETE'])
+def delete_folder_web_urls(folder_id):
+    folder = folder_service.delete_web_urls(folder_id)
+    if not folder:
+        return jsonify({"error": "Folder not found"}), 404
+    return jsonify(folder)
 
 # folder image_urls
-@folder_bp.route('/<folder_name>/image_urls', methods=['GET'])
-def get_folder_image_urls(folder_name):
-    return jsonify(folder_service.get_image_urls(folder_name))
+@folder_bp.route('/<folder_id>/image_urls', methods=['GET'])
+def get_folder_image_urls(folder_id):
+    image_urls = folder_service.get_image_urls(folder_id)
+    if image_urls == None:
+        return jsonify({"error": "Image URLs not found"}), 404
+    return jsonify(image_urls)
 
-@folder_bp.route('/<folder_name>/image_urls/add', methods=['PUT'])
-def add_folder_image_urls(folder_name):
+@folder_bp.route('/<folder_id>/image_urls', methods=['PUT'])
+def add_folder_image_urls(folder_id):
     data = request.json
-    return jsonify(folder_service.add_image_urls(folder_name, data['image_urls']))
+    folder = folder_service.add_image_urls(folder_id, data['image_urls'])
+    if not folder:
+        return jsonify({"error": "Folder not found"}), 404
+    return jsonify(folder)
 
-@folder_bp.route('/<folder_name>/image_urls/delete', methods=['PUT'])
-def delete_folder_image_urls(folder_name):
-    data = request.json
-    return jsonify(folder_service.delete_image_urls(folder_name, data['image_urls'])) 
+
+@folder_bp.route('/<folder_id>/image_urls', methods=['DELETE'])
+def delete_folder_image_urls(folder_id):
+    folder = folder_service.delete_image_urls(folder_id)
+    if not folder:
+        return jsonify({"error": "Folder not found"}), 404
+    return jsonify(folder)
 
 # folder download_urls
-@folder_bp.route('/<folder_name>/download_urls', methods=['GET'])
-def get_folder_download_urls(folder_name):
-    return jsonify(folder_service.get_download_urls(folder_name))
+@folder_bp.route('/<folder_id>/download_urls', methods=['GET'])
+def get_folder_download_urls(folder_id):
+    download_urls = folder_service.get_download_urls(folder_id)
+    if download_urls == None:
+        return jsonify({"error": "Download URLs not found"}), 404
+    return jsonify(download_urls)
 
-@folder_bp.route('/<folder_name>/download_urls/add', methods=['PUT'])
-def add_folder_download_urls(folder_name):
+@folder_bp.route('/<folder_id>/download_urls', methods=['PUT'])
+def add_folder_download_urls(folder_id):
     data = request.json
-    return jsonify(folder_service.add_download_urls(folder_name, data['download_urls']))
+    folder = folder_service.add_download_urls(folder_id, data['download_urls'])
+    if not folder:
+        return jsonify({"error": "Folder not found"}), 404
+    return jsonify(folder)
 
-@folder_bp.route('/<folder_name>/download_urls/delete', methods=['PUT'])
-def delete_folder_download_urls(folder_name):
-    data = request.json
-    return jsonify(folder_service.delete_download_urls(folder_name, data['download_urls'])) 
+@folder_bp.route('/<folder_id>/download_urls', methods=['DELETE'])
+def delete_folder_download_urls(folder_id):
+    folder = folder_service.delete_download_urls(folder_id)
+    if not folder:
+        return jsonify({"error": "Folder not found"}), 404
+    return jsonify(folder)

backend/app/routes/oauth.py

@@ -0,0 +1,27 @@
+from flask import Blueprint, request, jsonify
+from services.oauth import OAuthService
+
+oauth_bp = Blueprint('oauth_bp', __name__)
+oauth_service = OAuthService()
+
+# testing
+@oauth_bp.route('/', methods=['GET'])
+def default():
+    return 'Testing OAuth!'
+
+@oauth_bp.route('/google/login', methods=['GET'])
+def google_login():
+    return oauth_service.google_login()
+
+@oauth_bp.route('/google/callback', methods=['GET', 'POST'])  # Allow both GET and POST
+def google_callback():
+    if request.method == 'POST':
+        code = request.json.get('code')
+        if code:
+            return oauth_service.google_callback()
+    return oauth_service.google_callback()
+
+@oauth_bp.route('/logout', methods=['GET', 'POST'])
+def logout():
+    return oauth_service.logout()
+

backend/app/routes/search.py

@@ -0,0 +1,13 @@
+from flask import Blueprint, request, jsonify
+
+from services.search import SearchService
+
+search_bp = Blueprint('search_bp', __name__)
+search_service = SearchService()
+
+@search_bp.route('/', methods=['GET'])
+def search():
+    query = request.args.get('q')
+    res = search_service.search(query)
+    print(111, res)
+    return jsonify(res), 200

backend/app/routes/user.py

@@ -1,5 +1,4 @@
 from flask import Blueprint, jsonify, request
-from utils.db import CosmosDB
 from services.user import UserService
 
 user_bp = Blueprint('user_bp', __name__)
@@ -29,12 +28,12 @@ def create_user():
     data = request.get_json()
     email = data.get('email')
     name = data.get('name')
-    
+
     if not email or not name:
         return jsonify({"error": "Email and name are required"}), 400
-    
+
     user = user_service.create_user(email, name)
-    return jsonify(user.to_dict()), 201
+    return jsonify(user), 201
 
 @user_bp.route('/<user_id>', methods=['PUT'])
 def update_user_by_id(user_id):
@@ -48,6 +47,7 @@ def update_user_by_id(user_id):
 def update_user_by_email(email):
     data = request.get_json()
     user = user_service.update_user_by_email(email, data)
+    print('User:', user)
     if not user:
         return jsonify({"error": "User not found"}), 404
     return jsonify(user)