From 6f267ed3fc6b9c1806fb0c93e6e16660e8508018 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org>
Date: Mon, 27 Sep 2021 10:44:27 +0200
Subject: [PATCH] MAINT: treat exceptions is admin script
---
src/caosdb/common/administration.py | 1 -
src/caosdb/utils/caosdb_admin.py | 15 ++++++++++++---
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/caosdb/common/administration.py b/src/caosdb/common/administration.py
index 984912ac..d767f77b 100644
--- a/src/caosdb/common/administration.py
+++ b/src/caosdb/common/administration.py
@@ -171,7 +171,6 @@ def _update_user(name, realm=None, password=None, status=None,
- at least 1 lower case character
- at least 1 upper case character
- at least 1 special character"""
- print(e.msg)
raise
diff --git a/src/caosdb/utils/caosdb_admin.py b/src/caosdb/utils/caosdb_admin.py
index 9c18f896..9fb94f57 100755
--- a/src/caosdb/utils/caosdb_admin.py
+++ b/src/caosdb/utils/caosdb_admin.py
@@ -131,11 +131,17 @@ def do_create_user(args):
def do_activate_user(args):
- admin._update_user(name=args.user_name, status="ACTIVE")
+ try:
+ admin._update_user(name=args.user_name, status="ACTIVE")
+ except HTTPClientError as e:
+ print(e.msg)
def do_deactivate_user(args):
- admin._update_user(name=args.user_name, status="INACTIVE")
+ try:
+ admin._update_user(name=args.user_name, status="INACTIVE")
+ except HTTPClientError as e:
+ print(e.msg)
def do_set_user_password(args):
@@ -143,7 +149,10 @@ def do_set_user_password(args):
password = _promt_for_pw()
else:
password = args.user_password
- admin._update_user(name=args.user_name, password=password)
+ try:
+ admin._update_user(name=args.user_name, password=password)
+ except HTTPClientError as e:
+ print(e.msg)
def do_add_user_roles(args):
--
GitLab