From e59510f0ce30c1e044ef64c5821b120038f6069e Mon Sep 17 00:00:00 2001 From: epenet <6771947+epenet@users.noreply.github.com> Date: Thu, 20 Jan 2022 15:19:31 +0100 Subject: [PATCH] Fix onboarding (#64557) * Adjust auth and hassio import * Adjust pylint Co-authored-by: epenet --- homeassistant/components/onboarding/views.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/homeassistant/components/onboarding/views.py b/homeassistant/components/onboarding/views.py index 08bd38a8647..0d041463d11 100644 --- a/homeassistant/components/onboarding/views.py +++ b/homeassistant/components/onboarding/views.py @@ -8,7 +8,7 @@ from aiohttp.web_exceptions import HTTPUnauthorized import voluptuous as vol from homeassistant.auth.const import GROUP_ID_ADMIN -from homeassistant.components import auth, hassio, person +from homeassistant.components import person from homeassistant.components.auth import indieauth from homeassistant.components.http.const import KEY_HASS_REFRESH_TOKEN_ID from homeassistant.components.http.data_validator import RequestDataValidator @@ -162,7 +162,10 @@ class UserOnboardingView(_BaseOnboardingView): # Return authorization code for fetching tokens and connect # during onboarding. - auth_code = auth.create_auth_code(hass, data["client_id"], credentials) + # pylint: disable=import-outside-toplevel + from homeassistant.components.auth import create_auth_code + + auth_code = create_auth_code(hass, data["client_id"], credentials) return self.json({"auth_code": auth_code}) @@ -189,6 +192,9 @@ class CoreConfigOnboardingView(_BaseOnboardingView): "met", context={"source": "onboarding"} ) + # pylint: disable=import-outside-toplevel + from homeassistant.components import hassio + if ( hassio.is_hassio(hass) and "raspberrypi" in hassio.get_core_info(hass)["machine"] @@ -238,7 +244,10 @@ class IntegrationOnboardingView(_BaseOnboardingView): ) # Return authorization code so we can redirect user and log them in - auth_code = auth.create_auth_code( + # pylint: disable=import-outside-toplevel + from homeassistant.components.auth import create_auth_code + + auth_code = create_auth_code( hass, data["client_id"], refresh_token.credential ) return self.json({"auth_code": auth_code})