Update asynccasbin to casbin async api (#199)

* Update asynccasbin to casbin async api

* remove pymysql dependency

* update the test-user test to admin

Author: wu-clan

backend/app/common/rbac.py

@@ -15,14 +15,14 @@
 
 class RBAC:
     @staticmethod
-    async def enforcer() -> casbin.Enforcer:
+    async def enforcer() -> casbin.AsyncEnforcer:
         """
         获取 casbin 执行器
 
         :return:
         """
         adapter = casbin_async_sqlalchemy_adapter.Adapter(async_engine, db_class=CasbinRule)
-        enforcer = casbin.Enforcer(RBAC_MODEL_CONF, adapter)
+        enforcer = casbin.AsyncEnforcer(RBAC_MODEL_CONF, adapter)
         await enforcer.load_policy()
         return enforcer
 

backend/app/services/casbin_service.py

@@ -25,13 +25,13 @@ async def get_casbin_list(*, ptype: str, sub: str) -> Select:
     @staticmethod
     async def get_policy_list():
         enforcer = await RBAC.enforcer()
-        data = await enforcer.get_policy()
+        data = enforcer.get_policy()
         return data
 
     @staticmethod
     async def get_policy_list_by_role(*, role: str):
         enforcer = await RBAC.enforcer()
-        data = await enforcer.get_filtered_named_policy('p', 0, role)
+        data = enforcer.get_filtered_named_policy('p', 0, role)
         return data
 
     @staticmethod
@@ -53,7 +53,7 @@ async def create_policies(*, ps: list[CreatePolicy]):
     @staticmethod
     async def update_policy(*, old: UpdatePolicy, new: UpdatePolicy):
         enforcer = await RBAC.enforcer()
-        _p = await enforcer.has_policy(old.sub, old.path, old.method)
+        _p = enforcer.has_policy(old.sub, old.path, old.method)
         if not _p:
             raise errors.NotFoundError(msg='权限不存在')
         data = await enforcer.update_policy([old.sub, old.path, old.method], [new.sub, new.path, new.method])
@@ -70,7 +70,7 @@ async def update_policies(*, old: list[UpdatePolicy], new: list[UpdatePolicy]):
     @staticmethod
     async def delete_policy(*, p: DeletePolicy):
         enforcer = await RBAC.enforcer()
-        _p = await enforcer.has_policy(p.sub, p.path, p.method)
+        _p = enforcer.has_policy(p.sub, p.path, p.method)
         if not _p:
             raise errors.NotFoundError(msg='权限不存在')
         data = await enforcer.remove_policy(p.sub, p.path, p.method)
@@ -115,7 +115,7 @@ async def create_groups(*, gs: list[CreateUserRole]):
     @staticmethod
     async def delete_group(*, g: DeleteUserRole):
         enforcer = await RBAC.enforcer()
-        _g = await enforcer.has_grouping_policy(g.uuid, g.role)
+        _g = enforcer.has_grouping_policy(g.uuid, g.role)
         if not _g:
             raise errors.NotFoundError(msg='权限不存在')
         data = await enforcer.remove_grouping_policy(g.uuid, g.role)

backend/app/services/menu_service.py

@@ -44,8 +44,8 @@ async def get_user_menu_tree(*, request: Request):
             if roles:
                 for role in roles:
                     menu_ids.extend([menu.id for menu in role.menus])
-            menu_select = await MenuDao.get_role_menus(db, request.user.is_superuser, menu_ids)
-            menu_tree = await get_tree_data(menu_select)
+                menu_select = await MenuDao.get_role_menus(db, request.user.is_superuser, menu_ids)
+                menu_tree = await get_tree_data(menu_select)
             return menu_tree
 
     @staticmethod

backend/app/tests/api_v1/test_auth.py

@@ -7,8 +7,8 @@
 
 def test_login(client: TestClient) -> None:
     data = {
-        'username': 'test',
-        'password': 'test',
+        'username': 'admin',
+        'password': '123456',
     }
     response = client.post(f'{settings.API_V1_STR}/auth/login', json=data)
     assert response.status_code == 200

backend/app/tests/conftest.py

@@ -25,4 +25,4 @@ def client() -> Generator:
 
 @pytest.fixture(scope='module')
 def token_headers(client: TestClient) -> Dict[str, str]:
-    return get_token_headers(client=client, username='test', password='test')
+    return get_token_headers(client=client, username='admin', password='123456')

backend/sql/init_test_data.sql

@@ -3,8 +3,8 @@ VALUES (1, 'test', 0, 0, null, null, null, 1, 0, null, '2023-06-26 17:13:45', nu
 
 insert into fba.sys_menu (id, title, name, level, sort, icon, path, menu_type, component, perms, status, `show`, cache, remark, parent_id, created_time, updated_time)
 values  (1, '测试', 'test', 0, 0, '', null, 0, null, null, 0, 0, 1, null, null, '2023-07-27 19:14:10', '2023-07-27 19:14:52'),
-        (2, '仪表盘', 'dashboard', 0, 0, 'IconDashboard', 'dashboard', 1, '/dashboard/workplace/index.vue', null, 1, 1, 1, null, null, '2023-07-27 19:15:45', null),
-        (3, '工作台', 'Workplace', 0, 0, null, 'workplace', 0, null, null, 1, 1, 1, null, 2, '2023-07-27 19:17:59', null),
+        (2, '仪表盘', 'dashboard', 0, 0, 'IconDashboard', 'dashboard', 0, null, null, 1, 1, 1, null, null, '2023-07-27 19:15:45', null),
+        (3, '工作台', 'Workplace', 0, 0, null, 'workplace', 1, '/dashboard/workplace/index.vue', null, 1, 1, 1, null, 2, '2023-07-27 19:17:59', null),
         (4, 'arco官网', 'arcoWebsite', 0, 888, 'IconLink', 'https://arco.design', 1, null, null, 1, 1, 1, null, null, '2023-07-27 19:19:23', null),
         (5, '日志', 'log', 0, 66, 'IconBug', 'log', 0, null, null, 1, 1, 1, null, null, '2023-07-27 19:19:59', null),
         (6, '登录日志', 'Login', 0, 0, null, 'login', 1, '/log/login/index.vue', null, 1, 1, 1, null, 5, '2023-07-27 19:20:56', null),
@@ -26,8 +26,9 @@ VALUES (1, 'test', 2, 1, null, '2023-06-26 17:13:45', null);
 INSERT INTO fba.sys_role_menu (id, role_id, menu_id)
 VALUES (1, 1, 1);
 
+-- 密码明文：123456
 INSERT INTO fba.sys_user (id, uuid, username, nickname, password, salt, email, is_superuser, is_staff, status, is_multi_login, avatar, phone, join_time, last_login_time, dept_id, created_time, updated_time)
-VALUES (1, 'af4c804f-3966-4949-ace2-3bb7416ea926', 'test', 'test', '$2b$12$eYLKJttq2/e66er1VK7NFezNIYkAu.XTGrJppJpqOW1DHmbcBf5ou', 'NvxNx', 'test@example.com', 1, 1, 1, 0, null, null, '2023-06-26 17:13:45', null, 1, '2023-06-26 17:13:45', null);
+VALUES (1, 'af4c804f-3966-4949-ace2-3bb7416ea926', 'admin', '用户88888', '$2b$12$RJXAtJodRw37ZQGxTPlu0OH.aN5lNXG6yvC4Tp9GIQEBmMY/YCc.m', 'bcNjV', 'admin@example.com', 1, 1, 1, 0, null, null, '2023-06-26 17:13:45', null, 1, '2023-06-26 17:13:45', null);
 
 INSERT INTO fba.sys_user_role (id, user_id, role_id)
 VALUES (1, 1, 1);

requirements.txt

@@ -3,10 +3,10 @@ aiosmtplib==1.1.6
 alembic==1.7.4
 APScheduler==3.8.1
 asgiref==3.7.2
-asynccasbin==1.1.8
 asyncmy==0.2.5
 bcrypt==3.2.2
-casbin_async_sqlalchemy_adapter==1.2.0
+casbin==1.23.0
+casbin_async_sqlalchemy_adapter==1.3.0
 cryptography==41.0.2
 email-validator==1.1.3
 Faker==9.7.1
@@ -22,7 +22,6 @@ path==15.1.2
 pre-commit==3.2.2
 psutil==5.9.5
 pydantic==1.10.5
-pymysql==0.9.3
 pytest==7.2.2
 pytest-pretty==1.2.0
 python-jose==3.3.0