removed flask-restplus and replaced with flask-restx

This commit is contained in:
2020-02-24 09:26:47 +01:00
parent 1745f56ac7
commit 6ba38cd42d
14 changed files with 29 additions and 21 deletions

View File

@@ -11,11 +11,10 @@ from typing import Union
import coloredlogs as coloredlogs
import jwt
import requests
from flask import Flask, jsonify
from flask import Flask, jsonify, abort
from flask_httpauth import HTTPTokenAuth, HTTPBasicAuth, MultiAuth
from flask_jwt_extended import JWTManager, decode_token
from flask_login import LoginManager
from flask_restplus import abort
from flask_sqlalchemy import SQLAlchemy
from flask_cors import CORS
from backend.config import Config
@@ -179,5 +178,5 @@ app.register_blueprint(fe_bp)
CORS(app)
CORS(api_bp)
# Fix flask-restplus by duck typing error handlers
# Fix jwt_extended by duck typing error handlers
jwt_extended._set_error_handler_callbacks(api_v1)

View File

@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
from flask import Blueprint, abort
from flask_restplus import Api, Namespace
from flask_restx import Api, Namespace
api_authorizations = {
'apikey': {

View File

@@ -21,7 +21,7 @@ from random import randint
from flask_login import logout_user, login_user
from typing import Iterable
from flask_restplus import Resource, fields
from flask_restx import Resource, fields
from werkzeug.routing import BuildError
from backend import db, app, jwt_extended

View File

@@ -9,7 +9,7 @@ import json
from datetime import datetime
from flask_jwt_extended import jwt_required, get_current_user, get_jwt_claims
from flask_restplus import fields, Resource
from flask_restx import fields, Resource
from backend import db
from backend.api import api_control, get_jwt_identity, Recorder, RecorderCommand, pprint

View File

@@ -5,7 +5,7 @@ import json
import logging
from random import *
from flask import jsonify, Blueprint, request
from flask_restplus import Resource, reqparse
from flask_restx import Resource, reqparse
from backend import basic_auth, multi_auth, db, jwt_auth
from backend.api import api_v1, api_bp

View File

@@ -6,7 +6,7 @@ For example: listing of available auth providers or registration of users.
Login through API does not start a new session, but instead returns JWT.
"""
from flask_jwt_extended import jwt_required
from flask_restplus import fields, Resource
from flask_restx import fields, Resource
from backend import db
from backend.api import api_group

View File

@@ -1,4 +1,4 @@
from flask_restplus import fields
from flask_restx import fields
from backend.api import api_user, api_recorder, api_v1
generic_id_parser = api_v1.parser()

View File

@@ -6,7 +6,7 @@ For example: listing of available auth providers or registration of users.
Login through API does not start a new session, but instead returns JWT.
"""
from flask_jwt_extended import jwt_required
from flask_restplus import fields, Resource
from flask_restx import fields, Resource
from backend import db
from backend.api import api_permissions

View File

@@ -9,7 +9,7 @@ from datetime import datetime
from pprint import pprint
from flask_jwt_extended import jwt_required
from flask_restplus import fields, Resource, inputs
from flask_restx import fields, Resource, inputs
from backend import db, app
from backend.api import api_recorder

View File

@@ -6,7 +6,7 @@ For example: listing of available auth providers or registration of users.
Login through API does not start a new session, but instead returns JWT.
"""
from flask_jwt_extended import jwt_required
from flask_restplus import fields, Resource
from flask_restx import fields, Resource
from sqlalchemy import exc
from backend import db, app

View File

@@ -9,7 +9,7 @@ from datetime import datetime
from pprint import pprint
from flask_jwt_extended import get_jwt_identity, jwt_required, current_user
from flask_restplus import Resource, fields, inputs, abort
from flask_restx import Resource, fields, inputs, abort
from backend import db, app, jwt_auth
from backend.api import api_user

View File

@@ -10,7 +10,7 @@ import pkgutil
from pprint import pprint
from flask_jwt_extended import jwt_required
from flask_restplus import fields, Resource
from flask_restx import fields, Resource
from backend import db, app
from backend.api import api_virtual_command