yehor/ha_client
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Force https for oauth

Browse Source
This commit is contained in:
Yegor Vialov 2020-01-29 17:38:51 +00:00
parent 831fc98ab1
commit 9303e4c0a5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/managers/auth_manager.class.dart
View File

@ -14,7 +14,7 @@ class AuthManager {
Completer completer = Completer(); Completer completer = Completer();
final flutterWebviewPlugin = new FlutterWebviewPlugin(); final flutterWebviewPlugin = new FlutterWebviewPlugin();
flutterWebviewPlugin.onUrlChanged.listen((String url) { flutterWebviewPlugin.onUrlChanged.listen((String url) {
if (url.startsWith("http://ha-client.estevez.dev/service/auth_callback.html")) { if (url.startsWith("https://ha-client.estevez.dev/service/auth_callback.html")) {
Logger.d("url=$url"); Logger.d("url=$url");
String authCode = url.split("=")[1]; String authCode = url.split("=")[1];
Logger.d("authCode=$authCode"); Logger.d("authCode=$authCode");
@ -23,7 +23,7 @@ class AuthManager {
endPoint: "/auth/token", endPoint: "/auth/token",
contentType: "application/x-www-form-urlencoded", contentType: "application/x-www-form-urlencoded",
includeAuthHeader: false, includeAuthHeader: false,
data: "grant_type=authorization_code&code=$authCode&client_id=${Uri.encodeComponent('http://ha-client.estevez.dev')}" data: "grant_type=authorization_code&code=$authCode&client_id=${Uri.encodeComponent('https://ha-client.estevez.dev')}"
).then((response) { ).then((response) {
Logger.d("Got temp token"); Logger.d("Got temp token");
String tempToken = json.decode(response)['access_token']; String tempToken = json.decode(response)['access_token'];

4
lib/managers/connection_manager.class.dart
View File

@ -59,9 +59,9 @@ class ConnectionManager {
_token = await storage.read(key: "hacl_llt"); _token = await storage.read(key: "hacl_llt");
Logger.e("Long-lived token read successful"); Logger.e("Long-lived token read successful");
oauthUrl = "$httpWebHost/auth/authorize?client_id=${Uri.encodeComponent( oauthUrl = "$httpWebHost/auth/authorize?client_id=${Uri.encodeComponent(
'http://ha-client.estevez.dev')}&redirect_uri=${Uri 'https://ha-client.estevez.dev')}&redirect_uri=${Uri
.encodeComponent( .encodeComponent(
'http://ha-client.estevez.dev/service/auth_callback.html')}"; 'https://ha-client.estevez.dev/service/auth_callback.html')}";
settingsLoaded = true; settingsLoaded = true;
} catch (e) { } catch (e) {
completer.completeError(HAError("Error reading login details", actions: [HAErrorAction.tryAgain(type: HAErrorActionType.FULL_RELOAD), HAErrorAction.loginAgain()])); completer.completeError(HAError("Error reading login details", actions: [HAErrorAction.tryAgain(type: HAErrorActionType.FULL_RELOAD), HAErrorAction.loginAgain()]));