From 31c11af0fba6bd2f18810d0362a44e40c440ddb7 Mon Sep 17 00:00:00 2001
From: Jan Mach <jan.mach@cesnet.cz>
Date: Sat, 19 Mar 2022 08:49:01 +0100
Subject: [PATCH] Merged blueprints auth_api
(Redmine issue: #7544)
---
.../blueprints/auth_api/__init__.py | 22 +++++++++----------
.../templates/auth_api/key-delete.html | 0
.../templates/auth_api/key-generate.html | 0
.../blueprints/auth_api/test/__init__.py | 20 ++++++++---------
4 files changed, 21 insertions(+), 21 deletions(-)
rename lib/{vial => hawat}/blueprints/auth_api/__init__.py (94%)
rename lib/{vial => hawat}/blueprints/auth_api/templates/auth_api/key-delete.html (100%)
rename lib/{vial => hawat}/blueprints/auth_api/templates/auth_api/key-generate.html (100%)
rename lib/{vial => hawat}/blueprints/auth_api/test/__init__.py (92%)
diff --git a/lib/vial/blueprints/auth_api/__init__.py b/lib/hawat/blueprints/auth_api/__init__.py
similarity index 94%
rename from lib/vial/blueprints/auth_api/__init__.py
rename to lib/hawat/blueprints/auth_api/__init__.py
index 4a209b8c..0580f409 100644
--- a/lib/vial/blueprints/auth_api/__init__.py
+++ b/lib/hawat/blueprints/auth_api/__init__.py
@@ -55,11 +55,11 @@ import flask_principal
from flask_babel import gettext, lazy_gettext
import hawat.const
-import vial.forms
-import vial.db
-from vial.app import VialBlueprint
-from vial.view import ItemChangeView
-from vial.view.mixin import HTMLMixin, SQLAlchemyMixin
+import hawat.forms
+import hawat.db
+from hawat.app import HawatBlueprint
+from hawat.view import ItemChangeView
+from hawat.view.mixin import HTMLMixin, SQLAlchemyMixin
BLUEPRINT_NAME = 'auth_api'
@@ -107,7 +107,7 @@ class GenerateKeyView(HTMLMixin, SQLAlchemyMixin, ItemChangeView): # pylint: di
permission_me = flask_principal.Permission(
flask_principal.UserNeed(kwargs['item'].id)
)
- return vial.acl.PERMISSION_POWER.can() or permission_me.can()
+ return hawat.acl.PERMISSION_POWER.can() or permission_me.can()
@staticmethod
def get_message_success(**kwargs):
@@ -180,7 +180,7 @@ class DeleteKeyView(HTMLMixin, SQLAlchemyMixin, ItemChangeView): # pylint: disa
permission_me = flask_principal.Permission(
flask_principal.UserNeed(kwargs['item'].id)
)
- return vial.acl.PERMISSION_POWER.can() or permission_me.can()
+ return hawat.acl.PERMISSION_POWER.can() or permission_me.can()
@staticmethod
def get_message_success(**kwargs):
@@ -211,7 +211,7 @@ class DeleteKeyView(HTMLMixin, SQLAlchemyMixin, ItemChangeView): # pylint: disa
#-------------------------------------------------------------------------------
-class APIAuthBlueprint(VialBlueprint):
+class APIAuthBlueprint(HawatBlueprint):
"""Pluggable module - API key authentication service (*auth_api*)."""
@classmethod
@@ -255,7 +255,7 @@ class APIAuthBlueprint(VialBlueprint):
# Now login the user with provided API key.
if api_key:
- dbsess = vial.db.db_session()
+ dbsess = hawat.db.db_session()
try:
user = dbsess.query(user_model).filter(user_model.apikey == api_key).one()
if user:
@@ -284,8 +284,8 @@ class APIAuthBlueprint(VialBlueprint):
def get_blueprint():
"""
- Mandatory interface for :py:mod:`vial.Vial` and factory function. This function
- must return a valid instance of :py:class:`vial.app.VialBlueprint` or
+ Mandatory interface for :py:mod:`hawat.Hawat` and factory function. This function
+ must return a valid instance of :py:class:`hawat.app.HawatBlueprint` or
:py:class:`flask.Blueprint`.
"""
diff --git a/lib/vial/blueprints/auth_api/templates/auth_api/key-delete.html b/lib/hawat/blueprints/auth_api/templates/auth_api/key-delete.html
similarity index 100%
rename from lib/vial/blueprints/auth_api/templates/auth_api/key-delete.html
rename to lib/hawat/blueprints/auth_api/templates/auth_api/key-delete.html
diff --git a/lib/vial/blueprints/auth_api/templates/auth_api/key-generate.html b/lib/hawat/blueprints/auth_api/templates/auth_api/key-generate.html
similarity index 100%
rename from lib/vial/blueprints/auth_api/templates/auth_api/key-generate.html
rename to lib/hawat/blueprints/auth_api/templates/auth_api/key-generate.html
diff --git a/lib/vial/blueprints/auth_api/test/__init__.py b/lib/hawat/blueprints/auth_api/test/__init__.py
similarity index 92%
rename from lib/vial/blueprints/auth_api/test/__init__.py
rename to lib/hawat/blueprints/auth_api/test/__init__.py
index 3ae58d9a..ec790276 100644
--- a/lib/vial/blueprints/auth_api/test/__init__.py
+++ b/lib/hawat/blueprints/auth_api/test/__init__.py
@@ -6,7 +6,7 @@
"""
-Unit tests for :py:mod:`vial.blueprints.auth_api`.
+Unit tests for :py:mod:`hawat.blueprints.auth_api`.
"""
@@ -14,18 +14,18 @@ import sys
import unittest
import hawat.const
-import vial.test
-import vial.db
-from vial.test import VialTestCase
-from vial.test.runner import TestRunnerMixin
+import hawat.test
+import hawat.db
+from hawat.test import HawatTestCase
+from hawat.test.runner import TestRunnerMixin
_IS_NOSE = sys.argv[0].endswith('nosetests')
@unittest.skipIf(_IS_NOSE, "broken under nosetest")
-class AuthAPITestCase(TestRunnerMixin, VialTestCase):
+class AuthAPITestCase(TestRunnerMixin, HawatTestCase):
"""
- Class for testing :py:mod:`vial.blueprints.auth_api` blueprint.
+ Class for testing :py:mod:`hawat.blueprints.auth_api` blueprint.
"""
def _req_key_generate(self, uid, status_code, confirm = False):
@@ -133,7 +133,7 @@ class AuthAPITestCase(TestRunnerMixin, VialTestCase):
self.assertTrue(b'My account' in response.data)
self.assertTrue(b'data-user-name="admin"' in response.data)
- @vial.test.do_as_user_decorator(hawat.const.ROLE_USER)
+ @hawat.test.do_as_user_decorator(hawat.const.ROLE_USER)
def test_02_keymng_user(self):
"""
Test, that 'user' can manage only his own API key.
@@ -142,7 +142,7 @@ class AuthAPITestCase(TestRunnerMixin, VialTestCase):
self._test_keymng_failure(hawat.const.ROLE_DEVELOPER)
self._test_keymng_failure(hawat.const.ROLE_ADMIN)
- @vial.test.do_as_user_decorator(hawat.const.ROLE_DEVELOPER)
+ @hawat.test.do_as_user_decorator(hawat.const.ROLE_DEVELOPER)
def test_03_keymng_developer(self):
"""
Test, that 'developer' can manage only his own API key.
@@ -151,7 +151,7 @@ class AuthAPITestCase(TestRunnerMixin, VialTestCase):
self._test_keymng_success(hawat.const.ROLE_DEVELOPER)
self._test_keymng_failure(hawat.const.ROLE_ADMIN)
- @vial.test.do_as_user_decorator(hawat.const.ROLE_ADMIN)
+ @hawat.test.do_as_user_decorator(hawat.const.ROLE_ADMIN)
def test_04_keymng_admin(self):
"""
Test, that 'admin' user is able to manage all API keys.
--
GitLab