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

Remove sensitive information from log

Browse Source
This commit is contained in:
estevez-dev 2019-08-26 18:55:12 +03:00
parent 7ca4b02e6d
commit 1c829c8364
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/auth_manager.class.dart
View File

@ -14,7 +14,6 @@ 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) {
Logger.d("Webview url changed to $url");
if (url.startsWith("http://ha-client.homemade.systems/service/auth_callback.html")) { if (url.startsWith("http://ha-client.homemade.systems/service/auth_callback.html")) {
String authCode = url.split("=")[1]; String authCode = url.split("=")[1];
Logger.d("We have auth code. Getting temporary access token..."); Logger.d("We have auth code. Getting temporary access token...");
@ -38,7 +37,7 @@ class AuthManager {
}); });
} }
}); });
Logger.d("Launching OAuth: $oauthUrl"); Logger.d("Launching OAuth");
eventBus.fire(StartAuthEvent(oauthUrl, true)); eventBus.fire(StartAuthEvent(oauthUrl, true));
return completer.future; return completer.future;
} }

16
lib/connection.class.dart
View File

@ -104,13 +104,11 @@ class Connection {
completer?.completeError(HAError("Connection timeout")); completer?.completeError(HAError("Connection timeout"));
}); });
}).then((_) { }).then((_) {
Logger.d("doConnect is finished 1");
completer?.complete(); completer?.complete();
}).catchError((e) { }).catchError((e) {
completer?.completeError(e); completer?.completeError(e);
}); });
} else { } else {
Logger.d("doConnect is finished 2");
completer?.complete(); completer?.complete();
} }
} }
@ -124,7 +122,7 @@ class Connection {
} else { } else {
connecting = Completer(); connecting = Completer();
_disconnect().then((_) { _disconnect().then((_) {
Logger.d("Socket connecting: $_webSocketAPIEndpoint..."); Logger.d("Socket connecting...");
_socket = IOWebSocketChannel.connect( _socket = IOWebSocketChannel.connect(
_webSocketAPIEndpoint, pingInterval: Duration(seconds: 15)); _webSocketAPIEndpoint, pingInterval: Duration(seconds: 15));
_socketSubscription = _socket.stream.listen( _socketSubscription = _socket.stream.listen(
@ -337,13 +335,13 @@ class Connection {
_connect().timeout(connectTimeout, onTimeout: (){ _connect().timeout(connectTimeout, onTimeout: (){
_completer.completeError(HAError("No connection to Home Assistant", actions: [HAErrorAction.reconnect()])); _completer.completeError(HAError("No connection to Home Assistant", actions: [HAErrorAction.reconnect()]));
}).then((_) { }).then((_) {
Logger.d("[Sending] ==> $rawMessage"); Logger.d("[Sending] ==> ${auth ? "type="+dataObject['type'] : rawMessage}");
_socket.sink.add(rawMessage); _socket.sink.add(rawMessage);
}).catchError((e) { }).catchError((e) {
_completer.completeError(e); _completer.completeError(e);
}); });
} else { } else {
Logger.d("[Sending] ==> $rawMessage"); Logger.d("[Sending] ==> ${auth ? "type="+dataObject['type'] : rawMessage}");
_socket.sink.add(rawMessage); _socket.sink.add(rawMessage);
} }
return _completer.future; return _completer.future;
@ -372,7 +370,7 @@ class Connection {
//String endTime = formatDate(now, [yyyy, '-', mm, '-', dd, 'T', HH, ':', nn, ':', ss, z]); //String endTime = formatDate(now, [yyyy, '-', mm, '-', dd, 'T', HH, ':', nn, ':', ss, z]);
String startTime = formatDate(now.subtract(Duration(hours: 24)), [yyyy, '-', mm, '-', dd, 'T', HH, ':', nn, ':', ss, z]); String startTime = formatDate(now.subtract(Duration(hours: 24)), [yyyy, '-', mm, '-', dd, 'T', HH, ':', nn, ':', ss, z]);
String url = "$httpWebHost/api/history/period/$startTime?&filter_entity_id=$entityId"; String url = "$httpWebHost/api/history/period/$startTime?&filter_entity_id=$entityId";
Logger.d("[Sending] ==> $url"); Logger.d("[Sending] ==> HTTP /api/history/period/$startTime?&filter_entity_id=$entityId");
http.Response historyResponse; http.Response historyResponse;
historyResponse = await http.get(url, headers: { historyResponse = await http.get(url, headers: {
"authorization": "Bearer $_token", "authorization": "Bearer $_token",
@ -380,7 +378,7 @@ class Connection {
}); });
var history = json.decode(historyResponse.body); var history = json.decode(historyResponse.body);
if (history is List) { if (history is List) {
Logger.d( "[Received] <== ${history.first.length} history recors"); Logger.d( "[Received] <== HTTP ${history.first.length} history recors");
return history; return history;
} else { } else {
return []; return [];
@ -390,7 +388,7 @@ class Connection {
Future sendHTTPPost({String endPoint, String data, String contentType: "application/json", bool includeAuthHeader: true}) async { Future sendHTTPPost({String endPoint, String data, String contentType: "application/json", bool includeAuthHeader: true}) async {
Completer completer = Completer(); Completer completer = Completer();
String url = "$httpWebHost$endPoint"; String url = "$httpWebHost$endPoint";
Logger.d("[Sending] ==> $url"); Logger.d("[Sending] ==> HTTP $endPoint");
Map<String, String> headers = {}; Map<String, String> headers = {};
if (contentType != null) { if (contentType != null) {
headers["Content-Type"] = contentType; headers["Content-Type"] = contentType;
@ -403,7 +401,7 @@ class Connection {
headers: headers, headers: headers,
body: data body: data
).then((response) { ).then((response) {
Logger.d("[Received] <== ${response.statusCode}, ${response.body}"); Logger.d("[Received] <== HTTP ${response.statusCode}");
if (response.statusCode >= 200 && response.statusCode < 300 ) { if (response.statusCode >= 200 && response.statusCode < 300 ) {
completer.complete(response.body); completer.complete(response.body);
} else { } else {

1
lib/main.dart
View File

@ -414,7 +414,6 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
} }
void _showOAuth() { void _showOAuth() {
Logger.d("_showOAuth: ${Connection().oauthUrl}");
Navigator.of(context).pushNamed('/login'); Navigator.of(context).pushNamed('/login');
} }