diff --git a/lib/managers/connection_manager.class.dart b/lib/managers/connection_manager.class.dart index c123b4e..3c7b2a9 100644 --- a/lib/managers/connection_manager.class.dart +++ b/lib/managers/connection_manager.class.dart @@ -15,6 +15,7 @@ class ConnectionManager { String displayHostname; String _webSocketAPIEndpoint; String httpWebHost; + String httpWebHostWithExtAuth; String _token; String _tempToken; String oauthUrl; @@ -51,6 +52,12 @@ class ConnectionManager { "${prefs.getString('hassio-protocol')}://$_domain:$_port/api/websocket"; httpWebHost = "${prefs.getString('hassio-res-protocol')}://$_domain:$_port"; + httpWebHostWithExtAuth = httpWebHost; + if (httpWebHostWithExtAuth.contains("?")) { + httpWebHostWithExtAuth += "&external_auth=1"; + } else { + httpWebHostWithExtAuth += "?external_auth=1"; + } if ((_domain == null) || (_port == null) || (_domain.isEmpty) || (_port.isEmpty)) { completer.completeError(HAError.checkConnectionSettings()); diff --git a/lib/pages/main/main.page.dart b/lib/pages/main/main.page.dart index 77e5cb5..8039391 100644 --- a/lib/pages/main/main.page.dart +++ b/lib/pages/main/main.page.dart @@ -867,18 +867,11 @@ class _MainPageState extends State with WidgetsBindingObserver, Ticker ) ); } else if (ConnectionManager().settingsLoaded && ConnectionManager().useWebView) { - String webUIurl = ConnectionManager().httpWebHost; - if (webUIurl.contains("?")) { - webUIurl += "&external_auth=1"; - } else { - webUIurl += "?external_auth=1"; - } return WebviewScaffold( - url: webUIurl, + url: ConnectionManager().httpWebHostWithExtAuth, primary: false, debuggingEnabled: true, - appBar: EmptyAppBar(), - bottomNavigationBar: bottomBar, + appBar: EmptyAppBar() ); } else { if (HomeAssistant().isNoViews) {