Skip to content

fix: fallback to old version of login #537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
allenporter merged 2 commits into from
Oct 18, 2025
Merged

fix: fallback to old version of login #537

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e45085a
fix: fallback to old version of login
Lash-L Oct 17, 2025
ab584fd
fix: bug and add test
Lash-L Oct 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion roborock/web_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ async def _get_iot_login_info(self) -> IotLoginInfo:
raise RoborockException(f"{response.get('msg')} - response code: {response_code}")
country_code = response["data"]["countrycode"]
country = response["data"]["country"]
if country_code is not None and country is not None:
if country_code is not None or country is not None:
self._iot_login_info = IotLoginInfo(
base_url=response["data"]["url"],
country=country,
Expand Down Expand Up @@ -240,6 +240,9 @@ async def request_code_v4(self) -> None:
_LOGGER.info(ex.meta_info)
raise RoborockRateLimit("Reached maximum requests for login. Please try again later.") from ex
base_url = await self.base_url
if await self.country_code is None or await self.country is None:
_LOGGER.info("No country code or country found, trying old version of request code.")
return await self.request_code()
header_clientid = self._get_header_client_id()
code_request = PreparedRequest(
base_url,
Expand Down Expand Up @@ -304,6 +307,9 @@ async def code_login_v4(
country = await self.country
if country_code is None:
country_code = await self.country_code
if country_code is None or country is None:
_LOGGER.info("No country code or country found, trying old version of code login.")
return await self.code_login(code)
header_clientid = self._get_header_client_id()
x_mercy_ks = "".join(secrets.choice(string.ascii_letters + string.digits) for _ in range(16))
x_mercy_k = await self._sign_key_v3(x_mercy_ks)
Expand Down