From db73a51c7485387ada4fcd0523126d2909950059 Mon Sep 17 00:00:00 2001 From: Vlad Stan Date: Thu, 19 Jan 2023 12:16:44 +0200 Subject: [PATCH] feat: allow regular users to view the `install` page --- lnbits/core/templates/core/extensions.html | 9 ++++++- lnbits/core/templates/core/install.html | 30 ++++++++++++---------- lnbits/core/views/generic.py | 17 ++++++------ 3 files changed, 32 insertions(+), 24 deletions(-) diff --git a/lnbits/core/templates/core/extensions.html b/lnbits/core/templates/core/extensions.html index c7ebbf91..87ef58da 100644 --- a/lnbits/core/templates/core/extensions.html +++ b/lnbits/core/templates/core/extensions.html @@ -5,7 +5,6 @@
+
-
- - Manage - -
-
- +
+
+ + Manage + +
+
+ +
diff --git a/lnbits/core/views/generic.py b/lnbits/core/views/generic.py index 06416b2e..bfd49f32 100644 --- a/lnbits/core/views/generic.py +++ b/lnbits/core/views/generic.py @@ -71,7 +71,7 @@ async def extensions( ) async def extensions_install( request: Request, - user: User = Depends(check_admin), + user: User = Depends(check_user_exists), activate: str = Query(None), deactivate: str = Query(None), ): @@ -101,15 +101,14 @@ async def extensions_install( installable_exts = [] try: - if deactivate: - settings.lnbits_disabled_extensions += [deactivate] - elif activate: - settings.lnbits_disabled_extensions = list( - filter(lambda e: e != activate, settings.lnbits_disabled_extensions) - ) - ext_id = activate or deactivate - if ext_id: + if ext_id and user.admin: + if deactivate: + settings.lnbits_disabled_extensions += [deactivate] + elif activate: + settings.lnbits_disabled_extensions = list( + filter(lambda e: e != activate, settings.lnbits_disabled_extensions) + ) await update_installed_extension_state( ext_id=ext_id, active=activate != None )