diff --git a/frappe/utils/password.py b/frappe/utils/password.py index 67d9c939da..bb8e4e1ca5 100644 --- a/frappe/utils/password.py +++ b/frappe/utils/password.py @@ -34,7 +34,13 @@ def get_decrypted_password(doctype, name, fieldname="password", raise_exception= ).run() if result and result[0][0]: - return decrypt(result[0][0], key=f"{doctype}.{name}.{fieldname}") + try: + return decrypt(result[0][0], key=f"{doctype}.{name}.{fieldname}") + except frappe.ValidationError as e: + if raise_exception: + raise e + + return None elif raise_exception: frappe.throw( diff --git a/frappe/www/login.py b/frappe/www/login.py index 48fdf71fb0..41a2fe0165 100644 --- a/frappe/www/login.py +++ b/frappe/www/login.py @@ -69,7 +69,9 @@ def get_context(context): ) for provider in providers: - client_secret = get_decrypted_password("Social Login Key", provider.name, "client_secret") + client_secret = get_decrypted_password( + "Social Login Key", provider.name, "client_secret", raise_exception=False + ) if not client_secret: continue