diff --git a/backend/application/__init__.py b/backend/application/__init__.py index af2f4ce..b68cd09 100644 --- a/backend/application/__init__.py +++ b/backend/application/__init__.py @@ -1,5 +1,6 @@ from flask import Flask from flask_sqlalchemy import SQLAlchemy +from flask_cors import CORS import sys db = SQLAlchemy() @@ -7,6 +8,10 @@ db = SQLAlchemy() def create_app(flask_env='development'): app = Flask(__name__, instance_relative_config=False) + origin = app.config.get('ALLOW_ORIGIN') + if origin is None: + origin = ['http://127.0.0.1:4200', 'http://localhost:4200'] + CORS(app, supports_credentials=True, origins=origin) if flask_env == 'production': app.config.from_object("config.ProductionConfig") elif flask_env == 'testing': diff --git a/backend/application/routes.py b/backend/application/routes.py index 48f726d..70d5160 100644 --- a/backend/application/routes.py +++ b/backend/application/routes.py @@ -1,16 +1,10 @@ -from flask import current_app as app from flask import request, Blueprint -from flask_cors import CORS from werkzeug.exceptions import HTTPException from .responses import send_message, send_error from .api_functions import db_login, db_register, db_user_update, db_create_log, db_user_delete, db_admin_update_user, db_users from .sessionJWT import create_auth_token, check_auth_token bp = Blueprint('myapp', __name__) -origin = app.config.get('ALLOW_ORIGIN') -if origin is None: - origin = ['http://127.0.0.1:4200', 'http://localhost:4200'] -CORS(bp, supports_credentials=True, origins=origin) @bp.app_errorhandler(HTTPException)