reuse password after checking for existence
This commit is contained in:
parent
0d195a0408
commit
286b3e7edd
1 changed files with 13 additions and 14 deletions
|
@ -704,7 +704,7 @@ class NextcloudHandler:
|
||||||
'''Test if a passwords folder exists'''
|
'''Test if a passwords folder exists'''
|
||||||
for folder in self.list_passwords_folders():
|
for folder in self.list_passwords_folders():
|
||||||
if folder.get('label') == name:
|
if folder.get('label') == name:
|
||||||
return True
|
return folder
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def create_passwords_folder(self, name):
|
def create_passwords_folder(self, name):
|
||||||
|
@ -799,7 +799,7 @@ class NextcloudHandler:
|
||||||
"existing_password": safer_password
|
"existing_password": safer_password
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
return True
|
return password
|
||||||
self.debug(
|
self.debug(
|
||||||
{
|
{
|
||||||
"action": "test_exists_password",
|
"action": "test_exists_password",
|
||||||
|
@ -823,7 +823,8 @@ class NextcloudHandler:
|
||||||
if not 'url' in post_obj:
|
if not 'url' in post_obj:
|
||||||
post_obj['url'] = ''
|
post_obj['url'] = ''
|
||||||
safer_obj = dict(post_obj, **{ 'password': '***' })
|
safer_obj = dict(post_obj, **{ 'password': '***' })
|
||||||
if not self.exists_password(post_obj):
|
exists_password = self.exists_password(post_obj)
|
||||||
|
if not exists_password:
|
||||||
try:
|
try:
|
||||||
self.debug(
|
self.debug(
|
||||||
{ "action": "create_password", "object": safer_obj }
|
{ "action": "create_password", "object": safer_obj }
|
||||||
|
@ -861,18 +862,16 @@ class NextcloudHandler:
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
if update:
|
if update:
|
||||||
existing_password = self.get_password(post_obj['label'], details=True)
|
post_obj['id'] = exists_password['id']
|
||||||
post_obj['id'] = existing_password[0]['id']
|
|
||||||
return self.update_password(post_obj)
|
return self.update_password(post_obj)
|
||||||
else:
|
self.warning(
|
||||||
self.warning(
|
{
|
||||||
{
|
"action": "create_password",
|
||||||
"action": "create_password",
|
"message": "Password with that name/label already exists",
|
||||||
"message": "Password with that name/label already exists",
|
"object": safer_obj,
|
||||||
"object": safer_obj,
|
"label": post_obj['label']
|
||||||
"label": post_obj['label']
|
}
|
||||||
}
|
)
|
||||||
)
|
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def delete_password(self, post_obj):
|
def delete_password(self, post_obj):
|
||||||
|
|
Loading…
Reference in a new issue