WIP: App settings refactoring
This commit is contained in:
@ -16,15 +16,25 @@ class AppSettings {
|
||||
String displayHostname;
|
||||
String webSocketAPIEndpoint;
|
||||
String httpWebHost;
|
||||
String _token;
|
||||
String _tempToken;
|
||||
String longLivedToken;
|
||||
String tempToken;
|
||||
String oauthUrl;
|
||||
String webhookId;
|
||||
double haVersion;
|
||||
bool scrollBadges;
|
||||
int appIntegrationVersion;
|
||||
AppTheme appTheme;
|
||||
final int defaultLocationUpdateIntervalMinutes = 20;
|
||||
Duration locationUpdateInterval;
|
||||
bool locationTrackingEnabled = false;
|
||||
|
||||
bool get isAuthenticated => _token != null;
|
||||
bool get isAuthenticated => longLivedToken != null;
|
||||
bool get isTempAuthenticated => tempToken != null;
|
||||
|
||||
loadAppTheme() async {
|
||||
SharedPreferences prefs = await SharedPreferences.getInstance();
|
||||
appTheme = AppTheme.values[prefs.getInt('app-theme') ?? AppTheme.defaultTheme.index];
|
||||
}
|
||||
|
||||
Future load(bool quick) async {
|
||||
if (!quick) {
|
||||
@ -36,13 +46,16 @@ class AppSettings {
|
||||
appIntegrationVersion = prefs.getInt('app-integration-version') ?? 0;
|
||||
scrollBadges = prefs.getBool('scroll-badges') ?? true;
|
||||
displayHostname = "$_domain:$_port";
|
||||
_webSocketAPIEndpoint =
|
||||
webSocketAPIEndpoint =
|
||||
"${prefs.getString('hassio-protocol')}://$_domain:$_port/api/websocket";
|
||||
httpWebHost =
|
||||
"${prefs.getString('hassio-res-protocol')}://$_domain:$_port";
|
||||
locationUpdateInterval = Duration(minutes: prefs.getInt("location-interval") ??
|
||||
defaultLocationUpdateIntervalMinutes);
|
||||
locationTrackingEnabled = prefs.getBool("location-enabled") ?? false;
|
||||
try {
|
||||
final storage = new FlutterSecureStorage();
|
||||
_token = await storage.read(key: "hacl_llt");
|
||||
longLivedToken = await storage.read(key: "hacl_llt");
|
||||
Logger.d("Long-lived token read successful");
|
||||
oauthUrl = "$httpWebHost/auth/authorize?client_id=${Uri.encodeComponent(
|
||||
'https://ha-client.app')}&redirect_uri=${Uri
|
||||
@ -54,15 +67,58 @@ class AppSettings {
|
||||
}
|
||||
}
|
||||
|
||||
Future save(Map<String, dynamic> settings) async {
|
||||
if (settings != null && settings.isNotEmpty) {
|
||||
SharedPreferences prefs = await SharedPreferences.getInstance();
|
||||
settings.forEach((k,v) async {
|
||||
if (v is String) {
|
||||
await prefs.setString(k, v);
|
||||
} else if (v is bool) {
|
||||
await prefs.setBool(k ,v);
|
||||
} else if (v is int) {
|
||||
await prefs.setInt(k ,v);
|
||||
} else if (v is double) {
|
||||
await prefs.setDouble(k, v);
|
||||
} else {
|
||||
Logger.e('Unknown setting type: <$k, $v>');
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
Future startAuth() {
|
||||
return AuthManager().start(
|
||||
oauthUrl: oauthUrl
|
||||
).then((token) {
|
||||
Logger.d("Token from AuthManager recived");
|
||||
_tempToken = token;
|
||||
tempToken = token;
|
||||
});
|
||||
}
|
||||
|
||||
Future clearTokens() async {
|
||||
longLivedToken = null;
|
||||
tempToken = null;
|
||||
try {
|
||||
final storage = new FlutterSecureStorage();
|
||||
await storage.delete(key: "hacl_llt");
|
||||
} catch(e, stacktrace) {
|
||||
Logger.e("Error clearing tokens: $e", stacktrace: stacktrace);
|
||||
}
|
||||
}
|
||||
|
||||
Future saveLongLivedToken(token) async {
|
||||
longLivedToken = token;
|
||||
tempToken = null;
|
||||
try {
|
||||
final storage = new FlutterSecureStorage();
|
||||
await storage.write(key: "hacl_llt", value: "$longLivedToken");
|
||||
SharedPreferences prefs = await SharedPreferences.getInstance();
|
||||
prefs.setBool("oauth-used", true);
|
||||
} catch(e, stacktrace) {
|
||||
Logger.e("Error saving long-lived token: $e", stacktrace: stacktrace);
|
||||
}
|
||||
}
|
||||
|
||||
bool isNotConfigured() {
|
||||
return _domain == null && _port == null && webhookId == null && mobileAppDeviceName == null;
|
||||
}
|
||||
|
Reference in New Issue
Block a user