Commit 3afa128e authored by Luca Braun's avatar Luca Braun

Merge branch 'feature/https-redirect' into develop

parents 52f64f8d df05e7c7
...@@ -16,10 +16,19 @@ import connexion ...@@ -16,10 +16,19 @@ import connexion
from security import swagger_util from security import swagger_util
from pathlib import Path from pathlib import Path
from env_info import is_running_locally, get_resources_path from env_info import is_running_locally, get_resources_path
from flask import request
from flask import redirect
# load swagger config # load swagger config
app = connexion.App(__name__, specification_dir='configs/') app = connexion.App(__name__, specification_dir='configs/')
@app.app.before_request
def before_request():
if request.url.startswith('http://'):
url = request.url.replace('http://', 'https://', 1)
code = 301
return redirect(url, code=code)
@app.route('/', methods=['GET']) @app.route('/', methods=['GET'])
def api_root(): def api_root():
return 'Endpoint of role-stage-discovery-microservice!' return 'Endpoint of role-stage-discovery-microservice!'
......
...@@ -19,6 +19,8 @@ from security import swagger_util ...@@ -19,6 +19,8 @@ from security import swagger_util
from env_info import is_running_locally, get_resources_path from env_info import is_running_locally, get_resources_path
from messaging.ReconnectingMessageManager import ReconnectingMessageManager from messaging.ReconnectingMessageManager import ReconnectingMessageManager
from messaging.MessageHandler import MessageHandler from messaging.MessageHandler import MessageHandler
from flask import request
from flask import redirect
# init message handler # init message handler
from db.repository import Repository from db.repository import Repository
...@@ -29,6 +31,13 @@ def message_received_callback(channel, method, properties, body): ...@@ -29,6 +31,13 @@ def message_received_callback(channel, method, properties, body):
# load swagger config # load swagger config
app = connexion.App(__name__, specification_dir='configs/') app = connexion.App(__name__, specification_dir='configs/')
@app.app.before_request
def before_request():
if request.url.startswith('http://'):
url = request.url.replace('http://', 'https://', 1)
code = 301
return redirect(url, code=code)
@app.route('/', methods=['GET']) @app.route('/', methods=['GET'])
def api_root(): def api_root():
return 'Endpoint of semantic-linking-microservice!' return 'Endpoint of semantic-linking-microservice!'
......
...@@ -12,11 +12,20 @@ if os.path.exists(modules_path): ...@@ -12,11 +12,20 @@ if os.path.exists(modules_path):
import connexion import connexion
from security import swagger_util from security import swagger_util
from env_info import is_running_locally, get_resources_path from env_info import is_running_locally, get_resources_path
from flask import request
from flask import redirect
app = connexion.App(__name__, specification_dir='configs/') app = connexion.App(__name__, specification_dir='configs/')
from db.entities.layer_adapter import LayerAdapter from db.entities.layer_adapter import LayerAdapter
@app.app.before_request
def before_request():
if request.url.startswith('http://'):
url = request.url.replace('http://', 'https://', 1)
code = 301
return redirect(url, code=code)
@app.route('/', methods=['GET']) @app.route('/', methods=['GET'])
def api_root(): def api_root():
return 'Endpoint of business-logic-microservice!' return 'Endpoint of business-logic-microservice!'
......
...@@ -20,9 +20,18 @@ LOGGER = logging.getLogger(__name__) ...@@ -20,9 +20,18 @@ LOGGER = logging.getLogger(__name__)
import connexion import connexion
from security import swagger_util from security import swagger_util
from env_info import is_running_locally, get_resources_path from env_info import is_running_locally, get_resources_path
from flask import request
from flask import redirect
app = connexion.App(__name__, specification_dir='configs/') app = connexion.App(__name__, specification_dir='configs/')
@app.app.before_request
def before_request():
if request.url.startswith('http://'):
url = request.url.replace('http://', 'https://', 1)
code = 301
return redirect(url, code=code)
@app.route('/', methods=['GET']) @app.route('/', methods=['GET'])
def api_root(): def api_root():
return 'Endpoint of SMART RESTful API Gateway!' return 'Endpoint of SMART RESTful API Gateway!'
...@@ -41,4 +50,4 @@ else: ...@@ -41,4 +50,4 @@ else:
# start app # start app
if __name__ == '__main__': if __name__ == '__main__':
app.run(host='0.0.0.0', port=5000, debug=True, use_reloader=False, ssl_context=context) # disable reloader so only subscribed once to rabbitmq app.run(host='0.0.0.0', port=5000, debug=True, use_reloader=False, ssl_context=context) # disable reloader so only subscribed once to rabbitmqö
\ No newline at end of file \ No newline at end of file
...@@ -23,6 +23,8 @@ from database.repository import Repository ...@@ -23,6 +23,8 @@ from database.repository import Repository
from messaging.MessageHandler import MessageHandler from messaging.MessageHandler import MessageHandler
from messaging.ReconnectingMessageManager import ReconnectingMessageManager from messaging.ReconnectingMessageManager import ReconnectingMessageManager
from messaging.rest_fetcher import RestFetcher from messaging.rest_fetcher import RestFetcher
from flask import request
from flask import redirect
# init message handler # init message handler
message_handler = MessageHandler(Repository(), ReconnectingMessageManager.getInstance(), RestFetcher()) message_handler = MessageHandler(Repository(), ReconnectingMessageManager.getInstance(), RestFetcher())
...@@ -32,6 +34,13 @@ def message_received_callback(channel, method, properties, body): ...@@ -32,6 +34,13 @@ def message_received_callback(channel, method, properties, body):
# load swagger config # load swagger config
app = connexion.App(__name__, specification_dir='configs/') app = connexion.App(__name__, specification_dir='configs/')
@app.app.before_request
def before_request():
if request.url.startswith('http://'):
url = request.url.replace('http://', 'https://', 1)
code = 301
return redirect(url, code=code)
@app.route('/', methods=['GET']) @app.route('/', methods=['GET'])
def api_root(): def api_root():
return 'Endpoint of trace-retrieval-microservice!' return 'Endpoint of trace-retrieval-microservice!'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment