sartography
/
cr-connect-workflow
mirror of https://github.com/sartography/cr-connect-workflow.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into rrt/dev

This commit is contained in:
Aaron Louie 2020-05-16 11:40:18 -04:00
parent 01377bd2bf 183a2c5d66
commit d38da4d063
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/default.py
View File

@ -7,7 +7,7 @@ basedir = os.path.abspath(os.path.dirname(__file__))
JSON_SORT_KEYS = False # CRITICAL. Do not sort the data when returning values to the front end.
NAME = "CR Connect Workflow"
FLASK_PORT = environ.get('FLASK_PORT', default="5000")
FLASK_PORT = environ.get('PORT_0') or environ.get('FLASK_PORT', default="5000")
CORS_ALLOW_ORIGINS = re.split(r',\s*', environ.get('CORS_ALLOW_ORIGINS', default="localhost:4200, localhost:5002"))
DEVELOPMENT = environ.get('DEVELOPMENT', default="true") == "true"
TESTING = environ.get('TESTING', default="false") == "true"

4
crc/__init__.py
View File

@ -40,9 +40,7 @@ connexion_app.add_api('api.yml')
# Convert list of allowed origins to list of regexes
origins_re = [r"^https?:\/\/%s(.*)" % o.replace('.', '\.') for o in app.config['CORS_ALLOW_ORIGINS']]
logging.getLogger('flask_cors').level = logging.DEBUG
cors = CORS(connexion_app.app)
# cors = CORS(connexion_app.app, origins=origins_re)
cors = CORS(connexion_app.app, origins=origins_re)
@app.cli.command()