Revert "Feature 10941: User Management Enhancements"
This reverts commit 536bb568cd1c79d16d36cd13bdd20d167337d30d.
Change-Id: I238e646546088f9135c272f9ff4890b65959a570
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
diff --git a/osm_nbi/auth.py b/osm_nbi/auth.py
index 9c8c8d3..ec33b1c 100644
--- a/osm_nbi/auth.py
+++ b/osm_nbi/auth.py
@@ -252,7 +252,7 @@
user_desc = {
"username": "admin",
"password": "admin",
- "_admin": {"created": now, "modified": now, "user_status": "always-active"},
+ "_admin": {"created": now, "modified": now},
}
if project_id:
pid = project_id
@@ -791,24 +791,20 @@
This method will check for password expiry of the user
:param outdata: user token information
"""
- user_list = None
+ user_content = None
present_time = time()
user = outdata["username"]
- if self.config["authentication"].get("user_management"):
- user_list = self.db.get_list("users", {"username": user})
- if user_list:
- user_content = user_list[0]
- if not user_content.get("username") == "admin":
- user_content["_admin"]["modified"] = present_time
- if user_content.get("_admin").get("password_expire_time"):
- password_expire_time = user_content["_admin"][
- "password_expire_time"
- ]
- else:
- password_expire_time = present_time
- uid = user_content["_id"]
- self.db.set_one("users", {"_id": uid}, user_content)
- if not present_time < password_expire_time:
- return True
+ if self.config["authentication"].get("pwd_expiry_check"):
+ user_content = self.db.get_list("users", {"username": user})[0]
+ if not user_content.get("username") == "admin":
+ user_content["_admin"]["modified_time"] = present_time
+ if user_content.get("_admin").get("expire_time"):
+ expire_time = user_content["_admin"]["expire_time"]
+ else:
+ expire_time = present_time
+ uid = user_content["_id"]
+ self.db.set_one("users", {"_id": uid}, user_content)
+ if not present_time < expire_time:
+ return True
else:
pass