From 568180632edfca977395d8a33f81ececa614250b Mon Sep 17 00:00:00 2001 From: Martin Hjelmare Date: Mon, 8 Feb 2021 15:00:17 +0100 Subject: [PATCH] Fix sync oath2 scaffold template (#46219) --- .../config_flow_oauth2/integration/__init__.py | 2 +- .../templates/config_flow_oauth2/integration/api.py | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/script/scaffold/templates/config_flow_oauth2/integration/__init__.py b/script/scaffold/templates/config_flow_oauth2/integration/__init__.py index 20b5a03206e..c51061b57fe 100644 --- a/script/scaffold/templates/config_flow_oauth2/integration/__init__.py +++ b/script/scaffold/templates/config_flow_oauth2/integration/__init__.py @@ -65,7 +65,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): session = config_entry_oauth2_flow.OAuth2Session(hass, entry, implementation) # If using a requests-based API lib - hass.data[DOMAIN][entry.entry_id] = api.ConfigEntryAuth(hass, entry, session) + hass.data[DOMAIN][entry.entry_id] = api.ConfigEntryAuth(hass, session) # If using an aiohttp-based API lib hass.data[DOMAIN][entry.entry_id] = api.AsyncConfigEntryAuth( diff --git a/script/scaffold/templates/config_flow_oauth2/integration/api.py b/script/scaffold/templates/config_flow_oauth2/integration/api.py index 710c76600fb..50b54399579 100644 --- a/script/scaffold/templates/config_flow_oauth2/integration/api.py +++ b/script/scaffold/templates/config_flow_oauth2/integration/api.py @@ -4,7 +4,7 @@ from asyncio import run_coroutine_threadsafe from aiohttp import ClientSession import my_pypi_package -from homeassistant import config_entries, core +from homeassistant import core from homeassistant.helpers import config_entry_oauth2_flow # TODO the following two API examples are based on our suggested best practices @@ -18,15 +18,11 @@ class ConfigEntryAuth(my_pypi_package.AbstractAuth): def __init__( self, hass: core.HomeAssistant, - config_entry: config_entries.ConfigEntry, - implementation: config_entry_oauth2_flow.AbstractOAuth2Implementation, + oauth_session: config_entry_oauth2_flow.OAuth2Session, ): """Initialize NEW_NAME Auth.""" self.hass = hass - self.config_entry = config_entry - self.session = config_entry_oauth2_flow.OAuth2Session( - hass, config_entry, implementation - ) + self.session = oauth_session super().__init__(self.session.token) def refresh_tokens(self) -> str: