Merge remote-tracking branch 'origin/main' into feature/api_permission_cleanup

This commit is contained in:
jasquat 2022-12-06 09:04:16 -05:00
commit 4a7af4a1db
1 changed files with 4 additions and 1 deletions

View File

@ -104,11 +104,14 @@ def create_app() -> flask.app.Flask:
app.register_blueprint(api_error_blueprint) app.register_blueprint(api_error_blueprint)
app.register_blueprint(admin_blueprint, url_prefix="/admin") app.register_blueprint(admin_blueprint, url_prefix="/admin")
# preflight options requests will be allowed if they meet the requirements of the url regex.
# we will add an Access-Control-Max-Age header to the response to tell the browser it doesn't
# need to continually keep asking for the same path.
origins_re = [ origins_re = [
r"^https?:\/\/%s(.*)" % o.replace(".", r"\.") r"^https?:\/\/%s(.*)" % o.replace(".", r"\.")
for o in app.config["CORS_ALLOW_ORIGINS"] for o in app.config["CORS_ALLOW_ORIGINS"]
] ]
CORS(app, origins=origins_re) CORS(app, origins=origins_re, max_age=3600)
connexion_app.add_api("api.yml", base_path="/v1.0") connexion_app.add_api("api.yml", base_path="/v1.0")