From c8b01b450bb2a597cbb36208aee5ade0559fc169 Mon Sep 17 00:00:00 2001 From: Tobias Kurze Date: Tue, 12 Mar 2019 16:48:01 +0100 Subject: [PATCH] added __main__.py and corrected import order in __init__.py --- __init__.py | 9 +++++---- __main__.py | 13 +++++++++++++ api/example_api.py | 2 +- 3 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 __main__.py diff --git a/__init__.py b/__init__.py index 42ea4d6..af93763 100644 --- a/__init__.py +++ b/__init__.py @@ -4,14 +4,15 @@ Backend base module """ from flask import Flask -from flask_httpauth import HTTPTokenAuth, HTTPBasicAuth +from flask_httpauth import HTTPTokenAuth, HTTPBasicAuth, MultiAuth from flask_sqlalchemy import SQLAlchemy -from .serve_frontend import fe_bp -from .api import api_bp - jwt_auth = HTTPTokenAuth() basic_auth = HTTPBasicAuth() +multi_auth = MultiAuth(basic_auth, jwt_auth) + +from .serve_frontend import fe_bp +from .api import api_bp app = Flask(__name__) app.register_blueprint(api_bp) diff --git a/__main__.py b/__main__.py new file mode 100644 index 0000000..099d973 --- /dev/null +++ b/__main__.py @@ -0,0 +1,13 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +# Copyright (c) 2019. Tobias Kurze +from backend import app + + +def main(): + app.run(debug=True) + + +if __name__ == '__main__': + main() diff --git a/api/example_api.py b/api/example_api.py index 41b4896..5956f9c 100644 --- a/api/example_api.py +++ b/api/example_api.py @@ -3,7 +3,7 @@ from random import * from flask import jsonify, Blueprint from flask_restplus import Resource, reqparse -from backend import basic_auth +from backend import basic_auth, multi_auth from backend.api import api_v1, api_bp