From bccca4094f7970b7983a1d537086af833a23099a Mon Sep 17 00:00:00 2001 From: Florian Bach Date: Wed, 24 Jun 2026 07:06:05 +0200 Subject: [PATCH] Fix error message for accounts not yet migrated to ByteBooks --- calibre-plugin/libadobeAccount.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/calibre-plugin/libadobeAccount.py b/calibre-plugin/libadobeAccount.py index e701834..1770f41 100644 --- a/calibre-plugin/libadobeAccount.py +++ b/calibre-plugin/libadobeAccount.py @@ -450,18 +450,19 @@ def signIn(account_type, username, passwd): return False, "Invalid username or password!" elif ("E_AUTH_FAILED" in err and "LOGIN_FAILED" in err): return False, "E_AUTH_FAILED/LOGIN_FAILED. If you have 2FA enabled, please disable that and try again." + elif ("E_ADEPT_RESET_PW_REQUIRED" in err): + return False, "Server requires a password reset due to ByteBooks migration. See https://dtsbytebooks.com/transition-help" else: - return False, "Unknown Adobe error:" + credentials + return False, "Unknown Adobe error:" + str(credentials) elif (credentialsXML.tag == adNS("credentials")): pass #print("Login successful") else: return False, "Invalid main tag " + credentialsXML.tag - except: - return False, "Invalid response to login request" + return False, "Invalid response to login request (please open a bug report)" # Got correct credentials