Skip to content

Streamline Notion config entry updates (refresh token and user ID) #112832

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
bachya merged 4 commits into from
Mar 10, 2024
Merged

Streamline Notion config entry updates (refresh token and user ID) #112832

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b437ffc
Remove redundancy in Notion refresh token save on startup
bachya Mar 9, 2024
d2625be
Only change if necessary
bachya Mar 9, 2024
4f10cf5
Merge branch 'dev' into notion-remove-redundancy
bachya Mar 9, 2024
812dc92
Merge branch 'dev' into notion-remove-redundancy
bachya Mar 10, 2024
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
19 changes: 10 additions & 9 deletions homeassistant/components/notion/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,16 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
except NotionError as err:
raise ConfigEntryNotReady("Config entry failed to load") from err

# Always update the config entry with the latest refresh token and user UUID:
entry_updates["data"][CONF_REFRESH_TOKEN] = client.refresh_token
entry_updates["data"][CONF_USER_UUID] = client.user_uuid
# Update the Notion user UUID and refresh token if they've changed:
for key, value in (
(CONF_REFRESH_TOKEN, client.refresh_token),
(CONF_USER_UUID, client.user_uuid),
):
if entry.data[key] == value:
continue
entry_updates["data"][key] = value

hass.config_entries.async_update_entry(entry, **entry_updates)
Comment thread
bachya marked this conversation as resolved.

@callback
def async_save_refresh_token(refresh_token: str) -> None:
Expand All @@ -181,12 +188,6 @@ def async_save_refresh_token(refresh_token: str) -> None:
# Create a callback to save the refresh token when it changes:
entry.async_on_unload(client.add_refresh_token_callback(async_save_refresh_token))

# Save the client's refresh token if it's different than what we already have:
if (token := client.refresh_token) and token != entry.data[CONF_REFRESH_TOKEN]:
async_save_refresh_token(token)

hass.config_entries.async_update_entry(entry, **entry_updates)

async def async_update() -> NotionData:
"""Get the latest data from the Notion API."""
data = NotionData(hass=hass, entry=entry)
Expand Down