Merge remote-tracking branch 'gitlab/master'

2 files changed, 11 insertions, 5 deletions

diff --git a/main.py b/main.py
index 838d971b..22a5e772 100644
--- a/main.py
+++ b/main.py
@@ -9,6 +9,7 @@ import urllib2
 from flask import Flask, request, send_from_directory, jsonify
 from flask_compress import Compress
 from oauth2client import client, crypt
+from flask_cors import CORS
 
 from opendc.models.user import User
 from opendc.util import exceptions, rest, path_parser, database
@@ -28,12 +29,16 @@ database.init_connection_pool(user=KEYS['MYSQL_USER'], password=KEYS['MYSQL_PASS
 
 FLASK_CORE_APP = Flask(__name__, static_url_path='', static_folder=STATIC_ROOT)
 FLASK_CORE_APP.config['SECREY_KEY'] = KEYS['FLASK_SECRET']
+if 'localhost' in KEYS['SERVER_BASE_URL']:
+    CORS(FLASK_CORE_APP)
 
 compress = Compress()
 compress.init_app(FLASK_CORE_APP)
 
-SOCKET_IO_CORE = flask_socketio.SocketIO(FLASK_CORE_APP)
-
+if 'localhost' in KEYS['SERVER_BASE_URL']:
+    SOCKET_IO_CORE = flask_socketio.SocketIO(FLASK_CORE_APP, cors_allowed_origins="*")
+else:
+    SOCKET_IO_CORE = flask_socketio.SocketIO(FLASK_CORE_APP)
 
 @FLASK_CORE_APP.errorhandler(404)
 def page_not_found(e):
diff --git a/setup.py b/setup.py
index 7da6bcc2..65065414 100644
--- a/setup.py
+++ b/setup.py
@@ -34,11 +34,12 @@ setup(
     packages=['opendc'],
 
     install_requires=[
-        'Flask==1.0.2',
-        'Flask-SocketIO==3.0.2',
+        'flask==1.0.2',
+        'flask-socketio==3.0.2',
         'oauth2client==4.1.3',
         'eventlet==0.24.1',
-        'Flask-Compress==1.4.0',
+        'flask-compress==1.4.0',
+        'flask-cors==3.0.8',
         'mysql-connector-python-rf==2.2.2',
         'pyasn1-modules==0.2.2',
         'six==1.11.0'