bump version SwaggerUI. (#27)

* bump version SwaggerUI.

Author: flask-pro

CHANGES.md

@@ -1,3 +1,7 @@
+## Version 0.14.5
+
+* Bump version SwaggerUI.
+
 ## Version 0.14.4
 
 * Fix url data format.

pyproject.toml

@@ -22,7 +22,7 @@ license = {file = "LICENSE"}
 name = "Flask-First"
 readme = "README.md"
 requires-python = ">=3.9"
-version = "0.14.4"
+version = "0.14.5"
 
 [project.optional-dependencies]
 dev = [

src/flask_first/__init__.py

@@ -4,14 +4,10 @@
 from typing import Any
 
 import marshmallow
-from flask import Blueprint
 from flask import Flask
-from flask import render_template
 from flask import Request
 from flask import request
 from flask import Response
-from flask import send_file
-from flask import url_for
 from marshmallow.exceptions import ValidationError
 from werkzeug.datastructures import Headers
 from werkzeug.datastructures import MultiDict
@@ -21,6 +17,7 @@
 from .first.exceptions import FirstException
 from .first.exceptions import FirstResponseJSONValidation
 from .first.exceptions import FirstValidation
+from .swagger_ui import add_swagger_ui_blueprint
 
 
 class First:
@@ -130,29 +127,6 @@ def _arg_to_list(self, args: dict, schema_fields: dict) -> dict:
 
         return args
 
-    def _registration_swagger_ui_blueprint(self, swagger_ui_path: str or Path) -> None:
-        swagger_ui = Blueprint(
-            'swagger_ui',
-            __name__,
-            static_folder='static',
-            template_folder='templates',
-            url_prefix=swagger_ui_path,
-        )
-
-        @swagger_ui.add_app_template_global
-        def swagger_ui_static(filename):
-            return url_for('swagger_ui.static', filename=filename)
-
-        @swagger_ui.route('/')
-        def swagger_ui_page():
-            return render_template('swagger_ui/index.html', path_to_spec=self.path_to_spec)
-
-        @swagger_ui.route('/openapi.yaml')
-        def get_file_spec():
-            return send_file(self.path_to_spec)
-
-        self.app.register_blueprint(swagger_ui)
-
     def _register_request_validation(self) -> None:
         @self.app.before_request
         def add_request_validating() -> None:
@@ -269,7 +243,7 @@ def init_app(self, app: Flask) -> None:
         self.app.extensions['first'] = self
 
         if self.swagger_ui_path:
-            self._registration_swagger_ui_blueprint(self.swagger_ui_path)
+            add_swagger_ui_blueprint(self.app, self.path_to_spec, self.swagger_ui_path)
 
         self._register_request_validation()
 

src/flask_first/static/swagger_ui/oauth2-redirect.html

@@ -13,7 +13,7 @@
         var isValid, qp, arr;
 
         if (/code|token|error/.test(window.location.hash)) {
-            qp = window.location.hash.substring(1);
+            qp = window.location.hash.substring(1).replace('?', '&');
         } else {
             qp = location.search.substring(1);
         }
@@ -38,7 +38,7 @@
                     authId: oauth2.auth.name,
                     source: "auth",
                     level: "warning",
-                    message: "Authorization may be unsafe, passed state was changed in server Passed state wasn't returned from auth server"
+                    message: "Authorization may be unsafe, passed state was changed in server. The passed state wasn't returned from auth server."
                 });
             }
 
@@ -58,7 +58,7 @@
                     authId: oauth2.auth.name,
                     source: "auth",
                     level: "error",
-                    message: oauthErrorMsg || "[Authorization failed]: no accessCode received from the server"
+                    message: oauthErrorMsg || "[Authorization failed]: no accessCode received from the server."
                 });
             }
         } else {