mirror of
https://github.com/home-assistant/core.git
synced 2025-07-17 10:17:09 +00:00
Pick onedrive owner from a more reliable source (#136929)
* Pick onedrive owner from a more reliable source * fix
This commit is contained in:
parent
6dd2d46328
commit
63af407f8f
@ -78,7 +78,7 @@ class OneDriveConfigFlow(AbstractOAuth2FlowHandler, domain=DOMAIN):
|
|||||||
self.logger.exception("Unknown error")
|
self.logger.exception("Unknown error")
|
||||||
return self.async_abort(reason="unknown")
|
return self.async_abort(reason="unknown")
|
||||||
|
|
||||||
drive = response.json()
|
drive: dict = response.json()
|
||||||
|
|
||||||
await self.async_set_unique_id(drive["parentReference"]["driveId"])
|
await self.async_set_unique_id(drive["parentReference"]["driveId"])
|
||||||
|
|
||||||
@ -94,7 +94,10 @@ class OneDriveConfigFlow(AbstractOAuth2FlowHandler, domain=DOMAIN):
|
|||||||
|
|
||||||
self._abort_if_unique_id_configured()
|
self._abort_if_unique_id_configured()
|
||||||
|
|
||||||
title = f"{drive['shared']['owner']['user']['displayName']}'s OneDrive"
|
user = drive.get("createdBy", {}).get("user", {}).get("displayName")
|
||||||
|
|
||||||
|
title = f"{user}'s OneDrive" if user else "OneDrive"
|
||||||
|
|
||||||
return self.async_create_entry(title=title, data=data)
|
return self.async_create_entry(title=title, data=data)
|
||||||
|
|
||||||
async def async_step_reauth(
|
async def async_step_reauth(
|
||||||
|
@ -88,7 +88,7 @@ def mock_adapter() -> Generator[MagicMock]:
|
|||||||
status_code=200,
|
status_code=200,
|
||||||
json={
|
json={
|
||||||
"parentReference": {"driveId": "mock_drive_id"},
|
"parentReference": {"driveId": "mock_drive_id"},
|
||||||
"shared": {"owner": {"user": {"displayName": "John Doe"}}},
|
"createdBy": {"user": {"displayName": "John Doe"}},
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
yield adapter
|
yield adapter
|
||||||
|
Loading…
x
Reference in New Issue
Block a user