Skip to content

Commit 7b952ca

Browse files
authored
feat: Add trargs to authentication plugins config (#39)
1 parent 88e3997 commit 7b952ca

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

src/qwc2_viewer.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -300,11 +300,11 @@ def qwc2_config(self, identity, params):
300300
params.get("autologin") is not None)
301301
if 'common' in config['plugins']:
302302
self.__replace_login__helper_plugins(
303-
config['plugins']['common'], signed_in, hide_login)
303+
config['plugins']['common'], signed_in, username, hide_login)
304304
self.__replace_login__helper_plugins(
305-
config['plugins']['mobile'], signed_in, hide_login)
305+
config['plugins']['mobile'], signed_in, username, hide_login)
306306
self.__replace_login__helper_plugins(
307-
config['plugins']['desktop'], signed_in, hide_login)
307+
config['plugins']['desktop'], signed_in, username, hide_login)
308308

309309
# filter any restricted viewer task items
310310
viewer_task_permissions = self.viewer_task_permissions(identity)
@@ -507,7 +507,7 @@ def __collect_theme_ids(self, theme_group):
507507

508508
return theme_ids
509509

510-
def __replace_login__helper_plugins(self, plugins, signed_in, hide):
510+
def __replace_login__helper_plugins(self, plugins, signed_in, username, hide):
511511
"""Search plugins configurations and call
512512
self.__replace_login__helper_items on menuItems and toolbarItems
513513
@@ -520,12 +520,12 @@ def __replace_login__helper_plugins(self, plugins, signed_in, hide):
520520
continue
521521
if "menuItems" in plugin["cfg"]:
522522
self.__replace_login__helper_items(
523-
plugin["cfg"]["menuItems"], signed_in, hide)
523+
plugin["cfg"]["menuItems"], signed_in, username, hide)
524524
if "toolbarItems" in plugin["cfg"]:
525525
self.__replace_login__helper_items(
526-
plugin["cfg"]["toolbarItems"], signed_in, hide)
526+
plugin["cfg"]["toolbarItems"], signed_in, username, hide)
527527

528-
def __replace_login__helper_items(self, items, signed_in, hide):
528+
def __replace_login__helper_items(self, items, signed_in, username, hide):
529529
"""Replace Login with Logout if identity is not None on Login items in
530530
menuItems and toolbarItems.
531531
@@ -545,9 +545,10 @@ def __replace_login__helper_items(self, items, signed_in, hide):
545545
else:
546546
item["mode"] = "Logout"
547547
item["icon"] = "logout"
548+
item["trargs"] = [username]
548549
elif "subitems" in item:
549550
self.__replace_login__helper_items(
550-
item["subitems"], signed_in, hide)
551+
item["subitems"], signed_in, username, hide)
551552
if removeIndex is not None:
552553
del items[removeIndex]
553554

0 commit comments

Comments
 (0)