SelfPrivacy/selfprivacy.org.app
1
0
Fork 0
mirror of https://git.selfprivacy.org/kherel/selfprivacy.org.app.git synced 2025-01-27 11:16:45 +00:00
Code Issues Projects Releases Wiki Activity

Linting

Browse source
This commit is contained in:
Inex Code 2022-06-05 22:36:32 +03:00
parent 5909b9a3e6
commit 4db0413c42
142 changed files with 2047 additions and 2001 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
analysis_options.yaml
View file

@ -12,6 +12,7 @@ include: package:flutter_lints/flutter.yaml
analyzer:
exclude:
- lib/generated_plugin_registrant.dart
- lib/**.g.dart
linter:
# The lint rules applied to this project can be customized in the
@ -28,6 +29,42 @@ linter:
rules:
avoid_print: false # Uncomment to disable the `avoid_print` rule
prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule
always_use_package_imports: true
invariant_booleans: true
no_adjacent_strings_in_list: true
unnecessary_statements: true
always_declare_return_types: true
always_put_required_named_parameters_first: true
always_put_control_body_on_new_line: true
always_specify_types: true
avoid_escaping_inner_quotes: true
avoid_setters_without_getters: true
eol_at_end_of_file: true
prefer_constructors_over_static_methods: true
prefer_expression_function_bodies: true
prefer_final_in_for_each: true
prefer_final_locals: true
prefer_final_parameters: true
prefer_foreach: true
prefer_if_elements_to_conditional_expressions: true
prefer_mixin: true
prefer_null_aware_method_calls: true
require_trailing_commas: true
sized_box_shrink_expand: true
sort_constructors_first: true
unnecessary_await_in_return: true
unnecessary_lambdas: true
unnecessary_null_checks: true
unnecessary_parenthesis: true
use_enums: true
use_if_null_to_convert_nulls_to_bools: true
use_is_even_rather_than_modulo: true
use_late_for_private_fields_and_variables: true
use_named_constants: true
use_setters_to_change_properties: true
use_string_buffers: true
use_super_parameters: true
use_to_and_as_if_applicable: true
# Additional information about this file can be found at
# https://dart.dev/guides/language/analysis-options

42
lib/config/bloc_config.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: always_specify_types
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:selfprivacy/logic/cubit/devices/devices_cubit.dart';
@ -12,38 +14,38 @@ import 'package:selfprivacy/logic/cubit/services/services_cubit.dart';
import 'package:selfprivacy/logic/cubit/users/users_cubit.dart';
class BlocAndProviderConfig extends StatelessWidget {
const BlocAndProviderConfig({Key? key, this.child}) : super(key: key);
const BlocAndProviderConfig({final super.key, this.child});
final Widget? child;
@override
Widget build(BuildContext context) {
var isDark = false;
var serverInstallationCubit = ServerInstallationCubit()..load();
var usersCubit = UsersCubit(serverInstallationCubit);
var servicesCubit = ServicesCubit(serverInstallationCubit);
var backupsCubit = BackupsCubit(serverInstallationCubit);
var dnsRecordsCubit = DnsRecordsCubit(serverInstallationCubit);
var recoveryKeyCubit = RecoveryKeyCubit(serverInstallationCubit);
var apiDevicesCubit = ApiDevicesCubit(serverInstallationCubit);
Widget build(final BuildContext context) {
const bool isDark = false;
final ServerInstallationCubit serverInstallationCubit = ServerInstallationCubit()..load();
final UsersCubit usersCubit = UsersCubit(serverInstallationCubit);
final ServicesCubit servicesCubit = ServicesCubit(serverInstallationCubit);
final BackupsCubit backupsCubit = BackupsCubit(serverInstallationCubit);
final DnsRecordsCubit dnsRecordsCubit = DnsRecordsCubit(serverInstallationCubit);
final RecoveryKeyCubit recoveryKeyCubit = RecoveryKeyCubit(serverInstallationCubit);
final ApiDevicesCubit apiDevicesCubit = ApiDevicesCubit(serverInstallationCubit);
return MultiProvider(
providers: [
BlocProvider(
create: (_) => AppSettingsCubit(
create: (final _) => AppSettingsCubit(
isDarkModeOn: isDark,
isOnboardingShowing: true,
)..load(),
),
BlocProvider(create: (_) => serverInstallationCubit, lazy: false),
BlocProvider(create: (_) => ProvidersCubit()),
BlocProvider(create: (_) => usersCubit..load(), lazy: false),
BlocProvider(create: (_) => servicesCubit..load(), lazy: false),
BlocProvider(create: (_) => backupsCubit..load(), lazy: false),
BlocProvider(create: (_) => dnsRecordsCubit..load()),
BlocProvider(create: (_) => recoveryKeyCubit..load()),
BlocProvider(create: (_) => apiDevicesCubit..load()),
BlocProvider(create: (final _) => serverInstallationCubit, lazy: false),
BlocProvider(create: (final _) => ProvidersCubit()),
BlocProvider(create: (final _) => usersCubit..load(), lazy: false),
BlocProvider(create: (final _) => servicesCubit..load(), lazy: false),
BlocProvider(create: (final _) => backupsCubit..load(), lazy: false),
BlocProvider(create: (final _) => dnsRecordsCubit..load()),
BlocProvider(create: (final _) => recoveryKeyCubit..load()),
BlocProvider(create: (final _) => apiDevicesCubit..load()),
BlocProvider(
create: (_) =>
create: (final _) =>
JobsCubit(usersCubit: usersCubit, servicesCubit: servicesCubit),
),
],

9
lib/config/bloc_observer.dart
View file

@ -1,15 +1,18 @@
// ignore_for_file: always_specify_types
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:selfprivacy/ui/components/error/error.dart';
import 'package:selfprivacy/utils/route_transitions/basic.dart';
import './get_it_config.dart';
import 'package:selfprivacy/config/get_it_config.dart';
class SimpleBlocObserver extends BlocObserver {
SimpleBlocObserver();
@override
void onError(BlocBase bloc, Object error, StackTrace stackTrace) {
final navigator = getIt.get<NavigationService>().navigator!;
void onError(final BlocBase bloc, final Object error, final StackTrace stackTrace) {
final NavigatorState navigator = getIt.get<NavigationService>().navigator!;
navigator.push(
materialRoute(

24
lib/config/brand_colors.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: always_specify_types
import 'package:flutter/material.dart';
class BrandColors {
@ -20,8 +22,8 @@ class BrandColors {
static const Color green2 = Color(0xFF0F8849);
static get navBackgroundLight => white.withOpacity(0.8);
static get navBackgroundDark => black.withOpacity(0.8);
static Color get navBackgroundLight => white.withOpacity(0.8);
static Color get navBackgroundDark => black.withOpacity(0.8);
static const List<Color> uninitializedGradientColors = [
Color(0xFF555555),
@ -41,14 +43,14 @@ class BrandColors {
Color(0xFFEFD135),
];
static const primary = blue;
static const headlineColor = black;
static const inactive = gray2;
static const scaffoldBackground = gray3;
static const inputInactive = gray4;
static const Color primary = blue;
static const Color headlineColor = black;
static const Color inactive = gray2;
static const Color scaffoldBackground = gray3;
static const Color inputInactive = gray4;
static const textColor1 = black;
static const textColor2 = gray1;
static const dividerColor = gray5;
static const warning = red1;
static const Color textColor1 = black;
static const Color textColor2 = gray1;
static const Color dividerColor = gray5;
static const Color warning = red1;
}

10
lib/config/brand_theme.dart
View file

@ -1,9 +1,9 @@
import 'package:flutter/material.dart';
import 'package:selfprivacy/config/text_themes.dart';
import 'brand_colors.dart';
import 'package:selfprivacy/config/brand_colors.dart';
final lightTheme = ThemeData(
final ThemeData lightTheme = ThemeData(
useMaterial3: true,
primaryColor: BrandColors.primary,
fontFamily: 'Inter',
@ -52,7 +52,7 @@ final lightTheme = ThemeData(
),
);
var darkTheme = lightTheme.copyWith(
ThemeData darkTheme = lightTheme.copyWith(
brightness: Brightness.dark,
scaffoldBackgroundColor: const Color(0xFF202120),
iconTheme: const IconThemeData(color: BrandColors.gray3),
@ -82,6 +82,6 @@ var darkTheme = lightTheme.copyWith(
),
);
const paddingH15V30 = EdgeInsets.symmetric(horizontal: 15, vertical: 30);
const EdgeInsets paddingH15V30 = EdgeInsets.symmetric(horizontal: 15, vertical: 30);
const paddingH15V0 = EdgeInsets.symmetric(horizontal: 15);
const EdgeInsets paddingH15V0 = EdgeInsets.symmetric(horizontal: 15);

2
lib/config/get_it_config.dart
View file

@ -9,7 +9,7 @@ export 'package:selfprivacy/logic/get_it/console.dart';
export 'package:selfprivacy/logic/get_it/navigation.dart';
export 'package:selfprivacy/logic/get_it/timer.dart';
final getIt = GetIt.instance;
final GetIt getIt = GetIt.instance;
Future<void> getItSetup() async {
getIt.registerSingleton<NavigationService>(NavigationService());

18
lib/config/hive_config.dart
View file

@ -24,15 +24,15 @@ class HiveConfig {
await Hive.openBox(BNames.appSettingsBox);
var cipher = HiveAesCipher(
await getEncryptedKey(BNames.serverInstallationEncryptionKey));
final HiveAesCipher cipher = HiveAesCipher(
await getEncryptedKey(BNames.serverInstallationEncryptionKey),);
await Hive.openBox<User>(BNames.usersDeprecated);
await Hive.openBox<User>(BNames.usersBox, encryptionCipher: cipher);
Box<User> deprecatedUsers = Hive.box<User>(BNames.usersDeprecated);
final Box<User> deprecatedUsers = Hive.box<User>(BNames.usersDeprecated);
if (deprecatedUsers.isNotEmpty) {
Box<User> users = Hive.box<User>(BNames.usersBox);
final Box<User> users = Hive.box<User>(BNames.usersBox);
users.addAll(deprecatedUsers.values.toList());
deprecatedUsers.clear();
}
@ -40,15 +40,15 @@ class HiveConfig {
await Hive.openBox(BNames.serverInstallationBox, encryptionCipher: cipher);
}
static Future<Uint8List> getEncryptedKey(String encKey) async {
const secureStorage = FlutterSecureStorage();
var hasEncryptionKey = await secureStorage.containsKey(key: encKey);
static Future<Uint8List> getEncryptedKey(final String encKey) async {
const FlutterSecureStorage secureStorage = FlutterSecureStorage();
final bool hasEncryptionKey = await secureStorage.containsKey(key: encKey);
if (!hasEncryptionKey) {
var key = Hive.generateSecureKey();
final List<int> key = Hive.generateSecureKey();
await secureStorage.write(key: encKey, value: base64UrlEncode(key));
}
String? string = await secureStorage.read(key: encKey);
final String? string = await secureStorage.read(key: encKey);
return base64Url.decode(string!);
}
}

10
lib/config/localization.dart
View file

@ -1,16 +1,17 @@
// ignore_for_file: always_specify_types
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
class Localization extends StatelessWidget {
const Localization({
Key? key,
final super.key,
this.child,
}) : super(key: key);
});
final Widget? child;
@override
Widget build(BuildContext context) {
return EasyLocalization(
Widget build(final BuildContext context) => EasyLocalization(
supportedLocales: const [Locale('ru'), Locale('en')],
path: 'assets/translations',
fallbackLocale: const Locale('en'),
@ -19,4 +20,3 @@ class Localization extends StatelessWidget {
child: child!,
);
}
}

32
lib/config/text_themes.dart
View file

@ -1,78 +1,78 @@
import 'package:flutter/material.dart';
import 'package:selfprivacy/utils/named_font_weight.dart';
import 'brand_colors.dart';
import 'package:selfprivacy/config/brand_colors.dart';
const defaultTextStyle = TextStyle(
const TextStyle defaultTextStyle = TextStyle(
fontSize: 15,
color: BrandColors.textColor1,
);
final headline1Style = defaultTextStyle.copyWith(
final TextStyle headline1Style = defaultTextStyle.copyWith(
fontSize: 40,
fontWeight: NamedFontWeight.extraBold,
color: BrandColors.headlineColor,
);
final headline2Style = defaultTextStyle.copyWith(
final TextStyle headline2Style = defaultTextStyle.copyWith(
fontSize: 24,
fontWeight: NamedFontWeight.extraBold,
color: BrandColors.headlineColor,
);
final onboardingTitle = defaultTextStyle.copyWith(
final TextStyle onboardingTitle = defaultTextStyle.copyWith(
fontSize: 30,
fontWeight: NamedFontWeight.extraBold,
color: BrandColors.headlineColor,
);
final headline3Style = defaultTextStyle.copyWith(
final TextStyle headline3Style = defaultTextStyle.copyWith(
fontSize: 20,
fontWeight: NamedFontWeight.extraBold,
color: BrandColors.headlineColor,
);
final headline4Style = defaultTextStyle.copyWith(
final TextStyle headline4Style = defaultTextStyle.copyWith(
fontSize: 18,
fontWeight: NamedFontWeight.medium,
color: BrandColors.headlineColor,
);
final headline4UnderlinedStyle = defaultTextStyle.copyWith(
final TextStyle headline4UnderlinedStyle = defaultTextStyle.copyWith(
fontSize: 18,
fontWeight: NamedFontWeight.medium,
color: BrandColors.headlineColor,
decoration: TextDecoration.underline,
);
final headline5Style = defaultTextStyle.copyWith(
final TextStyle headline5Style = defaultTextStyle.copyWith(
fontSize: 15,
fontWeight: NamedFontWeight.medium,
color: BrandColors.headlineColor.withOpacity(0.8),
);
const body1Style = defaultTextStyle;
final body2Style = defaultTextStyle.copyWith(
const TextStyle body1Style = defaultTextStyle;
final TextStyle body2Style = defaultTextStyle.copyWith(
color: BrandColors.textColor2,
);
final buttonTitleText = defaultTextStyle.copyWith(
final TextStyle buttonTitleText = defaultTextStyle.copyWith(
color: BrandColors.white,
fontSize: 16,
fontWeight: FontWeight.bold,
height: 1,
);
final mediumStyle = defaultTextStyle.copyWith(fontSize: 13, height: 1.53);
final TextStyle mediumStyle = defaultTextStyle.copyWith(fontSize: 13, height: 1.53);
final smallStyle = defaultTextStyle.copyWith(fontSize: 11, height: 1.45);
final TextStyle smallStyle = defaultTextStyle.copyWith(fontSize: 11, height: 1.45);
const progressTextStyleLight = TextStyle(
const TextStyle progressTextStyleLight = TextStyle(
fontSize: 11,
color: BrandColors.textColor1,
height: 1.7,
);
final progressTextStyleDark = progressTextStyleLight.copyWith(
final TextStyle progressTextStyleDark = progressTextStyleLight.copyWith(
color: BrandColors.white,
);

28
lib/logic/api_maps/api_map.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: always_specify_types
import 'dart:async';
import 'dart:developer';
import 'dart:io';
@ -10,19 +12,19 @@ import 'package:selfprivacy/logic/models/message.dart';
abstract class ApiMap {
Future<Dio> getClient() async {
var dio = Dio(await options);
final Dio dio = Dio(await options);
if (hasLogger) {
dio.interceptors.add(PrettyDioLogger());
}
dio.interceptors.add(ConsoleInterceptor());
(dio.httpClientAdapter as DefaultHttpClientAdapter).onHttpClientCreate =
(HttpClient client) {
(final HttpClient client) {
client.badCertificateCallback =
(X509Certificate cert, String host, int port) => true;
(final X509Certificate cert, final String host, final int port) => true;
return client;
};
dio.interceptors.add(InterceptorsWrapper(onError: (DioError e, handler) {
dio.interceptors.add(InterceptorsWrapper(onError: (final DioError e, final ErrorInterceptorHandler handler) {
print(e.requestOptions.path);
print(e.requestOptions.data);
@ -30,7 +32,7 @@ abstract class ApiMap {
print(e.response);
return handler.next(e);
}));
},),);
return dio;
}
@ -42,21 +44,21 @@ abstract class ApiMap {
ValidateStatus? validateStatus;
void close(Dio client) {
void close(final Dio client) {
client.close();
validateStatus = null;
}
}
class ConsoleInterceptor extends InterceptorsWrapper {
void addMessage(Message message) {
void addMessage(final Message message) {
getIt.get<ConsoleModel>().addMessage(message);
}
@override
Future onRequest(
RequestOptions options,
RequestInterceptorHandler handler,
final RequestOptions options,
final RequestInterceptorHandler handler,
) async {
addMessage(
Message(
@ -69,8 +71,8 @@ class ConsoleInterceptor extends InterceptorsWrapper {
@override
Future onResponse(
Response response,
ResponseInterceptorHandler handler,
final Response response,
final ResponseInterceptorHandler handler,
) async {
addMessage(
Message(
@ -85,8 +87,8 @@ class ConsoleInterceptor extends InterceptorsWrapper {
}
@override
Future onError(DioError err, ErrorInterceptorHandler handler) async {
var response = err.response;
Future onError(final DioError err, final ErrorInterceptorHandler handler) async {
final Response? response = err.response;
log(err.toString());
addMessage(
Message.warn(

44
lib/logic/api_maps/backblaze.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: always_specify_types
import 'dart:io';
import 'package:dio/dio.dart';
@ -14,7 +16,7 @@ class BackblazeApiAuth {
class BackblazeApplicationKey {
BackblazeApplicationKey(
{required this.applicationKeyId, required this.applicationKey});
{required this.applicationKeyId, required this.applicationKey,});
final String applicationKeyId;
final String applicationKey;
@ -25,10 +27,10 @@ class BackblazeApi extends ApiMap {
@override
BaseOptions get options {
var options = BaseOptions(baseUrl: rootAddress);
final BaseOptions options = BaseOptions(baseUrl: rootAddress);
if (isWithToken) {
var backblazeCredential = getIt<ApiConfigModel>().backblazeCredential;
var token = backblazeCredential!.applicationKey;
final BackblazeCredential? backblazeCredential = getIt<ApiConfigModel>().backblazeCredential;
final String token = backblazeCredential!.applicationKey;
options.headers = {'Authorization': 'Basic $token'};
}
@ -45,14 +47,14 @@ class BackblazeApi extends ApiMap {
String apiPrefix = '/b2api/v2';
Future<BackblazeApiAuth> getAuthorizationToken() async {
var client = await getClient();
var backblazeCredential = getIt<ApiConfigModel>().backblazeCredential;
final Dio client = await getClient();
final BackblazeCredential? backblazeCredential = getIt<ApiConfigModel>().backblazeCredential;
if (backblazeCredential == null) {
throw Exception('Backblaze credential is null');
}
final String encodedApiKey = encodedBackblazeKey(
backblazeCredential.keyId, backblazeCredential.applicationKey);
var response = await client.get(
backblazeCredential.keyId, backblazeCredential.applicationKey,);
final Response response = await client.get(
'b2_authorize_account',
options: Options(headers: {'Authorization': 'Basic $encodedApiKey'}),
);
@ -65,9 +67,9 @@ class BackblazeApi extends ApiMap {
);
}
Future<bool> isValid(String encodedApiKey) async {
var client = await getClient();
Response response = await client.get(
Future<bool> isValid(final String encodedApiKey) async {
final Dio client = await getClient();
final Response response = await client.get(
'b2_authorize_account',
options: Options(headers: {'Authorization': 'Basic $encodedApiKey'}),
);
@ -85,12 +87,12 @@ class BackblazeApi extends ApiMap {
}
// Create bucket
Future<String> createBucket(String bucketName) async {
final auth = await getAuthorizationToken();
var backblazeCredential = getIt<ApiConfigModel>().backblazeCredential;
var client = await getClient();
Future<String> createBucket(final String bucketName) async {
final BackblazeApiAuth auth = await getAuthorizationToken();
final BackblazeCredential? backblazeCredential = getIt<ApiConfigModel>().backblazeCredential;
final Dio client = await getClient();
client.options.baseUrl = auth.apiUrl;
var response = await client.post(
final Response response = await client.post(
'$apiPrefix/b2_create_bucket',
data: {
'accountId': backblazeCredential!.keyId,
@ -117,11 +119,11 @@ class BackblazeApi extends ApiMap {
}
// Create a limited capability key with access to the given bucket
Future<BackblazeApplicationKey> createKey(String bucketId) async {
final auth = await getAuthorizationToken();
var client = await getClient();
Future<BackblazeApplicationKey> createKey(final String bucketId) async {
final BackblazeApiAuth auth = await getAuthorizationToken();
final Dio client = await getClient();
client.options.baseUrl = auth.apiUrl;
var response = await client.post(
final Response response = await client.post(
'$apiPrefix/b2_create_key',
data: {
'accountId': getIt<ApiConfigModel>().backblazeCredential!.keyId,
@ -137,7 +139,7 @@ class BackblazeApi extends ApiMap {
if (response.statusCode == HttpStatus.ok) {
return BackblazeApplicationKey(
applicationKeyId: response.data['applicationKeyId'],
applicationKey: response.data['applicationKey']);
applicationKey: response.data['applicationKey'],);
} else {
throw Exception('code: ${response.statusCode}');
}

140
lib/logic/api_maps/cloudflare.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: always_specify_types
import 'dart:io';
import 'package:dio/dio.dart';
@ -7,11 +9,17 @@ import 'package:selfprivacy/logic/models/hive/server_domain.dart';
import 'package:selfprivacy/logic/models/json/dns_records.dart';
class DomainNotFoundException implements Exception {
final String message;
DomainNotFoundException(this.message);
final String message;
}
class CloudflareApi extends ApiMap {
CloudflareApi({
this.hasLogger = false,
this.isWithToken = true,
this.customToken,
});
@override
final bool hasLogger;
@override
@ -19,17 +27,11 @@ class CloudflareApi extends ApiMap {
final String? customToken;
CloudflareApi({
this.hasLogger = false,
this.isWithToken = true,
this.customToken,
});
@override
BaseOptions get options {
var options = BaseOptions(baseUrl: rootAddress);
final BaseOptions options = BaseOptions(baseUrl: rootAddress);
if (isWithToken) {
var token = getIt<ApiConfigModel>().cloudFlareKey;
final String? token = getIt<ApiConfigModel>().cloudFlareKey;
assert(token != null);
options.headers = {'Authorization': 'Bearer $token'};
}
@ -47,14 +49,12 @@ class CloudflareApi extends ApiMap {
@override
String rootAddress = 'https://api.cloudflare.com/client/v4';
Future<bool> isValid(String token) async {
validateStatus = (status) {
return status == HttpStatus.ok || status == HttpStatus.unauthorized;
};
Future<bool> isValid(final String token) async {
validateStatus = (final status) => status == HttpStatus.ok || status == HttpStatus.unauthorized;
var client = await getClient();
Response response = await client.get('/user/tokens/verify',
options: Options(headers: {'Authorization': 'Bearer $token'}));
final Dio client = await getClient();
final Response response = await client.get('/user/tokens/verify',
options: Options(headers: {'Authorization': 'Bearer $token'}),);
close(client);
@ -67,12 +67,10 @@ class CloudflareApi extends ApiMap {
}
}
Future<String> getZoneId(String domain) async {
validateStatus = (status) {
return status == HttpStatus.ok || status == HttpStatus.forbidden;
};
var client = await getClient();
Response response = await client.get(
Future<String> getZoneId(final String domain) async {
validateStatus = (final status) => status == HttpStatus.ok || status == HttpStatus.forbidden;
final Dio client = await getClient();
final Response response = await client.get(
'/zones',
queryParameters: {'name': domain},
);
@ -87,21 +85,21 @@ class CloudflareApi extends ApiMap {
}
Future<void> removeSimilarRecords({
String? ip4,
required ServerDomain cloudFlareDomain,
required final ServerDomain cloudFlareDomain,
final String? ip4,
}) async {
var domainName = cloudFlareDomain.domainName;
var domainZoneId = cloudFlareDomain.zoneId;
final String domainName = cloudFlareDomain.domainName;
final String domainZoneId = cloudFlareDomain.zoneId;
var url = '/zones/$domainZoneId/dns_records';
final String url = '/zones/$domainZoneId/dns_records';
var client = await getClient();
Response response = await client.get(url);
final Dio client = await getClient();
final Response response = await client.get(url);
List records = response.data['result'] ?? [];
var allDeleteFutures = <Future>[];
final List records = response.data['result'] ?? [];
final List<Future> allDeleteFutures = <Future>[];
for (var record in records) {
for (final record in records) {
if (record['zone_name'] == domainName) {
allDeleteFutures.add(
client.delete('$url/${record["id"]}'),
@ -114,20 +112,20 @@ class CloudflareApi extends ApiMap {
}
Future<List<DnsRecord>> getDnsRecords({
required ServerDomain cloudFlareDomain,
required final ServerDomain cloudFlareDomain,
}) async {
var domainName = cloudFlareDomain.domainName;
var domainZoneId = cloudFlareDomain.zoneId;
final String domainName = cloudFlareDomain.domainName;
final String domainZoneId = cloudFlareDomain.zoneId;
var url = '/zones/$domainZoneId/dns_records';
final String url = '/zones/$domainZoneId/dns_records';
var client = await getClient();
Response response = await client.get(url);
final Dio client = await getClient();
final Response response = await client.get(url);
List records = response.data['result'] ?? [];
var allRecords = <DnsRecord>[];
final List records = response.data['result'] ?? [];
final List<DnsRecord> allRecords = <DnsRecord>[];
for (var record in records) {
for (final record in records) {
if (record['zone_name'] == domainName) {
allRecords.add(DnsRecord(
name: record['name'],
@ -135,7 +133,7 @@ class CloudflareApi extends ApiMap {
content: record['content'],
ttl: record['ttl'],
proxied: record['proxied'],
));
),);
}
}
@ -144,17 +142,17 @@ class CloudflareApi extends ApiMap {
}
Future<void> createMultipleDnsRecords({
String? ip4,
required ServerDomain cloudFlareDomain,
required final ServerDomain cloudFlareDomain,
final String? ip4,
}) async {
var domainName = cloudFlareDomain.domainName;
var domainZoneId = cloudFlareDomain.zoneId;
var listDnsRecords = projectDnsRecords(domainName, ip4);
var allCreateFutures = <Future>[];
final String domainName = cloudFlareDomain.domainName;
final String domainZoneId = cloudFlareDomain.zoneId;
final List<DnsRecord> listDnsRecords = projectDnsRecords(domainName, ip4);
final List<Future> allCreateFutures = <Future>[];
var client = await getClient();
final Dio client = await getClient();
try {
for (var record in listDnsRecords) {
for (final DnsRecord record in listDnsRecords) {
allCreateFutures.add(
client.post(
'/zones/$domainZoneId/dns_records',
@ -171,26 +169,26 @@ class CloudflareApi extends ApiMap {
}
}
List<DnsRecord> projectDnsRecords(String? domainName, String? ip4) {
var domainA = DnsRecord(type: 'A', name: domainName, content: ip4);
List<DnsRecord> projectDnsRecords(final String? domainName, final String? ip4) {
final DnsRecord domainA = DnsRecord(type: 'A', name: domainName, content: ip4);
var mx = DnsRecord(type: 'MX', name: '@', content: domainName);
var apiA = DnsRecord(type: 'A', name: 'api', content: ip4);
var cloudA = DnsRecord(type: 'A', name: 'cloud', content: ip4);
var gitA = DnsRecord(type: 'A', name: 'git', content: ip4);
var meetA = DnsRecord(type: 'A', name: 'meet', content: ip4);
var passwordA = DnsRecord(type: 'A', name: 'password', content: ip4);
var socialA = DnsRecord(type: 'A', name: 'social', content: ip4);
var vpn = DnsRecord(type: 'A', name: 'vpn', content: ip4);
final DnsRecord mx = DnsRecord(type: 'MX', name: '@', content: domainName);
final DnsRecord apiA = DnsRecord(type: 'A', name: 'api', content: ip4);
final DnsRecord cloudA = DnsRecord(type: 'A', name: 'cloud', content: ip4);
final DnsRecord gitA = DnsRecord(type: 'A', name: 'git', content: ip4);
final DnsRecord meetA = DnsRecord(type: 'A', name: 'meet', content: ip4);
final DnsRecord passwordA = DnsRecord(type: 'A', name: 'password', content: ip4);
final DnsRecord socialA = DnsRecord(type: 'A', name: 'social', content: ip4);
final DnsRecord vpn = DnsRecord(type: 'A', name: 'vpn', content: ip4);
var txt1 = DnsRecord(
final DnsRecord txt1 = DnsRecord(
type: 'TXT',
name: '_dmarc',
content: 'v=DMARC1; p=none',
ttl: 18000,
);
var txt2 = DnsRecord(
final DnsRecord txt2 = DnsRecord(
type: 'TXT',
name: domainName,
content: 'v=spf1 a mx ip4:$ip4 -all',
@ -213,18 +211,18 @@ class CloudflareApi extends ApiMap {
}
Future<void> setDkim(
String dkimRecordString, ServerDomain cloudFlareDomain) async {
final domainZoneId = cloudFlareDomain.zoneId;
final url = '$rootAddress/zones/$domainZoneId/dns_records';
final String dkimRecordString, final ServerDomain cloudFlareDomain,) async {
final String domainZoneId = cloudFlareDomain.zoneId;
final String url = '$rootAddress/zones/$domainZoneId/dns_records';
final dkimRecord = DnsRecord(
final DnsRecord dkimRecord = DnsRecord(
type: 'TXT',
name: 'selector._domainkey',
content: dkimRecordString,
ttl: 18000,
);
var client = await getClient();
final Dio client = await getClient();
await client.post(
url,
data: dkimRecord.toJson(),
@ -234,17 +232,17 @@ class CloudflareApi extends ApiMap {
}
Future<List<String>> domainList() async {
var url = '$rootAddress/zones';
var client = await getClient();
final String url = '$rootAddress/zones';
final Dio client = await getClient();
var response = await client.get(
final Response response = await client.get(
url,
queryParameters: {'per_page': 50},
);
close(client);
return response.data['result']
.map<String>((el) => el['name'] as String)
.map<String>((final el) => el['name'] as String)
.toList();
}
}

114
lib/logic/api_maps/hetzner.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: always_specify_types
import 'dart:convert';
import 'dart:io';
@ -10,18 +12,18 @@ import 'package:selfprivacy/logic/models/hive/user.dart';
import 'package:selfprivacy/utils/password_generator.dart';
class HetznerApi extends ApiMap {
HetznerApi({this.hasLogger = false, this.isWithToken = true});
@override
bool hasLogger;
@override
bool isWithToken;
HetznerApi({this.hasLogger = false, this.isWithToken = true});
@override
BaseOptions get options {
var options = BaseOptions(baseUrl: rootAddress);
final BaseOptions options = BaseOptions(baseUrl: rootAddress);
if (isWithToken) {
var token = getIt<ApiConfigModel>().hetznerKey;
final String? token = getIt<ApiConfigModel>().hetznerKey;
assert(token != null);
options.headers = {'Authorization': 'Bearer $token'};
}
@ -36,12 +38,10 @@ class HetznerApi extends ApiMap {
@override
String rootAddress = 'https://api.hetzner.cloud/v1';
Future<bool> isValid(String token) async {
validateStatus = (status) {
return status == HttpStatus.ok || status == HttpStatus.unauthorized;
};
var client = await getClient();
Response response = await client.get(
Future<bool> isValid(final String token) async {
validateStatus = (final int? status) => status == HttpStatus.ok || status == HttpStatus.unauthorized;
final Dio client = await getClient();
final Response response = await client.get(
'/servers',
options: Options(
headers: {'Authorization': 'Bearer $token'},
@ -59,8 +59,8 @@ class HetznerApi extends ApiMap {
}
Future<ServerVolume> createVolume() async {
var client = await getClient();
Response dbCreateResponse = await client.post(
final Dio client = await getClient();
final Response dbCreateResponse = await client.post(
'/volumes',
data: {
'size': 10,
@ -71,7 +71,7 @@ class HetznerApi extends ApiMap {
'format': 'ext4'
},
);
var dbId = dbCreateResponse.data['volume']['id'];
final dbId = dbCreateResponse.data['volume']['id'];
return ServerVolume(
id: dbId,
name: dbCreateResponse.data['volume']['name'],
@ -79,21 +79,21 @@ class HetznerApi extends ApiMap {
}
Future<ServerHostingDetails> createServer({
required String cloudFlareKey,
required User rootUser,
required String domainName,
required ServerVolume dataBase,
required final String cloudFlareKey,
required final User rootUser,
required final String domainName,
required final ServerVolume dataBase,
}) async {
var client = await getClient();
final Dio client = await getClient();
var dbPassword = StringGenerators.dbPassword();
var dbId = dataBase.id;
final String dbPassword = StringGenerators.dbPassword();
final int dbId = dataBase.id;
final apiToken = StringGenerators.apiToken();
final String apiToken = StringGenerators.apiToken();
final hostname = getHostnameFromDomain(domainName);
final String hostname = getHostnameFromDomain(domainName);
final base64Password =
final String base64Password =
base64.encode(utf8.encode(rootUser.password ?? 'PASS'));
print('hostname: $hostname');
@ -101,11 +101,11 @@ class HetznerApi extends ApiMap {
/// add ssh key when you need it: e.g. "ssh_keys":["kherel"]
/// check the branch name, it could be "development" or "master".
///
final userdataString =
final String userdataString =
"#cloud-config\nruncmd:\n- curl https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-infect/raw/branch/master/nixos-infect | PROVIDER=hetzner NIX_CHANNEL=nixos-21.05 DOMAIN='$domainName' LUSER='${rootUser.login}' ENCODED_PASSWORD='$base64Password' CF_TOKEN=$cloudFlareKey DB_PASSWORD=$dbPassword API_TOKEN=$apiToken HOSTNAME=$hostname bash 2>&1 | tee /tmp/infect.log";
print(userdataString);
final data = {
final Map<String, Object> data = {
'name': hostname,
'server_type': 'cx11',
'start_after_create': false,
@ -119,7 +119,7 @@ class HetznerApi extends ApiMap {
};
print('Decoded data: $data');
Response serverCreateResponse = await client.post(
final Response serverCreateResponse = await client.post(
'/servers',
data: data,
);
@ -136,9 +136,9 @@ class HetznerApi extends ApiMap {
);
}
static String getHostnameFromDomain(String domain) {
static String getHostnameFromDomain(final String domain) {
// Replace all non-alphanumeric characters with an underscore
var hostname =
String hostname =
domain.split('.')[0].replaceAll(RegExp(r'[^a-zA-Z0-9]'), '-');
if (hostname.endsWith('-')) {
hostname = hostname.substring(0, hostname.length - 1);
@ -154,24 +154,24 @@ class HetznerApi extends ApiMap {
}
Future<void> deleteSelfprivacyServerAndAllVolumes({
required String domainName,
required final String domainName,
}) async {
var client = await getClient();
final Dio client = await getClient();
final hostname = getHostnameFromDomain(domainName);
final String hostname = getHostnameFromDomain(domainName);
Response serversReponse = await client.get('/servers');
List servers = serversReponse.data['servers'];
Map server = servers.firstWhere((el) => el['name'] == hostname);
List volumes = server['volumes'];
var laterFutures = <Future>[];
final Response serversReponse = await client.get('/servers');
final List servers = serversReponse.data['servers'];
final Map server = servers.firstWhere((final el) => el['name'] == hostname);
final List volumes = server['volumes'];
final List<Future> laterFutures = <Future>[];
for (var volumeId in volumes) {
for (final volumeId in volumes) {
await client.post('/volumes/$volumeId/actions/detach');
}
await Future.delayed(const Duration(seconds: 10));
for (var volumeId in volumes) {
for (final volumeId in volumes) {
laterFutures.add(client.delete('/volumes/$volumeId'));
}
laterFutures.add(client.delete('/servers/${server['id']}'));
@ -181,9 +181,9 @@ class HetznerApi extends ApiMap {
}
Future<ServerHostingDetails> reset() async {
var server = getIt<ApiConfigModel>().serverDetails!;
final ServerHostingDetails server = getIt<ApiConfigModel>().serverDetails!;
var client = await getClient();
final Dio client = await getClient();
await client.post('/servers/${server.id}/actions/reset');
close(client);
@ -191,9 +191,9 @@ class HetznerApi extends ApiMap {
}
Future<ServerHostingDetails> powerOn() async {
var server = getIt<ApiConfigModel>().serverDetails!;
final ServerHostingDetails server = getIt<ApiConfigModel>().serverDetails!;
var client = await getClient();
final Dio client = await getClient();
await client.post('/servers/${server.id}/actions/poweron');
close(client);
@ -201,16 +201,16 @@ class HetznerApi extends ApiMap {
}
Future<Map<String, dynamic>> getMetrics(
DateTime start, DateTime end, String type) async {
var hetznerServer = getIt<ApiConfigModel>().serverDetails;
var client = await getClient();
final DateTime start, final DateTime end, final String type,) async {
final ServerHostingDetails? hetznerServer = getIt<ApiConfigModel>().serverDetails;
final Dio client = await getClient();
Map<String, dynamic> queryParameters = {
final Map<String, dynamic> queryParameters = {
'start': start.toUtc().toIso8601String(),
'end': end.toUtc().toIso8601String(),
'type': type
};
var res = await client.get(
final Response res = await client.get(
'/servers/${hetznerServer!.id}/metrics',
queryParameters: queryParameters,
);
@ -219,30 +219,30 @@ class HetznerApi extends ApiMap {
}
Future<HetznerServerInfo> getInfo() async {
var hetznerServer = getIt<ApiConfigModel>().serverDetails;
var client = await getClient();
Response response = await client.get('/servers/${hetznerServer!.id}');
final ServerHostingDetails? hetznerServer = getIt<ApiConfigModel>().serverDetails;
final Dio client = await getClient();
final Response response = await client.get('/servers/${hetznerServer!.id}');
close(client);
return HetznerServerInfo.fromJson(response.data!['server']);
}
Future<List<HetznerServerInfo>> getServers() async {
var client = await getClient();
Response response = await client.get('/servers');
final Dio client = await getClient();
final Response response = await client.get('/servers');
close(client);
return (response.data!['servers'] as List)
.map((e) => HetznerServerInfo.fromJson(e))
.map((final e) => HetznerServerInfo.fromJson(e))
.toList();
}
Future<void> createReverseDns({
required String ip4,
required String domainName,
required final String ip4,
required final String domainName,
}) async {
var hetznerServer = getIt<ApiConfigModel>().serverDetails;
var client = await getClient();
final ServerHostingDetails? hetznerServer = getIt<ApiConfigModel>().serverDetails;
final Dio client = await getClient();
await client.post(
'/servers/${hetznerServer!.id}/actions/change_dns_ptr',
data: {

191
lib/logic/api_maps/server.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: always_specify_types
import 'dart:async';
import 'dart:convert';
import 'dart:io';
@ -6,6 +8,7 @@ import 'package:dio/dio.dart';
import 'package:selfprivacy/config/get_it_config.dart';
import 'package:selfprivacy/logic/common_enum/common_enum.dart';
import 'package:selfprivacy/logic/models/hive/backblaze_bucket.dart';
import 'package:selfprivacy/logic/models/hive/server_domain.dart';
import 'package:selfprivacy/logic/models/hive/user.dart';
import 'package:selfprivacy/logic/models/json/api_token.dart';
import 'package:selfprivacy/logic/models/json/auto_upgrade_settings.dart';
@ -14,23 +17,29 @@ import 'package:selfprivacy/logic/models/json/device_token.dart';
import 'package:selfprivacy/logic/models/json/recovery_token_status.dart';
import 'package:selfprivacy/logic/models/timezone_settings.dart';
import 'api_map.dart';
import 'package:selfprivacy/logic/api_maps/api_map.dart';
class ApiResponse<D> {
ApiResponse({
required this.statusCode,
required this.data,
this.errorMessage,
});
final int statusCode;
final String? errorMessage;
final D data;
bool get isSuccess => statusCode >= 200 && statusCode < 300;
ApiResponse({
required this.statusCode,
this.errorMessage,
required this.data,
});
}
class ServerApi extends ApiMap {
ServerApi(
{this.hasLogger = false,
this.isWithToken = true,
this.overrideDomain,
this.customToken,});
@override
bool hasLogger;
@override
@ -38,24 +47,18 @@ class ServerApi extends ApiMap {
String? overrideDomain;
String? customToken;
ServerApi(
{this.hasLogger = false,
this.isWithToken = true,
this.overrideDomain,
this.customToken});
@override
BaseOptions get options {
var options = BaseOptions();
BaseOptions options = BaseOptions();
if (isWithToken) {
var cloudFlareDomain = getIt<ApiConfigModel>().serverDomain;
var domainName = cloudFlareDomain!.domainName;
var apiToken = getIt<ApiConfigModel>().serverDetails?.apiToken;
final ServerDomain? cloudFlareDomain = getIt<ApiConfigModel>().serverDomain;
final String domainName = cloudFlareDomain!.domainName;
final String? apiToken = getIt<ApiConfigModel>().serverDetails?.apiToken;
options = BaseOptions(baseUrl: 'https://api.$domainName', headers: {
'Authorization': 'Bearer $apiToken',
});
},);
}
if (overrideDomain != null) {
@ -73,7 +76,7 @@ class ServerApi extends ApiMap {
Future<String?> getApiVersion() async {
Response response;
var client = await getClient();
final Dio client = await getClient();
String? apiVersion;
try {
@ -91,7 +94,7 @@ class ServerApi extends ApiMap {
bool res = false;
Response response;
var client = await getClient();
final Dio client = await getClient();
try {
response = await client.get('/services/status');
res = response.statusCode == HttpStatus.ok;
@ -103,10 +106,10 @@ class ServerApi extends ApiMap {
return res;
}
Future<ApiResponse<User>> createUser(User user) async {
Future<ApiResponse<User>> createUser(final User user) async {
Response response;
var client = await getClient();
final Dio client = await getClient();
try {
response = await client.post(
'/users',
@ -154,15 +157,15 @@ class ServerApi extends ApiMap {
);
}
Future<ApiResponse<List<String>>> getUsersList({withMainUser = false}) async {
List<String> res = [];
Future<ApiResponse<List<String>>> getUsersList({final withMainUser = false}) async {
final List<String> res = [];
Response response;
var client = await getClient();
final Dio client = await getClient();
try {
response = await client.get('/users',
queryParameters: withMainUser ? {'withMainUser': 'true'} : null);
for (var user in response.data) {
queryParameters: withMainUser ? {'withMainUser': 'true'} : null,);
for (final user in response.data) {
res.add(user.toString());
}
} on DioError catch (e) {
@ -191,10 +194,10 @@ class ServerApi extends ApiMap {
);
}
Future<ApiResponse<void>> addUserSshKey(User user, String sshKey) async {
Future<ApiResponse<void>> addUserSshKey(final User user, final String sshKey) async {
late Response response;
var client = await getClient();
final Dio client = await getClient();
try {
response = await client.post(
'/services/ssh/keys/${user.login}',
@ -221,10 +224,10 @@ class ServerApi extends ApiMap {
);
}
Future<ApiResponse<void>> addRootSshKey(String ssh) async {
Future<ApiResponse<void>> addRootSshKey(final String ssh) async {
late Response response;
var client = await getClient();
final Dio client = await getClient();
try {
response = await client.put(
'/services/ssh/key/send',
@ -249,14 +252,14 @@ class ServerApi extends ApiMap {
);
}
Future<ApiResponse<List<String>>> getUserSshKeys(User user) async {
Future<ApiResponse<List<String>>> getUserSshKeys(final User user) async {
List<String> res;
Response response;
var client = await getClient();
final Dio client = await getClient();
try {
response = await client.get('/services/ssh/keys/${user.login}');
res = (response.data as List<dynamic>).map((e) => e as String).toList();
res = (response.data as List<dynamic>).map((final e) => e as String).toList();
} on DioError catch (e) {
print(e.message);
return ApiResponse<List<String>>(
@ -287,10 +290,10 @@ class ServerApi extends ApiMap {
);
}
Future<ApiResponse<void>> deleteUserSshKey(User user, String sshKey) async {
Future<ApiResponse<void>> deleteUserSshKey(final User user, final String sshKey) async {
Response response;
var client = await getClient();
final Dio client = await getClient();
try {
response = await client.delete(
'/services/ssh/keys/${user.login}',
@ -318,11 +321,11 @@ class ServerApi extends ApiMap {
);
}
Future<bool> deleteUser(User user) async {
Future<bool> deleteUser(final User user) async {
bool res = false;
Response response;
var client = await getClient();
final Dio client = await getClient();
try {
response = await client.delete('/users/${user.login}');
res = response.statusCode == HttpStatus.ok ||
@ -344,7 +347,7 @@ class ServerApi extends ApiMap {
bool res = false;
Response response;
var client = await getClient();
final Dio client = await getClient();
try {
response = await client.get('/system/configuration/apply');
res = response.statusCode == HttpStatus.ok;
@ -357,8 +360,8 @@ class ServerApi extends ApiMap {
return res;
}
Future<void> switchService(ServiceTypes type, bool needToTurnOn) async {
var client = await getClient();
Future<void> switchService(final ServiceTypes type, final bool needToTurnOn) async {
final Dio client = await getClient();
try {
client.post(
'/services/${type.url}/${needToTurnOn ? 'enable' : 'disable'}',
@ -373,7 +376,7 @@ class ServerApi extends ApiMap {
Future<Map<ServiceTypes, bool>> servicesPowerCheck() async {
Response response;
var client = await getClient();
final Dio client = await getClient();
try {
response = await client.get('/services/status');
} on DioError catch (e) {
@ -392,8 +395,8 @@ class ServerApi extends ApiMap {
};
}
Future<void> uploadBackblazeConfig(BackblazeBucket bucket) async {
var client = await getClient();
Future<void> uploadBackblazeConfig(final BackblazeBucket bucket) async {
final Dio client = await getClient();
try {
client.put(
'/services/restic/backblaze/config',
@ -411,7 +414,7 @@ class ServerApi extends ApiMap {
}
Future<void> startBackup() async {
var client = await getClient();
final Dio client = await getClient();
try {
client.put('/services/restic/backup/create');
} on DioError catch (e) {
@ -425,10 +428,10 @@ class ServerApi extends ApiMap {
Response response;
List<Backup> backups = [];
var client = await getClient();
final Dio client = await getClient();
try {
response = await client.get('/services/restic/backup/list');
backups = response.data.map<Backup>((e) => Backup.fromJson(e)).toList();
backups = response.data.map<Backup>((final e) => Backup.fromJson(e)).toList();
} on DioError catch (e) {
print(e.message);
} catch (e) {
@ -447,7 +450,7 @@ class ServerApi extends ApiMap {
progress: 0,
);
var client = await getClient();
final Dio client = await getClient();
try {
response = await client.get('/services/restic/backup/status');
status = BackupStatus.fromJson(response.data);
@ -460,7 +463,7 @@ class ServerApi extends ApiMap {
}
Future<void> forceBackupListReload() async {
var client = await getClient();
final Dio client = await getClient();
try {
client.get('/services/restic/backup/reload');
} on DioError catch (e) {
@ -470,8 +473,8 @@ class ServerApi extends ApiMap {
}
}
Future<void> restoreBackup(String backupId) async {
var client = await getClient();
Future<void> restoreBackup(final String backupId) async {
final Dio client = await getClient();
try {
client.put(
'/services/restic/backup/restore',
@ -488,7 +491,7 @@ class ServerApi extends ApiMap {
Response response;
bool result = false;
var client = await getClient();
final Dio client = await getClient();
try {
response = await client.get('/system/configuration/pull');
result = (response.statusCode != null)
@ -506,7 +509,7 @@ class ServerApi extends ApiMap {
Response response;
bool result = false;
var client = await getClient();
final Dio client = await getClient();
try {
response = await client.get('/system/reboot');
result = (response.statusCode != null)
@ -524,7 +527,7 @@ class ServerApi extends ApiMap {
Response response;
bool result = false;
var client = await getClient();
final Dio client = await getClient();
try {
response = await client.get('/system/configuration/upgrade');
result = (response.statusCode != null)
@ -545,7 +548,7 @@ class ServerApi extends ApiMap {
allowReboot: false,
);
var client = await getClient();
final Dio client = await getClient();
try {
response = await client.get('/system/configuration/autoUpgrade');
if (response.data != null) {
@ -559,8 +562,8 @@ class ServerApi extends ApiMap {
return settings;
}
Future<void> updateAutoUpgradeSettings(AutoUpgradeSettings settings) async {
var client = await getClient();
Future<void> updateAutoUpgradeSettings(final AutoUpgradeSettings settings) async {
final Dio client = await getClient();
try {
await client.put(
'/system/configuration/autoUpgrade',
@ -575,15 +578,15 @@ class ServerApi extends ApiMap {
Future<TimeZoneSettings> getServerTimezone() async {
// I am not sure how to initialize TimeZoneSettings with default value...
var client = await getClient();
Response response = await client.get('/system/configuration/timezone');
final Dio client = await getClient();
final Response response = await client.get('/system/configuration/timezone');
close(client);
return TimeZoneSettings.fromString(response.data);
}
Future<void> updateServerTimezone(TimeZoneSettings settings) async {
var client = await getClient();
Future<void> updateServerTimezone(final TimeZoneSettings settings) async {
final Dio client = await getClient();
try {
await client.put(
'/system/configuration/timezone',
@ -599,7 +602,7 @@ class ServerApi extends ApiMap {
Future<String?> getDkim() async {
Response response;
var client = await getClient();
final Dio client = await getClient();
try {
response = await client.get('/services/mailserver/dkim');
} on DioError catch (e) {
@ -621,7 +624,7 @@ class ServerApi extends ApiMap {
return '';
}
final base64toString = utf8.fuse(base64);
final Codec<String, String> base64toString = utf8.fuse(base64);
return base64toString
.decode(response.data)
@ -633,7 +636,7 @@ class ServerApi extends ApiMap {
Future<ApiResponse<RecoveryKeyStatus?>> getRecoveryTokenStatus() async {
Response response;
var client = await getClient();
final Dio client = await getClient();
try {
response = await client.get('/auth/recovery_token');
} on DioError catch (e) {
@ -641,7 +644,7 @@ class ServerApi extends ApiMap {
return ApiResponse(
errorMessage: e.message,
statusCode: e.response?.statusCode ?? HttpStatus.internalServerError,
data: const RecoveryKeyStatus(exists: false, valid: false));
data: const RecoveryKeyStatus(exists: false, valid: false),);
} finally {
close(client);
}
@ -652,17 +655,17 @@ class ServerApi extends ApiMap {
statusCode: code,
data: response.data != null
? RecoveryKeyStatus.fromJson(response.data)
: null);
: null,);
}
Future<ApiResponse<String>> generateRecoveryToken(
DateTime? expiration,
int? uses,
final DateTime? expiration,
final int? uses,
) async {
Response response;
var client = await getClient();
var data = {};
final Dio client = await getClient();
final Map data = {};
if (expiration != null) {
data['expiration'] = '${expiration.toIso8601String()}Z';
print(data['expiration']);
@ -680,7 +683,7 @@ class ServerApi extends ApiMap {
return ApiResponse(
errorMessage: e.message,
statusCode: e.response?.statusCode ?? HttpStatus.internalServerError,
data: '');
data: '',);
} finally {
close(client);
}
@ -689,13 +692,13 @@ class ServerApi extends ApiMap {
return ApiResponse(
statusCode: code,
data: response.data != null ? response.data['token'] : '');
data: response.data != null ? response.data['token'] : '',);
}
Future<ApiResponse<String>> useRecoveryToken(DeviceToken token) async {
Future<ApiResponse<String>> useRecoveryToken(final DeviceToken token) async {
Response response;
var client = await getClient();
final Dio client = await getClient();
try {
response = await client.post(
'/auth/recovery_token/use',
@ -709,7 +712,7 @@ class ServerApi extends ApiMap {
return ApiResponse(
errorMessage: e.message,
statusCode: e.response?.statusCode ?? HttpStatus.internalServerError,
data: '');
data: '',);
} finally {
client.close();
}
@ -718,13 +721,13 @@ class ServerApi extends ApiMap {
return ApiResponse(
statusCode: code,
data: response.data != null ? response.data['token'] : '');
data: response.data != null ? response.data['token'] : '',);
}
Future<ApiResponse<String>> authorizeDevice(DeviceToken token) async {
Future<ApiResponse<String>> authorizeDevice(final DeviceToken token) async {
Response response;
var client = await getClient();
final Dio client = await getClient();
try {
response = await client.post(
'/auth/new_device/authorize',
@ -738,7 +741,7 @@ class ServerApi extends ApiMap {
return ApiResponse(
errorMessage: e.message,
statusCode: e.response?.statusCode ?? HttpStatus.internalServerError,
data: '');
data: '',);
} finally {
client.close();
}
@ -751,7 +754,7 @@ class ServerApi extends ApiMap {
Future<ApiResponse<String>> createDeviceToken() async {
Response response;
var client = await getClient();
final Dio client = await getClient();
try {
response = await client.post('/auth/new_device');
} on DioError catch (e) {
@ -759,7 +762,7 @@ class ServerApi extends ApiMap {
return ApiResponse(
errorMessage: e.message,
statusCode: e.response?.statusCode ?? HttpStatus.internalServerError,
data: '');
data: '',);
} finally {
client.close();
}
@ -768,13 +771,13 @@ class ServerApi extends ApiMap {
return ApiResponse(
statusCode: code,
data: response.data != null ? response.data['token'] : '');
data: response.data != null ? response.data['token'] : '',);
}
Future<ApiResponse<String>> deleteDeviceToken() async {
Response response;
var client = await getClient();
final Dio client = await getClient();
try {
response = await client.delete('/auth/new_device');
} on DioError catch (e) {
@ -782,7 +785,7 @@ class ServerApi extends ApiMap {
return ApiResponse(
errorMessage: e.message,
statusCode: e.response?.statusCode ?? HttpStatus.internalServerError,
data: '');
data: '',);
} finally {
client.close();
}
@ -795,7 +798,7 @@ class ServerApi extends ApiMap {
Future<ApiResponse<List<ApiToken>>> getApiTokens() async {
Response response;
var client = await getClient();
final Dio client = await getClient();
try {
response = await client.get('/auth/tokens');
} on DioError catch (e) {
@ -803,7 +806,7 @@ class ServerApi extends ApiMap {
return ApiResponse(
errorMessage: e.message,
statusCode: e.response?.statusCode ?? HttpStatus.internalServerError,
data: []);
data: [],);
} finally {
client.close();
}
@ -813,14 +816,14 @@ class ServerApi extends ApiMap {
return ApiResponse(
statusCode: code,
data: (response.data != null)
? response.data.map<ApiToken>((e) => ApiToken.fromJson(e)).toList()
: []);
? response.data.map<ApiToken>((final e) => ApiToken.fromJson(e)).toList()
: [],);
}
Future<ApiResponse<String>> refreshCurrentApiToken() async {
Response response;
var client = await getClient();
final Dio client = await getClient();
try {
response = await client.post('/auth/tokens');
} on DioError catch (e) {
@ -828,7 +831,7 @@ class ServerApi extends ApiMap {
return ApiResponse(
errorMessage: e.message,
statusCode: e.response?.statusCode ?? HttpStatus.internalServerError,
data: '');
data: '',);
} finally {
client.close();
}
@ -837,12 +840,12 @@ class ServerApi extends ApiMap {
return ApiResponse(
statusCode: code,
data: response.data != null ? response.data['token'] : '');
data: response.data != null ? response.data['token'] : '',);
}
Future<ApiResponse<void>> deleteApiToken(String device) async {
Future<ApiResponse<void>> deleteApiToken(final String device) async {
Response response;
var client = await getClient();
final Dio client = await getClient();
try {
response = await client.delete(
'/auth/tokens',
@ -855,7 +858,7 @@ class ServerApi extends ApiMap {
return ApiResponse(
errorMessage: e.message,
statusCode: e.response?.statusCode ?? HttpStatus.internalServerError,
data: null);
data: null,);
} finally {
client.close();
}

6
lib/logic/cubit/app_config_dependent/authentication_dependend_cubit.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: always_specify_types
import 'dart:async';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:equatable/equatable.dart';
@ -11,14 +13,14 @@ abstract class ServerInstallationDependendCubit<
T extends ServerInstallationDependendState> extends Cubit<T> {
ServerInstallationDependendCubit(
this.serverInstallationCubit,
T initState,
final T initState,
) : super(initState) {
authCubitSubscription =
serverInstallationCubit.stream.listen(checkAuthStatus);
checkAuthStatus(serverInstallationCubit.state);
}
void checkAuthStatus(ServerInstallationState state) {
void checkAuthStatus(final ServerInstallationState state) {
if (state is ServerInstallationFinished) {
load();
} else if (state is ServerInstallationEmpty) {

14
lib/logic/cubit/app_settings/app_settings_cubit.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: always_specify_types
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:equatable/equatable.dart';
import 'package:hive/hive.dart';
@ -9,8 +11,8 @@ part 'app_settings_state.dart';
class AppSettingsCubit extends Cubit<AppSettingsState> {
AppSettingsCubit({
required bool isDarkModeOn,
required bool isOnboardingShowing,
required final bool isDarkModeOn,
required final bool isOnboardingShowing,
}) : super(
AppSettingsState(
isDarkModeOn: isDarkModeOn,
@ -21,15 +23,15 @@ class AppSettingsCubit extends Cubit<AppSettingsState> {
Box box = Hive.box(BNames.appSettingsBox);
void load() {
bool? isDarkModeOn = box.get(BNames.isDarkModeOn);
bool? isOnboardingShowing = box.get(BNames.isOnboardingShowing);
final bool? isDarkModeOn = box.get(BNames.isDarkModeOn);
final bool? isOnboardingShowing = box.get(BNames.isOnboardingShowing);
emit(state.copyWith(
isDarkModeOn: isDarkModeOn,
isOnboardingShowing: isOnboardingShowing,
));
),);
}
void updateDarkMode({required bool isDarkModeOn}) {
void updateDarkMode({required final bool isDarkModeOn}) {
box.put(BNames.isDarkModeOn, isDarkModeOn);
emit(state.copyWith(isDarkModeOn: isDarkModeOn));
}

4
lib/logic/cubit/app_settings/app_settings_state.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: always_specify_types
part of 'app_settings_cubit.dart';
class AppSettingsState extends Equatable {
@ -9,7 +11,7 @@ class AppSettingsState extends Equatable {
final bool isDarkModeOn;
final bool isOnboardingShowing;
AppSettingsState copyWith({isDarkModeOn, isOnboardingShowing}) =>
AppSettingsState copyWith({final isDarkModeOn, final isOnboardingShowing}) =>
AppSettingsState(
isDarkModeOn: isDarkModeOn ?? this.isDarkModeOn,
isOnboardingShowing: isOnboardingShowing ?? this.isOnboardingShowing,

56
lib/logic/cubit/backups/backups_cubit.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: always_specify_types
import 'dart:async';
import 'package:easy_localization/easy_localization.dart';
@ -11,22 +13,22 @@ import 'package:selfprivacy/logic/models/json/backup.dart';
part 'backups_state.dart';
class BackupsCubit extends ServerInstallationDependendCubit<BackupsState> {
BackupsCubit(ServerInstallationCubit serverInstallationCubit)
BackupsCubit(final ServerInstallationCubit serverInstallationCubit)
: super(
serverInstallationCubit, const BackupsState(preventActions: true));
serverInstallationCubit, const BackupsState(preventActions: true),);
final api = ServerApi();
final backblaze = BackblazeApi();
final ServerApi api = ServerApi();
final BackblazeApi backblaze = BackblazeApi();
@override
Future<void> load() async {
if (serverInstallationCubit.state is ServerInstallationFinished) {
final bucket = getIt<ApiConfigModel>().backblazeBucket;
final BackblazeBucket? bucket = getIt<ApiConfigModel>().backblazeBucket;
if (bucket == null) {
emit(const BackupsState(
isInitialized: false, preventActions: false, refreshing: false));
isInitialized: false, preventActions: false, refreshing: false,),);
} else {
final status = await api.getBackupStatus();
final BackupStatus status = await api.getBackupStatus();
switch (status.status) {
case BackupStatusEnum.noKey:
case BackupStatusEnum.notInitialized:
@ -37,7 +39,7 @@ class BackupsCubit extends ServerInstallationDependendCubit<BackupsState> {
progress: 0,
status: status.status,
refreshing: false,
));
),);
break;
case BackupStatusEnum.initializing:
emit(BackupsState(
@ -48,11 +50,11 @@ class BackupsCubit extends ServerInstallationDependendCubit<BackupsState> {
status: status.status,
refreshTimer: const Duration(seconds: 10),
refreshing: false,
));
),);
break;
case BackupStatusEnum.initialized:
case BackupStatusEnum.error:
final backups = await api.getBackups();
final List<Backup> backups = await api.getBackups();
emit(BackupsState(
backups: backups,
isInitialized: true,
@ -61,11 +63,11 @@ class BackupsCubit extends ServerInstallationDependendCubit<BackupsState> {
status: status.status,
error: status.errorMessage ?? '',
refreshing: false,
));
),);
break;
case BackupStatusEnum.backingUp:
case BackupStatusEnum.restoring:
final backups = await api.getBackups();
final List<Backup> backups = await api.getBackups();
emit(BackupsState(
backups: backups,
isInitialized: true,
@ -75,7 +77,7 @@ class BackupsCubit extends ServerInstallationDependendCubit<BackupsState> {
error: status.errorMessage ?? '',
refreshTimer: const Duration(seconds: 5),
refreshing: false,
));
),);
break;
default:
emit(const BackupsState());
@ -87,22 +89,22 @@ class BackupsCubit extends ServerInstallationDependendCubit<BackupsState> {
Future<void> createBucket() async {
emit(state.copyWith(preventActions: true));
final domain = serverInstallationCubit.state.serverDomain!.domainName
final String domain = serverInstallationCubit.state.serverDomain!.domainName
.replaceAll(RegExp(r'[^a-zA-Z0-9]'), '-');
final serverId = serverInstallationCubit.state.serverDetails!.id;
var bucketName = 'selfprivacy-$domain-$serverId';
final int serverId = serverInstallationCubit.state.serverDetails!.id;
String bucketName = 'selfprivacy-$domain-$serverId';
// If bucket name is too long, shorten it
if (bucketName.length > 49) {
bucketName = bucketName.substring(0, 49);
}
final bucketId = await backblaze.createBucket(bucketName);
final String bucketId = await backblaze.createBucket(bucketName);
final key = await backblaze.createKey(bucketId);
final bucket = BackblazeBucket(
final BackblazeApplicationKey key = await backblaze.createKey(bucketId);
final BackblazeBucket bucket = BackblazeBucket(
bucketId: bucketId,
bucketName: bucketName,
applicationKey: key.applicationKey,
applicationKeyId: key.applicationKeyId);
applicationKeyId: key.applicationKeyId,);
await getIt<ApiConfigModel>().storeBackblazeBucket(bucket);
await api.uploadBackblazeConfig(bucket);
@ -113,7 +115,7 @@ class BackupsCubit extends ServerInstallationDependendCubit<BackupsState> {
Future<void> reuploadKey() async {
emit(state.copyWith(preventActions: true));
final bucket = getIt<ApiConfigModel>().backblazeBucket;
final BackblazeBucket? bucket = getIt<ApiConfigModel>().backblazeBucket;
if (bucket == null) {
emit(state.copyWith(isInitialized: false));
} else {
@ -123,7 +125,7 @@ class BackupsCubit extends ServerInstallationDependendCubit<BackupsState> {
}
}
Duration refreshTimeFromState(BackupStatusEnum status) {
Duration refreshTimeFromState(final BackupStatusEnum status) {
switch (status) {
case BackupStatusEnum.backingUp:
case BackupStatusEnum.restoring:
@ -135,10 +137,10 @@ class BackupsCubit extends ServerInstallationDependendCubit<BackupsState> {
}
}
Future<void> updateBackups({bool useTimer = false}) async {
Future<void> updateBackups({final bool useTimer = false}) async {
emit(state.copyWith(refreshing: true));
final backups = await api.getBackups();
final status = await api.getBackupStatus();
final List<Backup> backups = await api.getBackups();
final BackupStatus status = await api.getBackupStatus();
emit(state.copyWith(
backups: backups,
progress: status.progress,
@ -146,7 +148,7 @@ class BackupsCubit extends ServerInstallationDependendCubit<BackupsState> {
error: status.errorMessage,
refreshTimer: refreshTimeFromState(status.status),
refreshing: false,
));
),);
if (useTimer) {
Timer(state.refreshTimer, () => updateBackups(useTimer: true));
}
@ -167,7 +169,7 @@ class BackupsCubit extends ServerInstallationDependendCubit<BackupsState> {
emit(state.copyWith(preventActions: false));
}
Future<void> restoreBackup(String backupId) async {
Future<void> restoreBackup(final String backupId) async {
emit(state.copyWith(preventActions: true));
await api.restoreBackup(backupId);
emit(state.copyWith(preventActions: false));

18
lib/logic/cubit/backups/backups_state.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: always_specify_types
part of 'backups_cubit.dart';
class BackupsState extends ServerInstallationDependendState {
@ -34,14 +36,14 @@ class BackupsState extends ServerInstallationDependendState {
];
BackupsState copyWith({
bool? isInitialized,
List<Backup>? backups,
double? progress,
BackupStatusEnum? status,
bool? preventActions,
String? error,
Duration? refreshTimer,
bool? refreshing,
final bool? isInitialized,
final List<Backup>? backups,
final double? progress,
final BackupStatusEnum? status,
final bool? preventActions,
final String? error,
final Duration? refreshTimer,
final bool? refreshing,
}) =>
BackupsState(
isInitialized: isInitialized ?? this.isInitialized,

24
lib/logic/cubit/devices/devices_cubit.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: always_specify_types
import 'package:selfprivacy/config/get_it_config.dart';
import 'package:selfprivacy/logic/api_maps/server.dart';
import 'package:selfprivacy/logic/common_enum/common_enum.dart';
@ -8,16 +10,16 @@ part 'devices_state.dart';
class ApiDevicesCubit
extends ServerInstallationDependendCubit<ApiDevicesState> {
ApiDevicesCubit(ServerInstallationCubit serverInstallationCubit)
ApiDevicesCubit(final ServerInstallationCubit serverInstallationCubit)
: super(serverInstallationCubit, const ApiDevicesState.initial());
final api = ServerApi();
final ServerApi api = ServerApi();
@override
void load() async {
if (serverInstallationCubit.state is ServerInstallationFinished) {
emit(const ApiDevicesState([], LoadingStatus.refreshing));
final devices = await _getApiTokens();
final List<ApiToken>? devices = await _getApiTokens();
if (devices != null) {
emit(ApiDevicesState(devices, LoadingStatus.success));
} else {
@ -28,7 +30,7 @@ class ApiDevicesCubit
Future<void> refresh() async {
emit(const ApiDevicesState([], LoadingStatus.refreshing));
final devices = await _getApiTokens();
final List<ApiToken>? devices = await _getApiTokens();
if (devices != null) {
emit(ApiDevicesState(devices, LoadingStatus.success));
} else {
@ -37,7 +39,7 @@ class ApiDevicesCubit
}
Future<List<ApiToken>?> _getApiTokens() async {
final response = await api.getApiTokens();
final ApiResponse<List<ApiToken>> response = await api.getApiTokens();
if (response.isSuccess) {
return response.data;
} else {
@ -45,12 +47,12 @@ class ApiDevicesCubit
}
}
Future<void> deleteDevice(ApiToken device) async {
final response = await api.deleteApiToken(device.name);
Future<void> deleteDevice(final ApiToken device) async {
final ApiResponse<void> response = await api.deleteApiToken(device.name);
if (response.isSuccess) {
emit(ApiDevicesState(
state.devices.where((d) => d.name != device.name).toList(),
LoadingStatus.success));
state.devices.where((final d) => d.name != device.name).toList(),
LoadingStatus.success,),);
} else {
getIt<NavigationService>()
.showSnackBar(response.errorMessage ?? 'Error deleting device');
@ -58,12 +60,12 @@ class ApiDevicesCubit
}
Future<String?> getNewDeviceKey() async {
final response = await api.createDeviceToken();
final ApiResponse<String> response = await api.createDeviceToken();
if (response.isSuccess) {
return response.data;
} else {
getIt<NavigationService>().showSnackBar(
response.errorMessage ?? 'Error getting new device key');
response.errorMessage ?? 'Error getting new device key',);
return null;
}
}

16
lib/logic/cubit/devices/devices_state.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: always_specify_types
part of 'devices_cubit.dart';
class ApiDevicesState extends ServerInstallationDependendState {
@ -8,25 +10,23 @@ class ApiDevicesState extends ServerInstallationDependendState {
final LoadingStatus status;
List<ApiToken> get devices => _devices;
ApiToken get thisDevice => _devices.firstWhere((device) => device.isCaller,
ApiToken get thisDevice => _devices.firstWhere((final device) => device.isCaller,
orElse: () => ApiToken(
name: 'Error fetching device',
isCaller: true,
date: DateTime.now(),
));
),);
List<ApiToken> get otherDevices =>
_devices.where((device) => !device.isCaller).toList();
_devices.where((final device) => !device.isCaller).toList();
ApiDevicesState copyWith({
List<ApiToken>? devices,
LoadingStatus? status,
}) {
return ApiDevicesState(
final List<ApiToken>? devices,
final LoadingStatus? status,
}) => ApiDevicesState(
devices ?? _devices,
status ?? this.status,
);
}
@override
List<Object?> get props => [_devices];

48
lib/logic/cubit/dns_records/dns_records_cubit.dart
View file

@ -1,28 +1,30 @@
// ignore_for_file: always_specify_types
import 'package:cubit_form/cubit_form.dart';
import 'package:selfprivacy/logic/cubit/app_config_dependent/authentication_dependend_cubit.dart';
import 'package:selfprivacy/logic/models/hive/server_domain.dart';
import 'package:selfprivacy/logic/models/json/dns_records.dart';
import '../../api_maps/cloudflare.dart';
import '../../api_maps/server.dart';
import 'package:selfprivacy/logic/api_maps/cloudflare.dart';
import 'package:selfprivacy/logic/api_maps/server.dart';
part 'dns_records_state.dart';
class DnsRecordsCubit
extends ServerInstallationDependendCubit<DnsRecordsState> {
DnsRecordsCubit(ServerInstallationCubit serverInstallationCubit)
DnsRecordsCubit(final ServerInstallationCubit serverInstallationCubit)
: super(serverInstallationCubit,
const DnsRecordsState(dnsState: DnsRecordsStatus.refreshing));
const DnsRecordsState(dnsState: DnsRecordsStatus.refreshing),);
final api = ServerApi();
final cloudflare = CloudflareApi();
final ServerApi api = ServerApi();
final CloudflareApi cloudflare = CloudflareApi();
@override
Future<void> load() async {
emit(DnsRecordsState(
dnsState: DnsRecordsStatus.refreshing,
dnsRecords: _getDesiredDnsRecords(
serverInstallationCubit.state.serverDomain?.domainName, '', '')));
serverInstallationCubit.state.serverDomain?.domainName, '', '',),),);
print('Loading DNS status');
if (serverInstallationCubit.state is ServerInstallationFinished) {
final ServerDomain? domain = serverInstallationCubit.state.serverDomain;
@ -31,37 +33,37 @@ class DnsRecordsCubit
if (domain != null && ipAddress != null) {
final List<DnsRecord> records =
await cloudflare.getDnsRecords(cloudFlareDomain: domain);
final dkimPublicKey = await api.getDkim();
final desiredRecords =
final String? dkimPublicKey = await api.getDkim();
final List<DesiredDnsRecord> desiredRecords =
_getDesiredDnsRecords(domain.domainName, ipAddress, dkimPublicKey);
List<DesiredDnsRecord> foundRecords = [];
for (final record in desiredRecords) {
final List<DesiredDnsRecord> foundRecords = [];
for (final DesiredDnsRecord record in desiredRecords) {
if (record.description ==
'providers.domain.record_description.dkim') {
final foundRecord = records.firstWhere(
(r) => r.name == record.name && r.type == record.type,
final DnsRecord foundRecord = records.firstWhere(
(final r) => r.name == record.name && r.type == record.type,
orElse: () => DnsRecord(
name: record.name,
type: record.type,
content: '',
ttl: 800,
proxied: false));
proxied: false,),);
// remove all spaces and tabulators from
// the foundRecord.content and the record.content
// to compare them
final foundContent =
final String? foundContent =
foundRecord.content?.replaceAll(RegExp(r'\s+'), '');
final content = record.content.replaceAll(RegExp(r'\s+'), '');
final String content = record.content.replaceAll(RegExp(r'\s+'), '');
if (foundContent == content) {
foundRecords.add(record.copyWith(isSatisfied: true));
} else {
foundRecords.add(record.copyWith(isSatisfied: false));
}
} else {
if (records.any((r) =>
if (records.any((final r) =>
r.name == record.name &&
r.type == record.type &&
r.content == record.content)) {
r.content == record.content,)) {
foundRecords.add(record.copyWith(isSatisfied: true));
} else {
foundRecords.add(record.copyWith(isSatisfied: false));
@ -70,10 +72,10 @@ class DnsRecordsCubit
}
emit(DnsRecordsState(
dnsRecords: foundRecords,
dnsState: foundRecords.any((r) => r.isSatisfied == false)
dnsState: foundRecords.any((final r) => r.isSatisfied == false)
? DnsRecordsStatus.error
: DnsRecordsStatus.good,
));
),);
} else {
emit(const DnsRecordsState());
}
@ -81,7 +83,7 @@ class DnsRecordsCubit
}
@override
void onChange(Change<DnsRecordsState> change) {
void onChange(final Change<DnsRecordsState> change) {
// print(change);
super.onChange(change);
}
@ -103,13 +105,13 @@ class DnsRecordsCubit
final String? dkimPublicKey = await api.getDkim();
await cloudflare.removeSimilarRecords(cloudFlareDomain: domain!);
await cloudflare.createMultipleDnsRecords(
cloudFlareDomain: domain, ip4: ipAddress);
cloudFlareDomain: domain, ip4: ipAddress,);
await cloudflare.setDkim(dkimPublicKey ?? '', domain);
await load();
}
List<DesiredDnsRecord> _getDesiredDnsRecords(
String? domainName, String? ipAddress, String? dkimPublicKey) {
final String? domainName, final String? ipAddress, final String? dkimPublicKey,) {
if (domainName == null || ipAddress == null || dkimPublicKey == null) {
return [];
}

28
lib/logic/cubit/dns_records/dns_records_state.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: always_specify_types
part of 'dns_records_cubit.dart';
enum DnsRecordsStatus {
@ -29,21 +31,19 @@ class DnsRecordsState extends ServerInstallationDependendState {
];
DnsRecordsState copyWith({
DnsRecordsStatus? dnsState,
List<DesiredDnsRecord>? dnsRecords,
}) {
return DnsRecordsState(
final DnsRecordsStatus? dnsState,
final List<DesiredDnsRecord>? dnsRecords,
}) => DnsRecordsState(
dnsState: dnsState ?? this.dnsState,
dnsRecords: dnsRecords ?? this.dnsRecords,
);
}
}
class DesiredDnsRecord {
const DesiredDnsRecord({
required this.name,
this.type = 'A',
required this.content,
this.type = 'A',
this.description = '',
this.category = DnsRecordsCategory.services,
this.isSatisfied = false,
@ -57,14 +57,13 @@ class DesiredDnsRecord {
final bool isSatisfied;
DesiredDnsRecord copyWith({
String? name,
String? type,
String? content,
String? description,
DnsRecordsCategory? category,
bool? isSatisfied,
}) {
return DesiredDnsRecord(
final String? name,
final String? type,
final String? content,
final String? description,
final DnsRecordsCategory? category,
final bool? isSatisfied,
}) => DesiredDnsRecord(
name: name ?? this.name,
type: type ?? this.type,
content: content ?? this.content,
@ -73,4 +72,3 @@ class DesiredDnsRecord {
isSatisfied: isSatisfied ?? this.isSatisfied,
);
}
}

24
lib/logic/cubit/forms/factories/field_cubit_factory.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: always_specify_types
import 'package:flutter/material.dart';
import 'package:selfprivacy/logic/cubit/forms/validations/validations.dart';
import 'package:easy_localization/easy_localization.dart';
@ -16,21 +18,21 @@ class FieldCubitFactory {
/// - Must not be a reserved root login
/// - Must be unique
FieldCubit<String> createUserLoginField() {
final userAllowedRegExp = RegExp(r'^[a-z_][a-z0-9_]+$');
const userMaxLength = 31;
final RegExp userAllowedRegExp = RegExp(r'^[a-z_][a-z0-9_]+$');
const int userMaxLength = 31;
return FieldCubit(
initalValue: '',
validations: [
ValidationModel<String>(
(s) => s.toLowerCase() == 'root', 'validations.root_name'.tr()),
(final String s) => s.toLowerCase() == 'root', 'validations.root_name'.tr(),),
ValidationModel(
(login) => context.read<UsersCubit>().state.isLoginRegistered(login),
(final String login) => context.read<UsersCubit>().state.isLoginRegistered(login),
'validations.user_already_exist'.tr(),
),
RequiredStringValidation('validations.required'.tr()),
LengthStringLongerValidation(userMaxLength),
ValidationModel<String>((s) => !userAllowedRegExp.hasMatch(s),
'validations.invalid_format'.tr()),
ValidationModel<String>((final String s) => !userAllowedRegExp.hasMatch(s),
'validations.invalid_format'.tr(),),
],
);
}
@ -40,26 +42,24 @@ class FieldCubitFactory {
/// - Must fail on the regural expression of invalid matches: [\n\r\s]+
/// - Must not be empty
FieldCubit<String> createUserPasswordField() {
var passwordForbiddenRegExp = RegExp(r'[\n\r\s]+');
final RegExp passwordForbiddenRegExp = RegExp(r'[\n\r\s]+');
return FieldCubit(
initalValue: '',
validations: [
RequiredStringValidation('validations.required'.tr()),
ValidationModel<String>(
(password) => passwordForbiddenRegExp.hasMatch(password),
'validations.invalid_format'.tr()),
passwordForbiddenRegExp.hasMatch,
'validations.invalid_format'.tr(),),
],
);
}
FieldCubit<String> createRequiredStringField() {
return FieldCubit(
FieldCubit<String> createRequiredStringField() => FieldCubit(
initalValue: '',
validations: [
RequiredStringValidation('validations.required'.tr()),
],
);
}
final BuildContext context;
}

6
lib/logic/cubit/forms/setup/initializing/backblaze_form_cubit.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: always_specify_types
import 'dart:async';
import 'package:cubit_form/cubit_form.dart';
import 'package:selfprivacy/logic/api_maps/backblaze.dart';
@ -41,10 +43,10 @@ class BackblazeFormCubit extends FormCubit {
@override
FutureOr<bool> asyncValidation() async {
late bool isKeyValid;
BackblazeApi apiClient = BackblazeApi(isWithToken: false);
final BackblazeApi apiClient = BackblazeApi(isWithToken: false);
try {
String encodedApiKey = encodedBackblazeKey(
final String encodedApiKey = encodedBackblazeKey(
keyId.state.value,
applicationKey.state.value,
);

8
lib/logic/cubit/forms/setup/initializing/cloudflare_form_cubit.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: always_specify_types
import 'dart:async';
import 'package:cubit_form/cubit_form.dart';
@ -8,13 +10,13 @@ import 'package:selfprivacy/logic/cubit/forms/validations/validations.dart';
class CloudFlareFormCubit extends FormCubit {
CloudFlareFormCubit(this.initializingCubit) {
var regExp = RegExp(r'\s+|[!$%^&*()@+|~=`{}\[\]:<>?,.\/]');
final RegExp regExp = RegExp(r'\s+|[!$%^&*()@+|~=`{}\[\]:<>?,.\/]');
apiKey = FieldCubit(
initalValue: '',
validations: [
RequiredStringValidation('validations.required'.tr()),
ValidationModel<String>(
(s) => regExp.hasMatch(s), 'validations.key_format'.tr()),
regExp.hasMatch, 'validations.key_format'.tr(),),
LengthStringNotEqualValidation(40)
],
);
@ -34,7 +36,7 @@ class CloudFlareFormCubit extends FormCubit {
@override
FutureOr<bool> asyncValidation() async {
late bool isKeyValid;
CloudflareApi apiClient = CloudflareApi(isWithToken: false);
final CloudflareApi apiClient = CloudflareApi(isWithToken: false);
try {
isKeyValid = await apiClient.isValid(apiKey.state.value);

18
lib/logic/cubit/forms/setup/initializing/domain_cloudflare.dart
View file

@ -10,9 +10,9 @@ class DomainSetupCubit extends Cubit<DomainSetupState> {
Future<void> load() async {
emit(Loading(LoadingTypes.loadingDomain));
var api = CloudflareApi();
final CloudflareApi api = CloudflareApi();
var list = await api.domainList();
final List<String> list = await api.domainList();
if (list.isEmpty) {
emit(Empty());
} else if (list.length == 1) {
@ -23,20 +23,18 @@ class DomainSetupCubit extends Cubit<DomainSetupState> {
}
@override
Future<void> close() {
return super.close();
}
Future<void> close() => super.close();
Future<void> saveDomain() async {
assert(state is Loaded, 'wrong state');
var domainName = (state as Loaded).domain;
var api = CloudflareApi();
final String domainName = (state as Loaded).domain;
final CloudflareApi api = CloudflareApi();
emit(Loading(LoadingTypes.saving));
var zoneId = await api.getZoneId(domainName);
final String zoneId = await api.getZoneId(domainName);
var domain = ServerDomain(
final ServerDomain domain = ServerDomain(
domainName: domainName,
zoneId: zoneId,
provider: DnsProvider.cloudflare,
@ -63,9 +61,9 @@ class Loading extends DomainSetupState {
enum LoadingTypes { loadingDomain, saving }
class Loaded extends DomainSetupState {
final String domain;
Loaded(this.domain);
final String domain;
}
class DomainSet extends DomainSetupState {}

8
lib/logic/cubit/forms/setup/initializing/hetzner_form_cubit.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: always_specify_types
import 'dart:async';
import 'package:cubit_form/cubit_form.dart';
@ -8,13 +10,13 @@ import 'package:selfprivacy/logic/cubit/forms/validations/validations.dart';
class HetznerFormCubit extends FormCubit {
HetznerFormCubit(this.serverInstallationCubit) {
var regExp = RegExp(r'\s+|[-!$%^&*()@+|~=`{}\[\]:<>?,.\/]');
final RegExp regExp = RegExp(r'\s+|[-!$%^&*()@+|~=`{}\[\]:<>?,.\/]');
apiKey = FieldCubit(
initalValue: '',
validations: [
RequiredStringValidation('validations.required'.tr()),
ValidationModel<String>(
(s) => regExp.hasMatch(s), 'validations.key_format'.tr()),
regExp.hasMatch, 'validations.key_format'.tr(),),
LengthStringNotEqualValidation(64)
],
);
@ -34,7 +36,7 @@ class HetznerFormCubit extends FormCubit {
@override
FutureOr<bool> asyncValidation() async {
late bool isKeyValid;
HetznerApi apiClient = HetznerApi(isWithToken: false);
final HetznerApi apiClient = HetznerApi(isWithToken: false);
try {
isKeyValid = await apiClient.isValid(apiKey.state.value);

6
lib/logic/cubit/forms/setup/initializing/root_user_form_cubit.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: always_specify_types
import 'dart:async';
import 'package:cubit_form/cubit_form.dart';
@ -7,7 +9,7 @@ import 'package:selfprivacy/logic/models/hive/user.dart';
class RootUserFormCubit extends FormCubit {
RootUserFormCubit(
this.serverInstallationCubit, final FieldCubitFactory fieldFactory) {
this.serverInstallationCubit, final FieldCubitFactory fieldFactory,) {
userName = fieldFactory.createUserLoginField();
password = fieldFactory.createUserPasswordField();
@ -18,7 +20,7 @@ class RootUserFormCubit extends FormCubit {
@override
FutureOr<void> onSubmit() async {
var user = User(
final User user = User(
login: userName.state.value,
password: password.state.value,
);

4
lib/logic/cubit/forms/setup/recovering/recovery_device_form_cubit.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: always_specify_types
import 'dart:async';
import 'package:cubit_form/cubit_form.dart';
@ -6,7 +8,7 @@ import 'package:selfprivacy/logic/cubit/forms/factories/field_cubit_factory.dart
class RecoveryDeviceFormCubit extends FormCubit {
RecoveryDeviceFormCubit(this.installationCubit,
final FieldCubitFactory fieldFactory, this.recoveryMethod) {
final FieldCubitFactory fieldFactory, this.recoveryMethod,) {
tokenField = fieldFactory.createRequiredStringField();
super.addFields([tokenField]);

10
lib/logic/cubit/forms/setup/recovering/recovery_domain_form_cubit.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: always_specify_types
import 'dart:async';
import 'package:cubit_form/cubit_form.dart';
@ -8,7 +10,7 @@ import 'package:selfprivacy/logic/cubit/forms/factories/field_cubit_factory.dart
class RecoveryDomainFormCubit extends FormCubit {
RecoveryDomainFormCubit(
this.initializingCubit, final FieldCubitFactory fieldFactory) {
this.initializingCubit, final FieldCubitFactory fieldFactory,) {
serverDomainField = fieldFactory.createRequiredStringField();
super.addFields([serverDomainField]);
@ -22,10 +24,10 @@ class RecoveryDomainFormCubit extends FormCubit {
@override
FutureOr<bool> asyncValidation() async {
var api = ServerApi(
final ServerApi api = ServerApi(
hasLogger: false,
isWithToken: false,
overrideDomain: serverDomainField.state.value);
overrideDomain: serverDomainField.state.value,);
// API version doesn't require access token,
// so if the entered domain is indeed valid
@ -40,7 +42,7 @@ class RecoveryDomainFormCubit extends FormCubit {
return domainValid;
}
FutureOr<void> setCustomError(String error) {
FutureOr<void> setCustomError(final String error) {
serverDomainField.setError(error);
}

12
lib/logic/cubit/forms/user/ssh_form_cubit.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: always_specify_types
import 'dart:async';
import 'package:cubit_form/cubit_form.dart';
@ -11,22 +13,22 @@ class SshFormCubit extends FormCubit {
required this.jobsCubit,
required this.user,
}) {
var keyRegExp = RegExp(
r'^(ssh-rsa AAAAB3NzaC1yc2|ssh-ed25519 AAAAC3NzaC1lZDI1NTE5)[0-9A-Za-z+/]+[=]{0,3}( .*)?$');
final RegExp keyRegExp = RegExp(
r'^(ssh-rsa AAAAB3NzaC1yc2|ssh-ed25519 AAAAC3NzaC1lZDI1NTE5)[0-9A-Za-z+/]+[=]{0,3}( .*)?$',);
key = FieldCubit(
initalValue: '',
validations: [
ValidationModel(
(newKey) => user.sshKeys.any((key) => key == newKey),
(final String newKey) => user.sshKeys.any((final String key) => key == newKey),
'validations.key_already_exists'.tr(),
),
RequiredStringValidation('validations.required'.tr()),
ValidationModel<String>((s) {
ValidationModel<String>((final String s) {
print(s);
print(keyRegExp.hasMatch(s));
return !keyRegExp.hasMatch(s);
}, 'validations.invalid_format'.tr()),
}, 'validations.invalid_format'.tr(),),
],
);

12
lib/logic/cubit/forms/user/user_form_cubit.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: always_specify_types
import 'dart:async';
import 'package:cubit_form/cubit_form.dart';
@ -10,23 +12,23 @@ import 'package:selfprivacy/utils/password_generator.dart';
class UserFormCubit extends FormCubit {
UserFormCubit({
required this.jobsCubit,
required FieldCubitFactory fieldFactory,
User? user,
required final FieldCubitFactory fieldFactory,
final User? user,
}) {
var isEdit = user != null;
final bool isEdit = user != null;
login = fieldFactory.createUserLoginField();
login.setValue(isEdit ? user.login : '');
password = fieldFactory.createUserPasswordField();
password.setValue(
isEdit ? (user.password ?? '') : StringGenerators.userPassword());
isEdit ? (user.password ?? '') : StringGenerators.userPassword(),);
super.addFields([login, password]);
}
@override
FutureOr<void> onSubmit() {
var user = User(
final User user = User(
login: login.state.value,
password: password.state.value,
);

23
lib/logic/cubit/forms/validations/validations.dart
View file

@ -1,28 +1,29 @@
// ignore_for_file: always_specify_types
import 'package:cubit_form/cubit_form.dart';
import 'package:easy_localization/easy_localization.dart';
abstract class LengthStringValidation extends ValidationModel<String> {
LengthStringValidation(bool Function(String) predicate, String errorMessage)
: super(predicate, errorMessage);
LengthStringValidation(super.predicate, super.errorMessage);
@override
String? check(String val) {
var length = val.length;
var errorMessage = errorMassage.replaceAll('[]', length.toString());
String? check(final String val) {
final int length = val.length;
final String errorMessage = errorMassage.replaceAll('[]', length.toString());
return test(val) ? errorMessage : null;
}
}
class LengthStringNotEqualValidation extends LengthStringValidation {
/// String must be equal to [length]
LengthStringNotEqualValidation(int length)
: super((n) => n.length != length,
'validations.length_not_equal'.tr(args: [length.toString()]));
LengthStringNotEqualValidation(final int length)
: super((final n) => n.length != length,
'validations.length_not_equal'.tr(args: [length.toString()]),);
}
class LengthStringLongerValidation extends LengthStringValidation {
/// String must be shorter than or equal to [length]
LengthStringLongerValidation(int length)
: super((n) => n.length > length,
'validations.length_longer'.tr(args: [length.toString()]));
LengthStringLongerValidation(final int length)
: super((final n) => n.length > length,
'validations.length_longer'.tr(args: [length.toString()]),);
}

12
lib/logic/cubit/hetzner_metrics/hetzner_metrics_cubit.dart
View file

@ -5,19 +5,19 @@ import 'package:equatable/equatable.dart';
import 'package:selfprivacy/logic/common_enum/common_enum.dart';
import 'package:selfprivacy/logic/models/hetzner_metrics.dart';
import 'hetzner_metrics_repository.dart';
import 'package:selfprivacy/logic/cubit/hetzner_metrics/hetzner_metrics_repository.dart';
part 'hetzner_metrics_state.dart';
class HetznerMetricsCubit extends Cubit<HetznerMetricsState> {
HetznerMetricsCubit() : super(const HetznerMetricsLoading(Period.day));
final repository = HetznerMetricsRepository();
final HetznerMetricsRepository repository = HetznerMetricsRepository();
Timer? timer;
@override
close() {
Future<void> close() {
closeTimer();
return super.close();
}
@ -28,7 +28,7 @@ class HetznerMetricsCubit extends Cubit<HetznerMetricsState> {
}
}
void changePeriod(Period period) async {
void changePeriod(final Period period) async {
closeTimer();
emit(HetznerMetricsLoading(period));
load(period);
@ -38,8 +38,8 @@ class HetznerMetricsCubit extends Cubit<HetznerMetricsState> {
load(state.period);
}
void load(Period period) async {
var newState = await repository.getMetrics(period);
void load(final Period period) async {
final HetznerMetricsLoaded newState = await repository.getMetrics(period);
timer = Timer(
Duration(seconds: newState.stepInSeconds.toInt()),
() => load(newState.period),

22
lib/logic/cubit/hetzner_metrics/hetzner_metrics_repository.dart
View file

@ -1,12 +1,14 @@
// ignore_for_file: always_specify_types
import 'package:selfprivacy/logic/api_maps/hetzner.dart';
import 'package:selfprivacy/logic/common_enum/common_enum.dart';
import 'package:selfprivacy/logic/models/hetzner_metrics.dart';
import 'hetzner_metrics_cubit.dart';
import 'package:selfprivacy/logic/cubit/hetzner_metrics/hetzner_metrics_cubit.dart';
class HetznerMetricsRepository {
Future<HetznerMetricsLoaded> getMetrics(Period period) async {
var end = DateTime.now();
Future<HetznerMetricsLoaded> getMetrics(final Period period) async {
final DateTime end = DateTime.now();
DateTime start;
switch (period) {
@ -21,15 +23,15 @@ class HetznerMetricsRepository {
break;
}
var api = HetznerApi(hasLogger: true);
final HetznerApi api = HetznerApi(hasLogger: true);
var results = await Future.wait([
final List<Map<String, dynamic>> results = await Future.wait([
api.getMetrics(start, end, 'cpu'),
api.getMetrics(start, end, 'network'),
]);
var cpuMetricsData = results[0]['metrics'];
var networkMetricsData = results[1]['metrics'];
final cpuMetricsData = results[0]['metrics'];
final networkMetricsData = results[1]['metrics'];
return HetznerMetricsLoaded(
period: period,
@ -50,7 +52,7 @@ class HetznerMetricsRepository {
}
List<TimeSeriesData> timeSeriesSerializer(
Map<String, dynamic> json, String type) {
List list = json['time_series'][type]['values'];
return list.map((el) => TimeSeriesData(el[0], double.parse(el[1]))).toList();
final Map<String, dynamic> json, final String type,) {
final List list = json['time_series'][type]['values'];
return list.map((final el) => TimeSeriesData(el[0], double.parse(el[1]))).toList();
}

2
lib/logic/cubit/hetzner_metrics/hetzner_metrics_state.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: always_specify_types
part of 'hetzner_metrics_cubit.dart';
abstract class HetznerMetricsState extends Equatable {

42
lib/logic/cubit/jobs/jobs_cubit.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: always_specify_types
import 'package:easy_localization/easy_localization.dart';
import 'package:equatable/equatable.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
@ -17,12 +19,12 @@ class JobsCubit extends Cubit<JobsState> {
required this.servicesCubit,
}) : super(JobsStateEmpty());
final api = ServerApi();
final ServerApi api = ServerApi();
final UsersCubit usersCubit;
final ServicesCubit servicesCubit;
void addJob(Job job) {
var newJobsList = <Job>[];
void addJob(final Job job) {
final List<Job> newJobsList = <Job>[];
if (state is JobsStateWithJobs) {
newJobsList.addAll((state as JobsStateWithJobs).jobList);
}
@ -31,21 +33,21 @@ class JobsCubit extends Cubit<JobsState> {
emit(JobsStateWithJobs(newJobsList));
}
void removeJob(String id) {
final newState = (state as JobsStateWithJobs).removeById(id);
void removeJob(final String id) {
final JobsState newState = (state as JobsStateWithJobs).removeById(id);
emit(newState);
}
void createOrRemoveServiceToggleJob(ToggleJob job) {
var newJobsList = <Job>[];
void createOrRemoveServiceToggleJob(final ToggleJob job) {
final List<Job> newJobsList = <Job>[];
if (state is JobsStateWithJobs) {
newJobsList.addAll((state as JobsStateWithJobs).jobList);
}
var needToRemoveJob =
newJobsList.any((el) => el is ServiceToggleJob && el.type == job.type);
final bool needToRemoveJob =
newJobsList.any((final el) => el is ServiceToggleJob && el.type == job.type);
if (needToRemoveJob) {
var removingJob = newJobsList
.firstWhere(((el) => el is ServiceToggleJob && el.type == job.type));
final Job removingJob = newJobsList
.firstWhere((final el) => el is ServiceToggleJob && el.type == job.type);
removeJob(removingJob.id);
} else {
newJobsList.add(job);
@ -54,12 +56,12 @@ class JobsCubit extends Cubit<JobsState> {
}
}
void createShhJobIfNotExist(CreateSSHKeyJob job) {
var newJobsList = <Job>[];
void createShhJobIfNotExist(final CreateSSHKeyJob job) {
final List<Job> newJobsList = <Job>[];
if (state is JobsStateWithJobs) {
newJobsList.addAll((state as JobsStateWithJobs).jobList);
}
var isExistInJobList = newJobsList.any((el) => el is CreateSSHKeyJob);
final bool isExistInJobList = newJobsList.any((final el) => el is CreateSSHKeyJob);
if (!isExistInJobList) {
newJobsList.add(job);
getIt<NavigationService>().showSnackBar('jobs.jobAdded'.tr());
@ -69,7 +71,7 @@ class JobsCubit extends Cubit<JobsState> {
Future<void> rebootServer() async {
emit(JobsStateLoading());
final isSuccessful = await api.reboot();
final bool isSuccessful = await api.reboot();
if (isSuccessful) {
getIt<NavigationService>().showSnackBar('jobs.rebootSuccess'.tr());
} else {
@ -80,8 +82,8 @@ class JobsCubit extends Cubit<JobsState> {
Future<void> upgradeServer() async {
emit(JobsStateLoading());
final isPullSuccessful = await api.pullConfigurationUpdate();
final isSuccessful = await api.upgrade();
final bool isPullSuccessful = await api.pullConfigurationUpdate();
final bool isSuccessful = await api.upgrade();
if (isSuccessful) {
if (!isPullSuccessful) {
getIt<NavigationService>().showSnackBar('jobs.configPullFailed'.tr());
@ -96,10 +98,10 @@ class JobsCubit extends Cubit<JobsState> {
Future<void> applyAll() async {
if (state is JobsStateWithJobs) {
var jobs = (state as JobsStateWithJobs).jobList;
final List<Job> jobs = (state as JobsStateWithJobs).jobList;
emit(JobsStateLoading());
var hasServiceJobs = false;
for (var job in jobs) {
bool hasServiceJobs = false;
for (final Job job in jobs) {
if (job is CreateUserJob) {
await usersCubit.createUser(job.user);
}

6
lib/logic/cubit/jobs/jobs_state.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: always_specify_types
part of 'jobs_cubit.dart';
abstract class JobsState extends Equatable {
@ -13,8 +15,8 @@ class JobsStateWithJobs extends JobsState {
JobsStateWithJobs(this.jobList);
final List<Job> jobList;
JobsState removeById(String id) {
var newJobsList = jobList.where((element) => element.id != id).toList();
JobsState removeById(final String id) {
final List<Job> newJobsList = jobList.where((final element) => element.id != id).toList();
if (newJobsList.isEmpty) {
return JobsStateEmpty();

4
lib/logic/cubit/providers/providers_cubit.dart
View file

@ -11,8 +11,8 @@ part 'providers_state.dart';
class ProvidersCubit extends Cubit<ProvidersState> {
ProvidersCubit() : super(InitialProviderState());
void connect(ProviderModel provider) {
var newState = state.updateElement(provider, StateType.stable);
void connect(final ProviderModel provider) {
final ProvidersState newState = state.updateElement(provider, StateType.stable);
emit(newState);
}
}

14
lib/logic/cubit/providers/providers_state.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: always_specify_types
part of 'providers_cubit.dart';
class ProvidersState extends Equatable {
@ -5,18 +7,18 @@ class ProvidersState extends Equatable {
final List<ProviderModel> all;
ProvidersState updateElement(ProviderModel provider, StateType newState) {
var newList = [...all];
var index = newList.indexOf(provider);
ProvidersState updateElement(final ProviderModel provider, final StateType newState) {
final List<ProviderModel> newList = [...all];
final int index = newList.indexOf(provider);
newList[index] = provider.updateState(newState);
return ProvidersState(newList);
}
List<ProviderModel> get connected =>
all.where((service) => service.state != StateType.uninitialized).toList();
all.where((final service) => service.state != StateType.uninitialized).toList();
List<ProviderModel> get uninitialized =>
all.where((service) => service.state == StateType.uninitialized).toList();
all.where((final service) => service.state == StateType.uninitialized).toList();
bool get isFullyInitialized => uninitialized.isEmpty;
@ -29,7 +31,7 @@ class InitialProviderState extends ProvidersState {
: super(
ProviderType.values
.map(
(type) => ProviderModel(
(final type) => ProviderModel(
state: StateType.uninitialized,
type: type,
),

18
lib/logic/cubit/recovery_key/recovery_key_cubit.dart
View file

@ -7,20 +7,20 @@ part 'recovery_key_state.dart';
class RecoveryKeyCubit
extends ServerInstallationDependendCubit<RecoveryKeyState> {
RecoveryKeyCubit(ServerInstallationCubit serverInstallationCubit)
RecoveryKeyCubit(final ServerInstallationCubit serverInstallationCubit)
: super(serverInstallationCubit, const RecoveryKeyState.initial());
final api = ServerApi();
final ServerApi api = ServerApi();
@override
void load() async {
if (serverInstallationCubit.state is ServerInstallationFinished) {
final status = await _getRecoveryKeyStatus();
final RecoveryKeyStatus? status = await _getRecoveryKeyStatus();
if (status == null) {
emit(state.copyWith(loadingStatus: LoadingStatus.error));
} else {
emit(state.copyWith(
status: status, loadingStatus: LoadingStatus.success));
status: status, loadingStatus: LoadingStatus.success,),);
}
} else {
emit(state.copyWith(loadingStatus: LoadingStatus.uninitialized));
@ -39,18 +39,18 @@ class RecoveryKeyCubit
Future<void> refresh() async {
emit(state.copyWith(loadingStatus: LoadingStatus.refreshing));
final status = await _getRecoveryKeyStatus();
final RecoveryKeyStatus? status = await _getRecoveryKeyStatus();
if (status == null) {
emit(state.copyWith(loadingStatus: LoadingStatus.error));
} else {
emit(
state.copyWith(status: status, loadingStatus: LoadingStatus.success));
state.copyWith(status: status, loadingStatus: LoadingStatus.success),);
}
}
Future<String> generateRecoveryKey({
DateTime? expirationDate,
int? numberOfUses,
final DateTime? expirationDate,
final int? numberOfUses,
}) async {
final ApiResponse<String> response =
await api.generateRecoveryToken(expirationDate, numberOfUses);
@ -69,7 +69,7 @@ class RecoveryKeyCubit
}
class GenerationError extends Error {
final String message;
GenerationError(this.message);
final String message;
}

12
lib/logic/cubit/recovery_key/recovery_key_state.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: always_specify_types
part of 'recovery_key_cubit.dart';
class RecoveryKeyState extends ServerInstallationDependendState {
@ -5,7 +7,7 @@ class RecoveryKeyState extends ServerInstallationDependendState {
const RecoveryKeyState.initial()
: this(const RecoveryKeyStatus(exists: false, valid: false),
LoadingStatus.refreshing);
LoadingStatus.refreshing,);
final RecoveryKeyStatus _status;
final LoadingStatus loadingStatus;
@ -19,12 +21,10 @@ class RecoveryKeyState extends ServerInstallationDependendState {
List<Object> get props => [_status, loadingStatus];
RecoveryKeyState copyWith({
RecoveryKeyStatus? status,
LoadingStatus? loadingStatus,
}) {
return RecoveryKeyState(
final RecoveryKeyStatus? status,
final LoadingStatus? loadingStatus,
}) => RecoveryKeyState(
status ?? _status,
loadingStatus ?? this.loadingStatus,
);
}
}

6
lib/logic/cubit/server_detailed_info/server_detailed_info_cubit.dart
View file

@ -14,16 +14,16 @@ class ServerDetailsCubit extends Cubit<ServerDetailsState> {
ServerDetailsRepository repository = ServerDetailsRepository();
void check() async {
var isReadyToCheck = getIt<ApiConfigModel>().serverDetails != null;
final bool isReadyToCheck = getIt<ApiConfigModel>().serverDetails != null;
if (isReadyToCheck) {
emit(ServerDetailsLoading());
var data = await repository.load();
final ServerDetailsRepositoryDto data = await repository.load();
emit(Loaded(
serverInfo: data.hetznerServerInfo,
autoUpgradeSettings: data.autoUpgradeSettings,
serverTimezone: data.serverTimezone,
checkTime: DateTime.now(),
));
),);
} else {
emit(ServerDetailsNotReady());
}

14
lib/logic/cubit/server_detailed_info/server_detailed_info_repository.dart
View file

@ -5,8 +5,8 @@ import 'package:selfprivacy/logic/models/json/hetzner_server_info.dart';
import 'package:selfprivacy/logic/models/timezone_settings.dart';
class ServerDetailsRepository {
var hetznerAPi = HetznerApi();
var selfprivacyServer = ServerApi();
HetznerApi hetznerAPi = HetznerApi();
ServerApi selfprivacyServer = ServerApi();
Future<ServerDetailsRepositoryDto> load() async {
print('load');
@ -19,15 +19,15 @@ class ServerDetailsRepository {
}
class ServerDetailsRepositoryDto {
final HetznerServerInfo hetznerServerInfo;
final TimeZoneSettings serverTimezone;
final AutoUpgradeSettings autoUpgradeSettings;
ServerDetailsRepositoryDto({
required this.hetznerServerInfo,
required this.serverTimezone,
required this.autoUpgradeSettings,
});
final HetznerServerInfo hetznerServerInfo;
final TimeZoneSettings serverTimezone;
final AutoUpgradeSettings autoUpgradeSettings;
}

14
lib/logic/cubit/server_detailed_info/server_detailed_info_state.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: always_specify_types
part of 'server_detailed_info_cubit.dart';
abstract class ServerDetailsState extends Equatable {
@ -16,12 +18,6 @@ class ServerDetailsNotReady extends ServerDetailsState {}
class Loading extends ServerDetailsState {}
class Loaded extends ServerDetailsState {
final HetznerServerInfo serverInfo;
final TimeZoneSettings serverTimezone;
final AutoUpgradeSettings autoUpgradeSettings;
final DateTime checkTime;
const Loaded({
required this.serverInfo,
@ -29,6 +25,12 @@ class Loaded extends ServerDetailsState {
required this.autoUpgradeSettings,
required this.checkTime,
});
final HetznerServerInfo serverInfo;
final TimeZoneSettings serverTimezone;
final AutoUpgradeSettings autoUpgradeSettings;
final DateTime checkTime;
@override
List<Object> get props => [

384
lib/logic/cubit/server_installation/server_installation_cubit.dart
View file

@ -10,7 +10,7 @@ import 'package:selfprivacy/logic/models/hive/server_domain.dart';
import 'package:selfprivacy/logic/models/hive/user.dart';
import 'package:selfprivacy/logic/models/server_basic_info.dart';
import '../server_installation/server_installation_repository.dart';
import 'package:selfprivacy/logic/cubit/server_installation/server_installation_repository.dart';
export 'package:provider/provider.dart';
@ -19,12 +19,13 @@ part '../server_installation/server_installation_state.dart';
class ServerInstallationCubit extends Cubit<ServerInstallationState> {
ServerInstallationCubit() : super(const ServerInstallationEmpty());
final repository = ServerInstallationRepository();
final ServerInstallationRepository repository =
ServerInstallationRepository();
Timer? timer;
Future<void> load() async {
var state = await repository.load();
final ServerInstallationState state = await repository.load();
if (state is ServerInstallationFinished) {
emit(state);
@ -48,33 +49,38 @@ class ServerInstallationCubit extends Cubit<ServerInstallationState> {
}
}
void setHetznerKey(String hetznerKey) async {
void setHetznerKey(final String hetznerKey) async {
await repository.saveHetznerKey(hetznerKey);
if (state is ServerInstallationRecovery) {
emit((state as ServerInstallationRecovery).copyWith(
emit(
(state as ServerInstallationRecovery).copyWith(
hetznerKey: hetznerKey,
currentStep: RecoveryStep.serverSelection,
));
),
);
return;
}
emit((state as ServerInstallationNotFinished)
.copyWith(hetznerKey: hetznerKey));
emit(
(state as ServerInstallationNotFinished).copyWith(hetznerKey: hetznerKey),
);
}
void setCloudflareKey(String cloudFlareKey) async {
void setCloudflareKey(final String cloudFlareKey) async {
if (state is ServerInstallationRecovery) {
setAndValidateCloudflareToken(cloudFlareKey);
return;
}
await repository.saveCloudFlareKey(cloudFlareKey);
emit((state as ServerInstallationNotFinished)
.copyWith(cloudFlareKey: cloudFlareKey));
emit(
(state as ServerInstallationNotFinished)
.copyWith(cloudFlareKey: cloudFlareKey),
);
}
void setBackblazeKey(String keyId, String applicationKey) async {
var backblazeCredential = BackblazeCredential(
void setBackblazeKey(final String keyId, final String applicationKey) async {
final BackblazeCredential backblazeCredential = BackblazeCredential(
keyId: keyId,
applicationKey: applicationKey,
);
@ -83,38 +89,45 @@ class ServerInstallationCubit extends Cubit<ServerInstallationState> {
finishRecoveryProcess(backblazeCredential);
return;
}
emit((state as ServerInstallationNotFinished)
.copyWith(backblazeCredential: backblazeCredential));
emit(
(state as ServerInstallationNotFinished)
.copyWith(backblazeCredential: backblazeCredential),
);
}
void setDomain(ServerDomain serverDomain) async {
void setDomain(final ServerDomain serverDomain) async {
await repository.saveDomain(serverDomain);
emit((state as ServerInstallationNotFinished)
.copyWith(serverDomain: serverDomain));
emit(
(state as ServerInstallationNotFinished)
.copyWith(serverDomain: serverDomain),
);
}
void setRootUser(User rootUser) async {
void setRootUser(final User rootUser) async {
await repository.saveRootUser(rootUser);
emit((state as ServerInstallationNotFinished).copyWith(rootUser: rootUser));
}
void createServerAndSetDnsRecords() async {
ServerInstallationNotFinished stateCopy =
final ServerInstallationNotFinished stateCopy =
state as ServerInstallationNotFinished;
onCancel() => emit(
(state as ServerInstallationNotFinished).copyWith(isLoading: false));
void onCancel() => emit(
(state as ServerInstallationNotFinished).copyWith(isLoading: false),
);
onSuccess(ServerHostingDetails serverDetails) async {
Future<void> onSuccess(final ServerHostingDetails serverDetails) async {
await repository.createDnsRecords(
serverDetails.ip4,
state.serverDomain!,
onCancel: onCancel,
);
emit((state as ServerInstallationNotFinished).copyWith(
emit(
(state as ServerInstallationNotFinished).copyWith(
isLoading: false,
serverDetails: serverDetails,
));
),
);
runDelayed(startServerIfDnsIsOkay, const Duration(seconds: 30), null);
}
@ -133,125 +146,149 @@ class ServerInstallationCubit extends Cubit<ServerInstallationState> {
}
}
void startServerIfDnsIsOkay({ServerInstallationNotFinished? state}) async {
final dataState = state ?? this.state as ServerInstallationNotFinished;
void startServerIfDnsIsOkay(
{final ServerInstallationNotFinished? state,}) async {
final ServerInstallationNotFinished dataState =
state ?? this.state as ServerInstallationNotFinished;
emit(TimerState(dataState: dataState, isLoading: true));
var ip4 = dataState.serverDetails!.ip4;
var domainName = dataState.serverDomain!.domainName;
final String ip4 = dataState.serverDetails!.ip4;
final String domainName = dataState.serverDomain!.domainName;
var matches = await repository.isDnsAddressesMatch(
domainName, ip4, dataState.dnsMatches);
final Map<String, bool> matches = await repository.isDnsAddressesMatch(
domainName,
ip4,
dataState.dnsMatches,
);
if (matches.values.every((value) => value)) {
var server = await repository.startServer(
if (matches.values.every((final bool value) => value)) {
final ServerHostingDetails server = await repository.startServer(
dataState.serverDetails!,
);
await repository.saveServerDetails(server);
await repository.saveIsServerStarted(true);
emit(
dataState.copyWith(
final ServerInstallationNotFinished newState = dataState.copyWith(
isServerStarted: true,
isLoading: false,
serverDetails: server,
),
);
emit(newState);
runDelayed(
resetServerIfServerIsOkay, const Duration(seconds: 60), dataState);
resetServerIfServerIsOkay,
const Duration(seconds: 60),
newState,
);
} else {
emit(
dataState.copyWith(
final ServerInstallationNotFinished newState = dataState.copyWith(
isLoading: false,
dnsMatches: matches,
),
);
emit(newState);
runDelayed(
startServerIfDnsIsOkay, const Duration(seconds: 30), dataState);
}
}
void oneMoreReset({ServerInstallationNotFinished? state}) async {
final dataState = state ?? this.state as ServerInstallationNotFinished;
emit(TimerState(dataState: dataState, isLoading: true));
var isServerWorking = await repository.isHttpServerWorking();
if (isServerWorking) {
var pauseDuration = const Duration(seconds: 30);
emit(TimerState(
dataState: dataState,
timerStart: DateTime.now(),
isLoading: false,
duration: pauseDuration,
));
timer = Timer(pauseDuration, () async {
var hetznerServerDetails = await repository.restart();
await repository.saveIsServerResetedSecondTime(true);
await repository.saveServerDetails(hetznerServerDetails);
emit(
dataState.copyWith(
isServerResetedSecondTime: true,
serverDetails: hetznerServerDetails,
isLoading: false,
),
startServerIfDnsIsOkay,
const Duration(seconds: 30),
newState,
);
runDelayed(
finishCheckIfServerIsOkay, const Duration(seconds: 60), dataState);
});
} else {
runDelayed(oneMoreReset, const Duration(seconds: 60), dataState);
}
}
void resetServerIfServerIsOkay({
ServerInstallationNotFinished? state,
final ServerInstallationNotFinished? state,
}) async {
final dataState = state ?? this.state as ServerInstallationNotFinished;
final ServerInstallationNotFinished dataState =
state ?? this.state as ServerInstallationNotFinished;
emit(TimerState(dataState: dataState, isLoading: true));
var isServerWorking = await repository.isHttpServerWorking();
final bool isServerWorking = await repository.isHttpServerWorking();
if (isServerWorking) {
var pauseDuration = const Duration(seconds: 30);
emit(TimerState(
const Duration pauseDuration = Duration(seconds: 30);
emit(
TimerState(
dataState: dataState,
timerStart: DateTime.now(),
isLoading: false,
duration: pauseDuration,
));
),
);
timer = Timer(pauseDuration, () async {
var hetznerServerDetails = await repository.restart();
final ServerHostingDetails hetznerServerDetails =
await repository.restart();
await repository.saveIsServerResetedFirstTime(true);
await repository.saveServerDetails(hetznerServerDetails);
emit(
dataState.copyWith(
final ServerInstallationNotFinished newState = dataState.copyWith(
isServerResetedFirstTime: true,
serverDetails: hetznerServerDetails,
isLoading: false,
),
);
runDelayed(oneMoreReset, const Duration(seconds: 60), dataState);
emit(newState);
runDelayed(oneMoreReset, const Duration(seconds: 60), newState);
});
} else {
runDelayed(
resetServerIfServerIsOkay, const Duration(seconds: 60), dataState);
resetServerIfServerIsOkay,
const Duration(seconds: 60),
dataState,
);
}
}
void oneMoreReset({final ServerInstallationNotFinished? state}) async {
final ServerInstallationNotFinished dataState =
state ?? this.state as ServerInstallationNotFinished;
emit(TimerState(dataState: dataState, isLoading: true));
final bool isServerWorking = await repository.isHttpServerWorking();
if (isServerWorking) {
const Duration pauseDuration = Duration(seconds: 30);
emit(
TimerState(
dataState: dataState,
timerStart: DateTime.now(),
isLoading: false,
duration: pauseDuration,
),
);
timer = Timer(pauseDuration, () async {
final ServerHostingDetails hetznerServerDetails =
await repository.restart();
await repository.saveIsServerResetedSecondTime(true);
await repository.saveServerDetails(hetznerServerDetails);
final ServerInstallationNotFinished newState = dataState.copyWith(
isServerResetedSecondTime: true,
serverDetails: hetznerServerDetails,
isLoading: false,
);
emit(newState);
runDelayed(
finishCheckIfServerIsOkay,
const Duration(seconds: 60),
newState,
);
});
} else {
runDelayed(oneMoreReset, const Duration(seconds: 60), dataState);
}
}
void finishCheckIfServerIsOkay({
ServerInstallationNotFinished? state,
final ServerInstallationNotFinished? state,
}) async {
final dataState = state ?? this.state as ServerInstallationNotFinished;
final ServerInstallationNotFinished dataState =
state ?? this.state as ServerInstallationNotFinished;
emit(TimerState(dataState: dataState, isLoading: true));
var isServerWorking = await repository.isHttpServerWorking();
final bool isServerWorking = await repository.isHttpServerWorking();
if (isServerWorking) {
await repository.createDkimRecord(dataState.serverDomain!);
@ -260,51 +297,67 @@ class ServerInstallationCubit extends Cubit<ServerInstallationState> {
emit(dataState.finish());
} else {
runDelayed(
finishCheckIfServerIsOkay, const Duration(seconds: 60), dataState);
finishCheckIfServerIsOkay,
const Duration(seconds: 60),
dataState,
);
}
}
void runDelayed(void Function() work, Duration delay,
ServerInstallationNotFinished? state) async {
final dataState = state ?? this.state as ServerInstallationNotFinished;
void runDelayed(
final void Function() work,
final Duration delay,
final ServerInstallationNotFinished? state,
) async {
final ServerInstallationNotFinished dataState =
state ?? this.state as ServerInstallationNotFinished;
emit(TimerState(
emit(
TimerState(
dataState: dataState,
timerStart: DateTime.now(),
duration: delay,
isLoading: false,
));
),
);
timer = Timer(delay, work);
}
void submitDomainForAccessRecovery(String domain) async {
var serverDomain = ServerDomain(
void submitDomainForAccessRecovery(final String domain) async {
final ServerDomain serverDomain = ServerDomain(
domainName: domain,
provider: DnsProvider.unknown,
zoneId: '',
);
final recoveryCapabilities =
final ServerRecoveryCapabilities recoveryCapabilities =
await repository.getRecoveryCapabilities(serverDomain);
await repository.saveDomain(serverDomain);
await repository.saveIsRecoveringServer(true);
emit(ServerInstallationRecovery(
emit(
ServerInstallationRecovery(
serverDomain: serverDomain,
recoveryCapabilities: recoveryCapabilities,
currentStep: RecoveryStep.selecting,
));
),
);
}
void tryToRecover(String token, ServerRecoveryMethods method) async {
final dataState = state as ServerInstallationRecovery;
final serverDomain = dataState.serverDomain;
void tryToRecover(
final String token, final ServerRecoveryMethods method,) async {
final ServerInstallationRecovery dataState =
state as ServerInstallationRecovery;
final ServerDomain? serverDomain = dataState.serverDomain;
if (serverDomain == null) {
return;
}
try {
Future<ServerHostingDetails> Function(
ServerDomain, String, ServerRecoveryCapabilities) recoveryFunction;
ServerDomain,
String,
ServerRecoveryCapabilities,
) recoveryFunction;
switch (method) {
case ServerRecoveryMethods.newDeviceKey:
recoveryFunction = repository.authorizeByNewDeviceKey;
@ -318,16 +371,18 @@ class ServerInstallationCubit extends Cubit<ServerInstallationState> {
default:
throw Exception('Unknown recovery method');
}
final serverDetails = await recoveryFunction(
final ServerHostingDetails serverDetails = await recoveryFunction(
serverDomain,
token,
dataState.recoveryCapabilities,
);
await repository.saveServerDetails(serverDetails);
emit(dataState.copyWith(
emit(
dataState.copyWith(
serverDetails: serverDetails,
currentStep: RecoveryStep.hetznerToken,
));
),
);
} on ServerAuthorizationException {
getIt<NavigationService>()
.showSnackBar('recovering.authorization_failed'.tr());
@ -340,7 +395,8 @@ class ServerInstallationCubit extends Cubit<ServerInstallationState> {
}
void revertRecoveryStep() {
final dataState = state as ServerInstallationRecovery;
final ServerInstallationRecovery dataState =
state as ServerInstallationRecovery;
switch (dataState.currentStep) {
case RecoveryStep.selecting:
repository.deleteDomain();
@ -349,15 +405,19 @@ class ServerInstallationCubit extends Cubit<ServerInstallationState> {
case RecoveryStep.recoveryKey:
case RecoveryStep.newDeviceKey:
case RecoveryStep.oldToken:
emit(dataState.copyWith(
emit(
dataState.copyWith(
currentStep: RecoveryStep.selecting,
));
),
);
break;
case RecoveryStep.serverSelection:
repository.deleteHetznerKey();
emit(dataState.copyWith(
emit(
dataState.copyWith(
currentStep: RecoveryStep.hetznerToken,
));
),
);
break;
// We won't revert steps after client is authorized
default:
@ -365,48 +425,60 @@ class ServerInstallationCubit extends Cubit<ServerInstallationState> {
}
}
void selectRecoveryMethod(ServerRecoveryMethods method) {
final dataState = state as ServerInstallationRecovery;
void selectRecoveryMethod(final ServerRecoveryMethods method) {
final ServerInstallationRecovery dataState =
state as ServerInstallationRecovery;
switch (method) {
case ServerRecoveryMethods.newDeviceKey:
emit(dataState.copyWith(
emit(
dataState.copyWith(
currentStep: RecoveryStep.newDeviceKey,
));
),
);
break;
case ServerRecoveryMethods.recoveryKey:
emit(dataState.copyWith(
emit(
dataState.copyWith(
currentStep: RecoveryStep.recoveryKey,
));
),
);
break;
case ServerRecoveryMethods.oldToken:
emit(dataState.copyWith(
emit(
dataState.copyWith(
currentStep: RecoveryStep.oldToken,
));
),
);
break;
}
}
Future<List<ServerBasicInfoWithValidators>>
getServersOnHetznerAccount() async {
final dataState = state as ServerInstallationRecovery;
final servers = await repository.getServersOnHetznerAccount();
final validated = servers
.map((server) => ServerBasicInfoWithValidators.fromServerBasicInfo(
final ServerInstallationRecovery dataState =
state as ServerInstallationRecovery;
final List<ServerBasicInfo> servers =
await repository.getServersOnHetznerAccount();
final Iterable<ServerBasicInfoWithValidators> validated = servers.map(
(final ServerBasicInfo server) =>
ServerBasicInfoWithValidators.fromServerBasicInfo(
serverBasicInfo: server,
isIpValid: server.ip == dataState.serverDetails?.ip4,
isReverseDnsValid:
server.reverseDns == dataState.serverDomain?.domainName,
));
),
);
return validated.toList();
}
Future<void> setServerId(ServerBasicInfo server) async {
final dataState = state as ServerInstallationRecovery;
final serverDomain = dataState.serverDomain;
Future<void> setServerId(final ServerBasicInfo server) async {
final ServerInstallationRecovery dataState =
state as ServerInstallationRecovery;
final ServerDomain? serverDomain = dataState.serverDomain;
if (serverDomain == null) {
return;
}
final serverDetails = ServerHostingDetails(
final ServerHostingDetails serverDetails = ServerHostingDetails(
ip4: server.ip,
id: server.id,
createTime: server.created,
@ -419,31 +491,38 @@ class ServerInstallationCubit extends Cubit<ServerInstallationState> {
);
await repository.saveDomain(serverDomain);
await repository.saveServerDetails(serverDetails);
emit(dataState.copyWith(
emit(
dataState.copyWith(
serverDetails: serverDetails,
currentStep: RecoveryStep.cloudflareToken,
));
),
);
}
Future<void> setAndValidateCloudflareToken(String token) async {
final dataState = state as ServerInstallationRecovery;
final serverDomain = dataState.serverDomain;
Future<void> setAndValidateCloudflareToken(final String token) async {
final ServerInstallationRecovery dataState =
state as ServerInstallationRecovery;
final ServerDomain? serverDomain = dataState.serverDomain;
if (serverDomain == null) {
return;
}
final zoneId = await repository.getDomainId(token, serverDomain.domainName);
final String? zoneId =
await repository.getDomainId(token, serverDomain.domainName);
if (zoneId == null) {
getIt<NavigationService>()
.showSnackBar('recovering.domain_not_available_on_token'.tr());
return;
}
await repository.saveDomain(ServerDomain(
await repository.saveDomain(
ServerDomain(
domainName: serverDomain.domainName,
zoneId: zoneId,
provider: DnsProvider.cloudflare,
));
),
);
await repository.saveCloudFlareKey(token);
emit(dataState.copyWith(
emit(
dataState.copyWith(
serverDomain: ServerDomain(
domainName: serverDomain.domainName,
zoneId: zoneId,
@ -451,18 +530,21 @@ class ServerInstallationCubit extends Cubit<ServerInstallationState> {
),
cloudFlareKey: token,
currentStep: RecoveryStep.backblazeToken,
));
),
);
}
void finishRecoveryProcess(BackblazeCredential backblazeCredential) async {
void finishRecoveryProcess(
final BackblazeCredential backblazeCredential,) async {
await repository.saveIsServerStarted(true);
await repository.saveIsServerResetedFirstTime(true);
await repository.saveIsServerResetedSecondTime(true);
await repository.saveHasFinalChecked(true);
await repository.saveIsRecoveringServer(false);
final mainUser = await repository.getMainUser();
final User mainUser = await repository.getMainUser();
await repository.saveRootUser(mainUser);
final updatedState = (state as ServerInstallationRecovery).copyWith(
final ServerInstallationRecovery updatedState =
(state as ServerInstallationRecovery).copyWith(
backblazeCredential: backblazeCredential,
rootUser: mainUser,
);
@ -470,7 +552,7 @@ class ServerInstallationCubit extends Cubit<ServerInstallationState> {
}
@override
void onChange(Change<ServerInstallationState> change) {
void onChange(final Change<ServerInstallationState> change) {
super.onChange(change);
print('================================');
print('ServerInstallationState changed!');
@ -481,9 +563,11 @@ class ServerInstallationCubit extends Cubit<ServerInstallationState> {
print('BackblazeCredential: ${change.nextState.backblazeCredential}');
if (change.nextState is ServerInstallationRecovery) {
print(
'Recovery Step: ${(change.nextState as ServerInstallationRecovery).currentStep}');
'Recovery Step: ${(change.nextState as ServerInstallationRecovery).currentStep}',
);
print(
'Recovery Capabilities: ${(change.nextState as ServerInstallationRecovery).recoveryCapabilities}');
'Recovery Capabilities: ${(change.nextState as ServerInstallationRecovery).recoveryCapabilities}',
);
}
if (change.nextState is TimerState) {
print('Timer: ${(change.nextState as TimerState).duration}');
@ -504,7 +588,8 @@ class ServerInstallationCubit extends Cubit<ServerInstallationState> {
await repository.deleteServer(state.serverDomain!);
}
await repository.deleteServerRelatedRecords();
emit(ServerInstallationNotFinished(
emit(
ServerInstallationNotFinished(
hetznerKey: state.hetznerKey,
serverDomain: state.serverDomain,
cloudFlareKey: state.cloudFlareKey,
@ -516,11 +601,12 @@ class ServerInstallationCubit extends Cubit<ServerInstallationState> {
isServerResetedSecondTime: false,
isLoading: false,
dnsMatches: null,
));
),
);
}
@override
close() {
Future<void> close() {
closeTimer();
return super.close();
}

250
lib/logic/cubit/server_installation/server_installation_repository.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: always_specify_types
import 'dart:io';
import 'package:basic_utils/basic_utils.dart';
@ -12,39 +14,41 @@ import 'package:selfprivacy/config/hive_config.dart';
import 'package:selfprivacy/logic/api_maps/cloudflare.dart';
import 'package:selfprivacy/logic/api_maps/hetzner.dart';
import 'package:selfprivacy/logic/api_maps/server.dart';
import 'package:selfprivacy/logic/common_enum/common_enum.dart';
import 'package:selfprivacy/logic/models/hive/backblaze_credential.dart';
import 'package:selfprivacy/logic/models/hive/server_details.dart';
import 'package:selfprivacy/logic/models/hive/server_domain.dart';
import 'package:selfprivacy/logic/models/hive/user.dart';
import 'package:selfprivacy/logic/models/json/device_token.dart';
import 'package:selfprivacy/logic/models/json/hetzner_server_info.dart';
import 'package:selfprivacy/logic/models/message.dart';
import 'package:selfprivacy/logic/models/server_basic_info.dart';
import 'package:selfprivacy/ui/components/action_button/action_button.dart';
import 'package:selfprivacy/ui/components/brand_alert/brand_alert.dart';
import '../server_installation/server_installation_cubit.dart';
import 'package:selfprivacy/logic/cubit/server_installation/server_installation_cubit.dart';
class IpNotFoundException implements Exception {
final String message;
IpNotFoundException(this.message);
final String message;
}
class ServerAuthorizationException implements Exception {
final String message;
ServerAuthorizationException(this.message);
final String message;
}
class ServerInstallationRepository {
Box box = Hive.box(BNames.serverInstallationBox);
Future<ServerInstallationState> load() async {
final hetznerToken = getIt<ApiConfigModel>().hetznerKey;
final cloudflareToken = getIt<ApiConfigModel>().cloudFlareKey;
final serverDomain = getIt<ApiConfigModel>().serverDomain;
final backblazeCredential = getIt<ApiConfigModel>().backblazeCredential;
final serverDetails = getIt<ApiConfigModel>().serverDetails;
final String? hetznerToken = getIt<ApiConfigModel>().hetznerKey;
final String? cloudflareToken = getIt<ApiConfigModel>().cloudFlareKey;
final ServerDomain? serverDomain = getIt<ApiConfigModel>().serverDomain;
final BackblazeCredential? backblazeCredential = getIt<ApiConfigModel>().backblazeCredential;
final ServerHostingDetails? serverDetails = getIt<ApiConfigModel>().serverDetails;
if (box.get(BNames.hasFinalChecked, defaultValue: false)) {
return ServerInstallationFinished(
@ -72,7 +76,7 @@ class ServerInstallationRepository {
serverDetails: serverDetails,
rootUser: box.get(BNames.rootUser),
currentStep: _getCurrentRecoveryStep(
hetznerToken, cloudflareToken, serverDomain, serverDetails),
hetznerToken, cloudflareToken, serverDomain, serverDetails,),
recoveryCapabilities: await getRecoveryCapabilities(serverDomain),
);
}
@ -95,10 +99,10 @@ class ServerInstallationRepository {
}
RecoveryStep _getCurrentRecoveryStep(
String? hetznerToken,
String? cloudflareToken,
ServerDomain serverDomain,
ServerHostingDetails? serverDetails,
final String? hetznerToken,
final String? cloudflareToken,
final ServerDomain serverDomain,
final ServerHostingDetails? serverDetails,
) {
if (serverDetails != null) {
if (hetznerToken != null) {
@ -120,31 +124,31 @@ class ServerInstallationRepository {
}
Future<ServerHostingDetails> startServer(
ServerHostingDetails hetznerServer,
final ServerHostingDetails hetznerServer,
) async {
var hetznerApi = HetznerApi();
var serverDetails = await hetznerApi.powerOn();
final HetznerApi hetznerApi = HetznerApi();
final ServerHostingDetails serverDetails = await hetznerApi.powerOn();
return serverDetails;
}
Future<String?> getDomainId(String token, String domain) async {
var cloudflareApi = CloudflareApi(
Future<String?> getDomainId(final String token, final String domain) async {
final CloudflareApi cloudflareApi = CloudflareApi(
isWithToken: false,
customToken: token,
);
try {
final domainId = await cloudflareApi.getZoneId(domain);
final String domainId = await cloudflareApi.getZoneId(domain);
return domainId;
} on DomainNotFoundException {
return null;
}
}
Future<Map<String, bool>> isDnsAddressesMatch(String? domainName, String? ip4,
Map<String, bool>? skippedMatches) async {
var addresses = <String>[
Future<Map<String, bool>> isDnsAddressesMatch(final String? domainName, final String? ip4,
final Map<String, bool>? skippedMatches,) async {
final List<String> addresses = <String>[
'$domainName',
'api.$domainName',
'cloud.$domainName',
@ -152,14 +156,14 @@ class ServerInstallationRepository {
'password.$domainName'
];
var matches = <String, bool>{};
final Map<String, bool> matches = <String, bool>{};
for (var address in addresses) {
if (skippedMatches != null && skippedMatches[address] == true) {
for (final String address in addresses) {
if (skippedMatches![address] ?? false) {
matches[address] = true;
continue;
}
var lookupRecordRes = await DnsUtils.lookupRecord(
final List<RRecord>? lookupRecordRes = await DnsUtils.lookupRecord(
address,
RRecordType.A,
provider: DnsApiProvider.CLOUDFLARE,
@ -189,21 +193,21 @@ class ServerInstallationRepository {
}
Future<void> createServer(
User rootUser,
String domainName,
String cloudFlareKey,
BackblazeCredential backblazeCredential, {
required void Function() onCancel,
required Future<void> Function(ServerHostingDetails serverDetails)
final User rootUser,
final String domainName,
final String cloudFlareKey,
final BackblazeCredential backblazeCredential, {
required final void Function() onCancel,
required final Future<void> Function(ServerHostingDetails serverDetails)
onSuccess,
}) async {
var hetznerApi = HetznerApi();
final HetznerApi hetznerApi = HetznerApi();
late ServerVolume dataBase;
try {
dataBase = await hetznerApi.createVolume();
var serverDetails = await hetznerApi.createServer(
final ServerHostingDetails serverDetails = await hetznerApi.createServer(
cloudFlareKey: cloudFlareKey,
rootUser: rootUser,
domainName: domainName,
@ -213,7 +217,7 @@ class ServerInstallationRepository {
onSuccess(serverDetails);
} on DioError catch (e) {
if (e.response!.data['error']['code'] == 'uniqueness_error') {
var nav = getIt.get<NavigationService>();
final NavigationService nav = getIt.get<NavigationService>();
nav.showPopUpDialog(
BrandAlert(
title: 'modals.1'.tr(),
@ -224,9 +228,9 @@ class ServerInstallationRepository {
isRed: true,
onPressed: () async {
await hetznerApi.deleteSelfprivacyServerAndAllVolumes(
domainName: domainName);
domainName: domainName,);
var serverDetails = await hetznerApi.createServer(
final ServerHostingDetails serverDetails = await hetznerApi.createServer(
cloudFlareKey: cloudFlareKey,
rootUser: rootUser,
domainName: domainName,
@ -239,9 +243,7 @@ class ServerInstallationRepository {
),
ActionButton(
text: 'basis.cancel'.tr(),
onPressed: () {
onCancel();
},
onPressed: onCancel,
),
],
),
@ -251,11 +253,11 @@ class ServerInstallationRepository {
}
Future<void> createDnsRecords(
String ip4,
ServerDomain cloudFlareDomain, {
required void Function() onCancel,
final String ip4,
final ServerDomain cloudFlareDomain, {
required final void Function() onCancel,
}) async {
var cloudflareApi = CloudflareApi();
final CloudflareApi cloudflareApi = CloudflareApi();
await cloudflareApi.removeSimilarRecords(
ip4: ip4,
@ -268,8 +270,8 @@ class ServerInstallationRepository {
cloudFlareDomain: cloudFlareDomain,
);
} on DioError catch (e) {
var hetznerApi = HetznerApi();
var nav = getIt.get<NavigationService>();
final HetznerApi hetznerApi = HetznerApi();
final NavigationService nav = getIt.get<NavigationService>();
nav.showPopUpDialog(
BrandAlert(
title: e.response!.data['errors'][0]['code'] == 1038
@ -282,16 +284,14 @@ class ServerInstallationRepository {
isRed: true,
onPressed: () async {
await hetznerApi.deleteSelfprivacyServerAndAllVolumes(
domainName: cloudFlareDomain.domainName);
domainName: cloudFlareDomain.domainName,);
onCancel();
},
),
ActionButton(
text: 'basis.cancel'.tr(),
onPressed: () {
onCancel();
},
onPressed: onCancel,
),
],
),
@ -304,18 +304,18 @@ class ServerInstallationRepository {
);
}
Future<void> createDkimRecord(ServerDomain cloudFlareDomain) async {
var cloudflareApi = CloudflareApi();
var api = ServerApi();
Future<void> createDkimRecord(final ServerDomain cloudFlareDomain) async {
final CloudflareApi cloudflareApi = CloudflareApi();
final ServerApi api = ServerApi();
var dkimRecordString = await api.getDkim();
final String? dkimRecordString = await api.getDkim();
await cloudflareApi.setDkim(dkimRecordString ?? '', cloudFlareDomain);
}
Future<bool> isHttpServerWorking() async {
var api = ServerApi();
var isHttpServerWorking = await api.isHttpServerWorking();
final ServerApi api = ServerApi();
final bool isHttpServerWorking = await api.isHttpServerWorking();
try {
await api.getDkim();
} catch (e) {
@ -325,28 +325,28 @@ class ServerInstallationRepository {
}
Future<ServerHostingDetails> restart() async {
var hetznerApi = HetznerApi();
return await hetznerApi.reset();
final HetznerApi hetznerApi = HetznerApi();
return hetznerApi.reset();
}
Future<ServerHostingDetails> powerOn() async {
var hetznerApi = HetznerApi();
return await hetznerApi.powerOn();
final HetznerApi hetznerApi = HetznerApi();
return hetznerApi.powerOn();
}
Future<ServerRecoveryCapabilities> getRecoveryCapabilities(
ServerDomain serverDomain,
final ServerDomain serverDomain,
) async {
var serverApi = ServerApi(
final ServerApi serverApi = ServerApi(
isWithToken: false,
overrideDomain: serverDomain.domainName,
);
final serverApiVersion = await serverApi.getApiVersion();
final String? serverApiVersion = await serverApi.getApiVersion();
if (serverApiVersion == null) {
return ServerRecoveryCapabilities.none;
}
try {
final parsedVersion = Version.parse(serverApiVersion);
final Version parsedVersion = Version.parse(serverApiVersion);
if (!VersionConstraint.parse('>=1.2.0').allows(parsedVersion)) {
return ServerRecoveryCapabilities.legacy;
}
@ -356,10 +356,10 @@ class ServerInstallationRepository {
}
}
Future<String> getServerIpFromDomain(ServerDomain serverDomain) async {
final lookup = await DnsUtils.lookupRecord(
Future<String> getServerIpFromDomain(final ServerDomain serverDomain) async {
final List<RRecord>? lookup = await DnsUtils.lookupRecord(
serverDomain.domainName, RRecordType.A,
provider: DnsApiProvider.CLOUDFLARE);
provider: DnsApiProvider.CLOUDFLARE,);
if (lookup == null || lookup.isEmpty) {
throw IpNotFoundException('No IP found for domain $serverDomain');
}
@ -369,39 +369,39 @@ class ServerInstallationRepository {
Future<String> getDeviceName() async {
final DeviceInfoPlugin deviceInfo = DeviceInfoPlugin();
if (kIsWeb) {
return await deviceInfo.webBrowserInfo
.then((value) => '${value.browserName} ${value.platform}');
return deviceInfo.webBrowserInfo
.then((final WebBrowserInfo value) => '${value.browserName} ${value.platform}');
} else {
if (Platform.isAndroid) {
return await deviceInfo.androidInfo
.then((value) => '${value.model} ${value.version.release}');
return deviceInfo.androidInfo
.then((final AndroidDeviceInfo value) => '${value.model} ${value.version.release}');
} else if (Platform.isIOS) {
return await deviceInfo.iosInfo.then((value) =>
'${value.utsname.machine} ${value.systemName} ${value.systemVersion}');
return deviceInfo.iosInfo.then((final IosDeviceInfo value) =>
'${value.utsname.machine} ${value.systemName} ${value.systemVersion}',);
} else if (Platform.isLinux) {
return await deviceInfo.linuxInfo.then((value) => value.prettyName);
return deviceInfo.linuxInfo.then((final LinuxDeviceInfo value) => value.prettyName);
} else if (Platform.isMacOS) {
return await deviceInfo.macOsInfo
.then((value) => '${value.hostName} ${value.computerName}');
return deviceInfo.macOsInfo
.then((final MacOsDeviceInfo value) => '${value.hostName} ${value.computerName}');
} else if (Platform.isWindows) {
return await deviceInfo.windowsInfo.then((value) => value.computerName);
return deviceInfo.windowsInfo.then((final WindowsDeviceInfo value) => value.computerName);
}
}
return 'Unidentified';
}
Future<ServerHostingDetails> authorizeByNewDeviceKey(
ServerDomain serverDomain,
String newDeviceKey,
ServerRecoveryCapabilities recoveryCapabilities,
final ServerDomain serverDomain,
final String newDeviceKey,
final ServerRecoveryCapabilities recoveryCapabilities,
) async {
var serverApi = ServerApi(
final ServerApi serverApi = ServerApi(
isWithToken: false,
overrideDomain: serverDomain.domainName,
);
final serverIp = await getServerIpFromDomain(serverDomain);
final apiResponse = await serverApi.authorizeDevice(
DeviceToken(device: await getDeviceName(), token: newDeviceKey));
final String serverIp = await getServerIpFromDomain(serverDomain);
final ApiResponse<String> apiResponse = await serverApi.authorizeDevice(
DeviceToken(device: await getDeviceName(), token: newDeviceKey),);
if (apiResponse.isSuccess) {
return ServerHostingDetails(
@ -424,17 +424,17 @@ class ServerInstallationRepository {
}
Future<ServerHostingDetails> authorizeByRecoveryKey(
ServerDomain serverDomain,
String recoveryKey,
ServerRecoveryCapabilities recoveryCapabilities,
final ServerDomain serverDomain,
final String recoveryKey,
final ServerRecoveryCapabilities recoveryCapabilities,
) async {
var serverApi = ServerApi(
final ServerApi serverApi = ServerApi(
isWithToken: false,
overrideDomain: serverDomain.domainName,
);
final serverIp = await getServerIpFromDomain(serverDomain);
final apiResponse = await serverApi.useRecoveryToken(
DeviceToken(device: await getDeviceName(), token: recoveryKey));
final String serverIp = await getServerIpFromDomain(serverDomain);
final ApiResponse<String> apiResponse = await serverApi.useRecoveryToken(
DeviceToken(device: await getDeviceName(), token: recoveryKey),);
if (apiResponse.isSuccess) {
return ServerHostingDetails(
@ -457,18 +457,18 @@ class ServerInstallationRepository {
}
Future<ServerHostingDetails> authorizeByApiToken(
ServerDomain serverDomain,
String apiToken,
ServerRecoveryCapabilities recoveryCapabilities,
final ServerDomain serverDomain,
final String apiToken,
final ServerRecoveryCapabilities recoveryCapabilities,
) async {
var serverApi = ServerApi(
final ServerApi serverApi = ServerApi(
isWithToken: false,
overrideDomain: serverDomain.domainName,
customToken: apiToken,
);
final serverIp = await getServerIpFromDomain(serverDomain);
final String serverIp = await getServerIpFromDomain(serverDomain);
if (recoveryCapabilities == ServerRecoveryCapabilities.legacy) {
final apiResponse = await serverApi.servicesPowerCheck();
final Map<ServiceTypes, bool> apiResponse = await serverApi.servicesPowerCheck();
if (apiResponse.isNotEmpty) {
return ServerHostingDetails(
apiToken: apiToken,
@ -484,13 +484,13 @@ class ServerInstallationRepository {
);
} else {
throw ServerAuthorizationException(
'Couldn\'t connect to server with this token',
"Couldn't connect to server with this token",
);
}
}
final deviceAuthKey = await serverApi.createDeviceToken();
final apiResponse = await serverApi.authorizeDevice(
DeviceToken(device: await getDeviceName(), token: deviceAuthKey.data));
final ApiResponse<String> deviceAuthKey = await serverApi.createDeviceToken();
final ApiResponse<String> apiResponse = await serverApi.authorizeDevice(
DeviceToken(device: await getDeviceName(), token: deviceAuthKey.data),);
if (apiResponse.isSuccess) {
return ServerHostingDetails(
@ -513,21 +513,21 @@ class ServerInstallationRepository {
}
Future<User> getMainUser() async {
var serverApi = ServerApi();
const fallbackUser = User(
final ServerApi serverApi = ServerApi();
const User fallbackUser = User(
isFoundOnServer: false,
note: 'Couldn\'t find main user on server, API is outdated',
note: "Couldn't find main user on server, API is outdated",
login: 'UNKNOWN',
sshKeys: [],
);
final serverApiVersion = await serverApi.getApiVersion();
final users = await serverApi.getUsersList(withMainUser: true);
final String? serverApiVersion = await serverApi.getApiVersion();
final ApiResponse<List<String>> users = await serverApi.getUsersList(withMainUser: true);
if (serverApiVersion == null || !users.isSuccess) {
return fallbackUser;
}
try {
final parsedVersion = Version.parse(serverApiVersion);
final Version parsedVersion = Version.parse(serverApiVersion);
if (!VersionConstraint.parse('>=1.2.5').allows(parsedVersion)) {
return fallbackUser;
}
@ -541,25 +541,25 @@ class ServerInstallationRepository {
}
Future<List<ServerBasicInfo>> getServersOnHetznerAccount() async {
var hetznerApi = HetznerApi();
final servers = await hetznerApi.getServers();
final HetznerApi hetznerApi = HetznerApi();
final List<HetznerServerInfo> servers = await hetznerApi.getServers();
return servers
.map((server) => ServerBasicInfo(
.map((final HetznerServerInfo server) => ServerBasicInfo(
id: server.id,
name: server.name,
ip: server.publicNet.ipv4.ip,
reverseDns: server.publicNet.ipv4.reverseDns,
created: server.created,
volumeId: server.volumes.isNotEmpty ? server.volumes[0] : 0,
))
),)
.toList();
}
Future<void> saveServerDetails(ServerHostingDetails serverDetails) async {
Future<void> saveServerDetails(final ServerHostingDetails serverDetails) async {
await getIt<ApiConfigModel>().storeServerDetails(serverDetails);
}
Future<void> saveHetznerKey(String key) async {
Future<void> saveHetznerKey(final String key) async {
print('saved');
await getIt<ApiConfigModel>().storeHetznerKey(key);
}
@ -569,15 +569,15 @@ class ServerInstallationRepository {
getIt<ApiConfigModel>().init();
}
Future<void> saveBackblazeKey(BackblazeCredential backblazeCredential) async {
Future<void> saveBackblazeKey(final BackblazeCredential backblazeCredential) async {
await getIt<ApiConfigModel>().storeBackblazeCredential(backblazeCredential);
}
Future<void> saveCloudFlareKey(String key) async {
Future<void> saveCloudFlareKey(final String key) async {
await getIt<ApiConfigModel>().storeCloudFlareKey(key);
}
Future<void> saveDomain(ServerDomain serverDomain) async {
Future<void> saveDomain(final ServerDomain serverDomain) async {
await getIt<ApiConfigModel>().storeServerDomain(serverDomain);
}
@ -586,33 +586,33 @@ class ServerInstallationRepository {
getIt<ApiConfigModel>().init();
}
Future<void> saveIsServerStarted(bool value) async {
Future<void> saveIsServerStarted(final bool value) async {
await box.put(BNames.isServerStarted, value);
}
Future<void> saveIsServerResetedFirstTime(bool value) async {
Future<void> saveIsServerResetedFirstTime(final bool value) async {
await box.put(BNames.isServerResetedFirstTime, value);
}
Future<void> saveIsServerResetedSecondTime(bool value) async {
Future<void> saveIsServerResetedSecondTime(final bool value) async {
await box.put(BNames.isServerResetedSecondTime, value);
}
Future<void> saveRootUser(User rootUser) async {
Future<void> saveRootUser(final User rootUser) async {
await box.put(BNames.rootUser, rootUser);
}
Future<void> saveIsRecoveringServer(bool value) async {
Future<void> saveIsRecoveringServer(final bool value) async {
await box.put(BNames.isRecoveringServer, value);
}
Future<void> saveHasFinalChecked(bool value) async {
Future<void> saveHasFinalChecked(final bool value) async {
await box.put(BNames.hasFinalChecked, value);
}
Future<void> deleteServer(ServerDomain serverDomain) async {
var hetznerApi = HetznerApi();
var cloudFlare = CloudflareApi();
Future<void> deleteServer(final ServerDomain serverDomain) async {
final HetznerApi hetznerApi = HetznerApi();
final CloudflareApi cloudFlare = CloudflareApi();
await hetznerApi.deleteSelfprivacyServerAndAllVolumes(
domainName: serverDomain.domainName,

141
lib/logic/cubit/server_installation/server_installation_state.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: always_specify_types
part of '../server_installation/server_installation_cubit.dart';
abstract class ServerInstallationState extends Equatable {
@ -42,9 +44,9 @@ abstract class ServerInstallationState extends Equatable {
bool get isUserFilled => rootUser != null;
bool get isServerCreated => serverDetails != null;
bool get isFullyInitilized => _fulfilementList.every((el) => el!);
bool get isFullyInitilized => _fulfilementList.every((final el) => el!);
ServerSetupProgress get progress =>
ServerSetupProgress.values[_fulfilementList.where((el) => el!).length];
ServerSetupProgress.values[_fulfilementList.where((final el) => el!).length];
int get porgressBar {
if (progress.index < 6) {
@ -57,7 +59,7 @@ abstract class ServerInstallationState extends Equatable {
}
List<bool?> get _fulfilementList {
var res = [
final List<bool> res = [
isHetznerFilled,
isCloudFlareFilled,
isBackblazeFilled,
@ -76,9 +78,9 @@ abstract class ServerInstallationState extends Equatable {
class TimerState extends ServerInstallationNotFinished {
TimerState({
required this.dataState,
required final super.isLoading,
this.timerStart,
this.duration,
required bool isLoading,
}) : super(
hetznerKey: dataState.hetznerKey,
cloudFlareKey: dataState.cloudFlareKey,
@ -89,7 +91,6 @@ class TimerState extends ServerInstallationNotFinished {
isServerStarted: dataState.isServerStarted,
isServerResetedFirstTime: dataState.isServerResetedFirstTime,
isServerResetedSecondTime: dataState.isServerResetedSecondTime,
isLoading: isLoading,
dnsMatches: dataState.dnsMatches,
);
@ -119,32 +120,22 @@ enum ServerSetupProgress {
}
class ServerInstallationNotFinished extends ServerInstallationState {
final bool isLoading;
final Map<String, bool>? dnsMatches;
const ServerInstallationNotFinished({
String? hetznerKey,
String? cloudFlareKey,
BackblazeCredential? backblazeCredential,
ServerDomain? serverDomain,
User? rootUser,
ServerHostingDetails? serverDetails,
required bool isServerStarted,
required bool isServerResetedFirstTime,
required bool isServerResetedSecondTime,
required this.isLoading,
required final super.isServerStarted,
required final super.isServerResetedFirstTime,
required final super.isServerResetedSecondTime,
required final this.isLoading,
required this.dnsMatches,
}) : super(
hetznerKey: hetznerKey,
cloudFlareKey: cloudFlareKey,
backblazeCredential: backblazeCredential,
serverDomain: serverDomain,
rootUser: rootUser,
serverDetails: serverDetails,
isServerStarted: isServerStarted,
isServerResetedFirstTime: isServerResetedFirstTime,
isServerResetedSecondTime: isServerResetedSecondTime,
);
final super.hetznerKey,
final super.cloudFlareKey,
final super.backblazeCredential,
final super.serverDomain,
final super.rootUser,
final super.serverDetails,
});
final bool isLoading;
final Map<String, bool>? dnsMatches;
@override
List<Object?> get props => [
@ -161,17 +152,17 @@ class ServerInstallationNotFinished extends ServerInstallationState {
];
ServerInstallationNotFinished copyWith({
String? hetznerKey,
String? cloudFlareKey,
BackblazeCredential? backblazeCredential,
ServerDomain? serverDomain,
User? rootUser,
ServerHostingDetails? serverDetails,
bool? isServerStarted,
bool? isServerResetedFirstTime,
bool? isServerResetedSecondTime,
bool? isLoading,
Map<String, bool>? dnsMatches,
final String? hetznerKey,
final String? cloudFlareKey,
final BackblazeCredential? backblazeCredential,
final ServerDomain? serverDomain,
final User? rootUser,
final ServerHostingDetails? serverDetails,
final bool? isServerStarted,
final bool? isServerResetedFirstTime,
final bool? isServerResetedSecondTime,
final bool? isLoading,
final Map<String, bool>? dnsMatches,
}) =>
ServerInstallationNotFinished(
hetznerKey: hetznerKey ?? this.hetznerKey,
@ -221,26 +212,16 @@ class ServerInstallationEmpty extends ServerInstallationNotFinished {
class ServerInstallationFinished extends ServerInstallationState {
const ServerInstallationFinished({
required String hetznerKey,
required String cloudFlareKey,
required BackblazeCredential backblazeCredential,
required ServerDomain serverDomain,
required User rootUser,
required ServerHostingDetails serverDetails,
required bool isServerStarted,
required bool isServerResetedFirstTime,
required bool isServerResetedSecondTime,
}) : super(
hetznerKey: hetznerKey,
cloudFlareKey: cloudFlareKey,
backblazeCredential: backblazeCredential,
serverDomain: serverDomain,
rootUser: rootUser,
serverDetails: serverDetails,
isServerStarted: isServerStarted,
isServerResetedFirstTime: isServerResetedFirstTime,
isServerResetedSecondTime: isServerResetedSecondTime,
);
required final String super.hetznerKey,
required final String super.cloudFlareKey,
required final BackblazeCredential super.backblazeCredential,
required final ServerDomain super.serverDomain,
required final User super.rootUser,
required final ServerHostingDetails super.serverDetails,
required final super.isServerStarted,
required final super.isServerResetedFirstTime,
required final super.isServerResetedSecondTime,
});
@override
List<Object?> get props => [
@ -279,29 +260,23 @@ enum ServerRecoveryMethods {
}
class ServerInstallationRecovery extends ServerInstallationState {
final RecoveryStep currentStep;
final ServerRecoveryCapabilities recoveryCapabilities;
const ServerInstallationRecovery({
String? hetznerKey,
String? cloudFlareKey,
BackblazeCredential? backblazeCredential,
ServerDomain? serverDomain,
User? rootUser,
ServerHostingDetails? serverDetails,
required this.currentStep,
required this.recoveryCapabilities,
final super.hetznerKey,
final super.cloudFlareKey,
final super.backblazeCredential,
final super.serverDomain,
final super.rootUser,
final super.serverDetails,
}) : super(
hetznerKey: hetznerKey,
cloudFlareKey: cloudFlareKey,
backblazeCredential: backblazeCredential,
serverDomain: serverDomain,
rootUser: rootUser,
serverDetails: serverDetails,
isServerStarted: true,
isServerResetedFirstTime: true,
isServerResetedSecondTime: true,
);
final RecoveryStep currentStep;
final ServerRecoveryCapabilities recoveryCapabilities;
@override
List<Object?> get props => [
@ -317,14 +292,14 @@ class ServerInstallationRecovery extends ServerInstallationState {
];
ServerInstallationRecovery copyWith({
String? hetznerKey,
String? cloudFlareKey,
BackblazeCredential? backblazeCredential,
ServerDomain? serverDomain,
User? rootUser,
ServerHostingDetails? serverDetails,
RecoveryStep? currentStep,
ServerRecoveryCapabilities? recoveryCapabilities,
final String? hetznerKey,
final String? cloudFlareKey,
final BackblazeCredential? backblazeCredential,
final ServerDomain? serverDomain,
final User? rootUser,
final ServerHostingDetails? serverDetails,
final RecoveryStep? currentStep,
final ServerRecoveryCapabilities? recoveryCapabilities,
}) =>
ServerInstallationRecovery(
hetznerKey: hetznerKey ?? this.hetznerKey,
@ -337,8 +312,7 @@ class ServerInstallationRecovery extends ServerInstallationState {
recoveryCapabilities: recoveryCapabilities ?? this.recoveryCapabilities,
);
ServerInstallationFinished finish() {
return ServerInstallationFinished(
ServerInstallationFinished finish() => ServerInstallationFinished(
hetznerKey: hetznerKey!,
cloudFlareKey: cloudFlareKey!,
backblazeCredential: backblazeCredential!,
@ -350,4 +324,3 @@ class ServerInstallationRecovery extends ServerInstallationState {
isServerResetedSecondTime: true,
);
}
}

6
lib/logic/cubit/services/services_cubit.dart
View file

@ -5,13 +5,13 @@ import 'package:selfprivacy/logic/cubit/app_config_dependent/authentication_depe
part 'services_state.dart';
class ServicesCubit extends ServerInstallationDependendCubit<ServicesState> {
ServicesCubit(ServerInstallationCubit serverInstallationCubit)
ServicesCubit(final ServerInstallationCubit serverInstallationCubit)
: super(serverInstallationCubit, ServicesState.allOff());
final api = ServerApi();
final ServerApi api = ServerApi();
@override
Future<void> load() async {
if (serverInstallationCubit.state is ServerInstallationFinished) {
var statuses = await api.servicesPowerCheck();
final Map<ServiceTypes, bool> statuses = await api.servicesPowerCheck();
emit(
ServicesState(
isPasswordManagerEnable: statuses[ServiceTypes.passwordManager]!,

38
lib/logic/cubit/services/services_state.dart
View file

@ -1,6 +1,23 @@
// ignore_for_file: always_specify_types
part of 'services_cubit.dart';
class ServicesState extends ServerInstallationDependendState {
factory ServicesState.allOn() => const ServicesState(
isPasswordManagerEnable: true,
isCloudEnable: true,
isGitEnable: true,
isSocialNetworkEnable: true,
isVpnEnable: true,
);
factory ServicesState.allOff() => const ServicesState(
isPasswordManagerEnable: false,
isCloudEnable: false,
isGitEnable: false,
isSocialNetworkEnable: false,
isVpnEnable: false,
);
const ServicesState({
required this.isPasswordManagerEnable,
required this.isCloudEnable,
@ -15,23 +32,8 @@ class ServicesState extends ServerInstallationDependendState {
final bool isSocialNetworkEnable;
final bool isVpnEnable;
factory ServicesState.allOff() => const ServicesState(
isPasswordManagerEnable: false,
isCloudEnable: false,
isGitEnable: false,
isSocialNetworkEnable: false,
isVpnEnable: false,
);
factory ServicesState.allOn() => const ServicesState(
isPasswordManagerEnable: true,
isCloudEnable: true,
isGitEnable: true,
isSocialNetworkEnable: true,
isVpnEnable: true,
);
ServicesState enableList(
List<ServiceTypes> list,
final List<ServiceTypes> list,
) =>
ServicesState(
isPasswordManagerEnable: list.contains(ServiceTypes.passwordManager)
@ -48,7 +50,7 @@ class ServicesState extends ServerInstallationDependendState {
);
ServicesState disableList(
List<ServiceTypes> list,
final List<ServiceTypes> list,
) =>
ServicesState(
isPasswordManagerEnable: list.contains(ServiceTypes.passwordManager)
@ -74,7 +76,7 @@ class ServicesState extends ServerInstallationDependendState {
isVpnEnable
];
bool isEnableByType(ServiceTypes type) {
bool isEnableByType(final ServiceTypes type) {
switch (type) {
case ServiceTypes.passwordManager:
return isPasswordManagerEnable;

132
lib/logic/cubit/users/users_cubit.dart
View file

@ -1,78 +1,80 @@
// ignore_for_file: always_specify_types
import 'package:hive/hive.dart';
import 'package:selfprivacy/config/hive_config.dart';
import 'package:selfprivacy/logic/cubit/app_config_dependent/authentication_dependend_cubit.dart';
import 'package:selfprivacy/logic/models/hive/user.dart';
import '../../api_maps/server.dart';
import 'package:selfprivacy/logic/api_maps/server.dart';
export 'package:provider/provider.dart';
part 'users_state.dart';
class UsersCubit extends ServerInstallationDependendCubit<UsersState> {
UsersCubit(ServerInstallationCubit serverInstallationCubit)
UsersCubit(final ServerInstallationCubit serverInstallationCubit)
: super(
serverInstallationCubit,
const UsersState(
<User>[], User(login: 'root'), User(login: 'loading...')));
<User>[], User(login: 'root'), User(login: 'loading...'),),);
Box<User> box = Hive.box<User>(BNames.usersBox);
Box serverInstallationBox = Hive.box(BNames.serverInstallationBox);
final api = ServerApi();
final ServerApi api = ServerApi();
@override
Future<void> load() async {
if (serverInstallationCubit.state is ServerInstallationFinished) {
var loadedUsers = box.values.toList();
final List<User> loadedUsers = box.values.toList();
final primaryUser = serverInstallationBox.get(BNames.rootUser,
defaultValue: const User(login: 'loading...'));
List<String> rootKeys = [
defaultValue: const User(login: 'loading...'),);
final List<String> rootKeys = [
...serverInstallationBox.get(BNames.rootKeys, defaultValue: [])
];
if (loadedUsers.isNotEmpty) {
emit(UsersState(
loadedUsers, User(login: 'root', sshKeys: rootKeys), primaryUser));
loadedUsers, User(login: 'root', sshKeys: rootKeys), primaryUser,),);
}
final usersFromServer = await api.getUsersList();
final ApiResponse<List<String>> usersFromServer = await api.getUsersList();
if (usersFromServer.isSuccess) {
final updatedList =
final List<User> updatedList =
mergeLocalAndServerUsers(loadedUsers, usersFromServer.data);
emit(UsersState(
updatedList, User(login: 'root', sshKeys: rootKeys), primaryUser));
updatedList, User(login: 'root', sshKeys: rootKeys), primaryUser,),);
}
final usersWithSshKeys = await loadSshKeys(state.users);
final List<User> usersWithSshKeys = await loadSshKeys(state.users);
// Update the users it the box
box.clear();
box.addAll(usersWithSshKeys);
final rootUserWithSshKeys = (await loadSshKeys([state.rootUser])).first;
final User rootUserWithSshKeys = (await loadSshKeys([state.rootUser])).first;
serverInstallationBox.put(BNames.rootKeys, rootUserWithSshKeys.sshKeys);
final primaryUserWithSshKeys =
final User primaryUserWithSshKeys =
(await loadSshKeys([state.primaryUser])).first;
serverInstallationBox.put(BNames.rootUser, primaryUserWithSshKeys);
emit(UsersState(
usersWithSshKeys, rootUserWithSshKeys, primaryUserWithSshKeys));
usersWithSshKeys, rootUserWithSshKeys, primaryUserWithSshKeys,),);
}
}
List<User> mergeLocalAndServerUsers(
List<User> localUsers, List<String> serverUsers) {
final List<User> localUsers, final List<String> serverUsers,) {
// If local user not exists on server, add it with isFoundOnServer = false
// If server user not exists on local, add it
List<User> mergedUsers = [];
List<String> serverUsersCopy = List.from(serverUsers);
final List<User> mergedUsers = [];
final List<String> serverUsersCopy = List.from(serverUsers);
for (var localUser in localUsers) {
for (final User localUser in localUsers) {
if (serverUsersCopy.contains(localUser.login)) {
mergedUsers.add(User(
login: localUser.login,
isFoundOnServer: true,
password: localUser.password,
sshKeys: localUser.sshKeys,
));
),);
serverUsersCopy.remove(localUser.login);
} else {
mergedUsers.add(User(
@ -80,28 +82,28 @@ class UsersCubit extends ServerInstallationDependendCubit<UsersState> {
isFoundOnServer: false,
password: localUser.password,
note: localUser.note,
));
),);
}
}
for (var serverUser in serverUsersCopy) {
for (final String serverUser in serverUsersCopy) {
mergedUsers.add(User(
login: serverUser,
isFoundOnServer: true,
));
),);
}
return mergedUsers;
}
Future<List<User>> loadSshKeys(List<User> users) async {
List<User> updatedUsers = [];
Future<List<User>> loadSshKeys(final List<User> users) async {
final List<User> updatedUsers = [];
for (var user in users) {
for (final User user in users) {
if (user.isFoundOnServer ||
user.login == 'root' ||
user.login == state.primaryUser.login) {
final sshKeys = await api.getUserSshKeys(user);
final ApiResponse<List<String>> sshKeys = await api.getUserSshKeys(user);
print('sshKeys for $user: ${sshKeys.data}');
if (sshKeys.isSuccess) {
updatedUsers.add(User(
@ -110,14 +112,14 @@ class UsersCubit extends ServerInstallationDependendCubit<UsersState> {
password: user.password,
sshKeys: sshKeys.data,
note: user.note,
));
),);
} else {
updatedUsers.add(User(
login: user.login,
isFoundOnServer: true,
password: user.password,
note: user.note,
));
),);
}
} else {
updatedUsers.add(User(
@ -125,7 +127,7 @@ class UsersCubit extends ServerInstallationDependendCubit<UsersState> {
isFoundOnServer: false,
password: user.password,
note: user.note,
));
),);
}
}
return updatedUsers;
@ -133,27 +135,27 @@ class UsersCubit extends ServerInstallationDependendCubit<UsersState> {
Future<void> refresh() async {
List<User> updatedUsers = List<User>.from(state.users);
final usersFromServer = await api.getUsersList();
final ApiResponse<List<String>> usersFromServer = await api.getUsersList();
if (usersFromServer.isSuccess) {
updatedUsers =
mergeLocalAndServerUsers(updatedUsers, usersFromServer.data);
}
final usersWithSshKeys = await loadSshKeys(updatedUsers);
final List<User> usersWithSshKeys = await loadSshKeys(updatedUsers);
box.clear();
box.addAll(usersWithSshKeys);
final rootUserWithSshKeys = (await loadSshKeys([state.rootUser])).first;
final User rootUserWithSshKeys = (await loadSshKeys([state.rootUser])).first;
serverInstallationBox.put(BNames.rootKeys, rootUserWithSshKeys.sshKeys);
final primaryUserWithSshKeys =
final User primaryUserWithSshKeys =
(await loadSshKeys([state.primaryUser])).first;
serverInstallationBox.put(BNames.rootUser, primaryUserWithSshKeys);
emit(UsersState(
usersWithSshKeys, rootUserWithSshKeys, primaryUserWithSshKeys));
usersWithSshKeys, rootUserWithSshKeys, primaryUserWithSshKeys,),);
return;
}
Future<void> createUser(User user) async {
Future<void> createUser(final User user) async {
// If user exists on server, do nothing
if (state.users.any((u) => u.login == user.login && u.isFoundOnServer)) {
if (state.users.any((final User u) => u.login == user.login && u.isFoundOnServer)) {
return;
}
// If user is root or primary user, do nothing
@ -161,41 +163,41 @@ class UsersCubit extends ServerInstallationDependendCubit<UsersState> {
return;
}
// If API returned error, do nothing
final result = await api.createUser(user);
final ApiResponse<User> result = await api.createUser(user);
if (!result.isSuccess) {
return;
}
var loadedUsers = List<User>.from(state.users);
final List<User> loadedUsers = List<User>.from(state.users);
loadedUsers.add(result.data);
await box.clear();
await box.addAll(loadedUsers);
emit(state.copyWith(users: loadedUsers));
}
Future<void> deleteUser(User user) async {
Future<void> deleteUser(final User user) async {
// If user is primary or root, don't delete
if (user.login == state.primaryUser.login || user.login == 'root') {
return;
}
var loadedUsers = List<User>.from(state.users);
final result = await api.deleteUser(user);
final List<User> loadedUsers = List<User>.from(state.users);
final bool result = await api.deleteUser(user);
if (result) {
loadedUsers.removeWhere((u) => u.login == user.login);
loadedUsers.removeWhere((final User u) => u.login == user.login);
await box.clear();
await box.addAll(loadedUsers);
emit(state.copyWith(users: loadedUsers));
}
}
Future<void> addSshKey(User user, String publicKey) async {
Future<void> addSshKey(final User user, final String publicKey) async {
// If adding root key, use api.addRootSshKey
// Otherwise, use api.addUserSshKey
if (user.login == 'root') {
final result = await api.addRootSshKey(publicKey);
final ApiResponse<void> result = await api.addRootSshKey(publicKey);
if (result.isSuccess) {
// Add ssh key to the array of root keys
final rootKeys = serverInstallationBox
final List<String> rootKeys = serverInstallationBox
.get(BNames.rootKeys, defaultValue: []) as List<String>;
rootKeys.add(publicKey);
serverInstallationBox.put(BNames.rootKeys, rootKeys);
@ -207,17 +209,17 @@ class UsersCubit extends ServerInstallationDependendCubit<UsersState> {
sshKeys: rootKeys,
note: state.rootUser.note,
),
));
),);
}
} else {
final result = await api.addUserSshKey(user, publicKey);
final ApiResponse<void> result = await api.addUserSshKey(user, publicKey);
if (result.isSuccess) {
// If it is primary user, update primary user
if (user.login == state.primaryUser.login) {
List<String> primaryUserKeys =
final List<String> primaryUserKeys =
List<String>.from(state.primaryUser.sshKeys);
primaryUserKeys.add(publicKey);
final updatedUser = User(
final User updatedUser = User(
login: state.primaryUser.login,
isFoundOnServer: true,
password: state.primaryUser.password,
@ -227,12 +229,12 @@ class UsersCubit extends ServerInstallationDependendCubit<UsersState> {
serverInstallationBox.put(BNames.rootUser, updatedUser);
emit(state.copyWith(
primaryUser: updatedUser,
));
),);
} else {
// If it is not primary user, update user
List<String> userKeys = List<String>.from(user.sshKeys);
final List<String> userKeys = List<String>.from(user.sshKeys);
userKeys.add(publicKey);
final updatedUser = User(
final User updatedUser = User(
login: user.login,
isFoundOnServer: true,
password: user.password,
@ -242,23 +244,23 @@ class UsersCubit extends ServerInstallationDependendCubit<UsersState> {
await box.putAt(box.values.toList().indexOf(user), updatedUser);
emit(state.copyWith(
users: box.values.toList(),
));
),);
}
}
}
}
Future<void> deleteSshKey(User user, String publicKey) async {
Future<void> deleteSshKey(final User user, final String publicKey) async {
// All keys are deleted via api.deleteUserSshKey
final result = await api.deleteUserSshKey(user, publicKey);
final ApiResponse<void> result = await api.deleteUserSshKey(user, publicKey);
if (result.isSuccess) {
// If it is root user, delete key from root keys
// If it is primary user, update primary user
// If it is not primary user, update user
if (user.login == 'root') {
final rootKeys = serverInstallationBox
final List<String> rootKeys = serverInstallationBox
.get(BNames.rootKeys, defaultValue: []) as List<String>;
rootKeys.remove(publicKey);
serverInstallationBox.put(BNames.rootKeys, rootKeys);
@ -270,14 +272,14 @@ class UsersCubit extends ServerInstallationDependendCubit<UsersState> {
sshKeys: rootKeys,
note: state.rootUser.note,
),
));
),);
return;
}
if (user.login == state.primaryUser.login) {
List<String> primaryUserKeys =
final List<String> primaryUserKeys =
List<String>.from(state.primaryUser.sshKeys);
primaryUserKeys.remove(publicKey);
final updatedUser = User(
final User updatedUser = User(
login: state.primaryUser.login,
isFoundOnServer: true,
password: state.primaryUser.password,
@ -287,12 +289,12 @@ class UsersCubit extends ServerInstallationDependendCubit<UsersState> {
serverInstallationBox.put(BNames.rootUser, updatedUser);
emit(state.copyWith(
primaryUser: updatedUser,
));
),);
return;
}
List<String> userKeys = List<String>.from(user.sshKeys);
final List<String> userKeys = List<String>.from(user.sshKeys);
userKeys.remove(publicKey);
final updatedUser = User(
final User updatedUser = User(
login: user.login,
isFoundOnServer: true,
password: user.password,
@ -302,13 +304,13 @@ class UsersCubit extends ServerInstallationDependendCubit<UsersState> {
await box.putAt(box.values.toList().indexOf(user), updatedUser);
emit(state.copyWith(
users: box.values.toList(),
));
),);
}
}
@override
void clear() async {
emit(const UsersState(
<User>[], User(login: 'root'), User(login: 'loading...')));
<User>[], User(login: 'root'), User(login: 'loading...'),),);
}
}

16
lib/logic/cubit/users/users_state.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: always_specify_types
part of 'users_cubit.dart';
class UsersState extends ServerInstallationDependendState {
@ -11,22 +13,18 @@ class UsersState extends ServerInstallationDependendState {
List<Object> get props => [users, rootUser, primaryUser];
UsersState copyWith({
List<User>? users,
User? rootUser,
User? primaryUser,
}) {
return UsersState(
final List<User>? users,
final User? rootUser,
final User? primaryUser,
}) => UsersState(
users ?? this.users,
rootUser ?? this.rootUser,
primaryUser ?? this.primaryUser,
);
}
bool isLoginRegistered(String login) {
return users.any((user) => user.login == login) ||
bool isLoginRegistered(final String login) => users.any((final User user) => user.login == login) ||
login == rootUser.login ||
login == primaryUser.login;
}
bool get isEmpty => users.isEmpty;
}

16
lib/logic/get_it/api_config.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: always_specify_types
import 'package:hive/hive.dart';
import 'package:selfprivacy/config/hive_config.dart';
import 'package:selfprivacy/logic/models/hive/backblaze_bucket.dart';
@ -22,38 +24,38 @@ class ApiConfigModel {
ServerDomain? _serverDomain;
BackblazeBucket? _backblazeBucket;
Future<void> storeHetznerKey(String value) async {
Future<void> storeHetznerKey(final String value) async {
await _box.put(BNames.hetznerKey, value);
_hetznerKey = value;
}
Future<void> storeCloudFlareKey(String value) async {
Future<void> storeCloudFlareKey(final String value) async {
await _box.put(BNames.cloudFlareKey, value);
_cloudFlareKey = value;
}
Future<void> storeBackblazeCredential(BackblazeCredential value) async {
Future<void> storeBackblazeCredential(final BackblazeCredential value) async {
await _box.put(BNames.backblazeCredential, value);
_backblazeCredential = value;
}
Future<void> storeServerDomain(ServerDomain value) async {
Future<void> storeServerDomain(final ServerDomain value) async {
await _box.put(BNames.serverDomain, value);
_serverDomain = value;
}
Future<void> storeServerDetails(ServerHostingDetails value) async {
Future<void> storeServerDetails(final ServerHostingDetails value) async {
await _box.put(BNames.serverDetails, value);
_serverDetails = value;
}
Future<void> storeBackblazeBucket(BackblazeBucket value) async {
Future<void> storeBackblazeBucket(final BackblazeBucket value) async {
await _box.put(BNames.backblazeBucket, value);
_backblazeBucket = value;
}
clear() {
void clear() {
_hetznerKey = null;
_cloudFlareKey = null;
_backblazeCredential = null;

4
lib/logic/get_it/console.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: always_specify_types
import 'package:flutter/material.dart';
import 'package:selfprivacy/logic/models/message.dart';
@ -6,7 +8,7 @@ class ConsoleModel extends ChangeNotifier {
List<Message> get messages => _messages;
void addMessage(Message message) {
void addMessage(final Message message) {
messages.add(message);
notifyListeners();
}

12
lib/logic/get_it/navigation.dart
View file

@ -9,18 +9,18 @@ class NavigationService {
NavigatorState? get navigator => navigatorKey.currentState;
void showPopUpDialog(AlertDialog dialog) {
final context = navigatorKey.currentState!.overlay!.context;
void showPopUpDialog(final AlertDialog dialog) {
final BuildContext context = navigatorKey.currentState!.overlay!.context;
showDialog(
context: context,
builder: (_) => dialog,
builder: (final _) => dialog,
);
}
void showSnackBar(String text) {
final state = scaffoldMessengerKey.currentState!;
final snack = SnackBar(
void showSnackBar(final String text) {
final ScaffoldMessengerState state = scaffoldMessengerKey.currentState!;
final SnackBar snack = SnackBar(
backgroundColor: BrandColors.black.withOpacity(0.8),
content: Text(text, style: buttonTitleText),
duration: const Duration(seconds: 2),

6
lib/logic/models/hive/backblaze_bucket.dart
View file

@ -8,7 +8,7 @@ class BackblazeBucket {
{required this.bucketId,
required this.bucketName,
required this.applicationKeyId,
required this.applicationKey});
required this.applicationKey,});
@HiveField(0)
final String bucketId;
@ -23,7 +23,5 @@ class BackblazeBucket {
final String bucketName;
@override
String toString() {
return bucketName;
}
String toString() => bucketName;
}

12
lib/logic/models/hive/backblaze_credential.dart
View file

@ -14,16 +14,14 @@ class BackblazeCredential {
@HiveField(1)
final String applicationKey;
get encodedApiKey => encodedBackblazeKey(keyId, applicationKey);
String get encodedApiKey => encodedBackblazeKey(keyId, applicationKey);
@override
String toString() {
return '$keyId: $encodedApiKey';
}
String toString() => '$keyId: $encodedApiKey';
}
String encodedBackblazeKey(String? keyId, String? applicationKey) {
String apiKey = '$keyId:$applicationKey';
String encodedApiKey = base64.encode(utf8.encode(apiKey));
String encodedBackblazeKey(final String? keyId, final String? applicationKey) {
final String apiKey = '$keyId:$applicationKey';
final String encodedApiKey = base64.encode(utf8.encode(apiKey));
return encodedApiKey;
}

4
lib/logic/models/hive/server_details.dart
View file

@ -35,8 +35,7 @@ class ServerHostingDetails {
@HiveField(6, defaultValue: ServerProvider.hetzner)
final ServerProvider provider;
ServerHostingDetails copyWith({DateTime? startTime}) {
return ServerHostingDetails(
ServerHostingDetails copyWith({final DateTime? startTime}) => ServerHostingDetails(
startTime: startTime ?? this.startTime,
createTime: createTime,
id: id,
@ -45,7 +44,6 @@ class ServerHostingDetails {
apiToken: apiToken,
provider: provider,
);
}
@override
String toString() => id.toString();

4
lib/logic/models/hive/server_domain.dart
View file

@ -20,9 +20,7 @@ class ServerDomain {
final DnsProvider provider;
@override
String toString() {
return '$domainName: $zoneId';
}
String toString() => '$domainName: $zoneId';
}
@HiveType(typeId: 100)

6
lib/logic/models/hive/user.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: always_specify_types
import 'dart:ui';
import 'package:equatable/equatable.dart';
@ -37,7 +39,5 @@ class User extends Equatable {
Color get color => stringToColor(login);
@override
String toString() {
return '$login, ${isFoundOnServer ? 'found' : 'not found'}, ${sshKeys.length} ssh keys, note: $note';
}
String toString() => '$login, ${isFoundOnServer ? 'found' : 'not found'}, ${sshKeys.length} ssh keys, note: $note';
}

12
lib/logic/models/hive/user.g.dart
View file

@ -1,5 +1,7 @@
// GENERATED CODE - DO NOT MODIFY BY HAND
// ignore_for_file: always_specify_types
part of 'user.dart';
// **************************************************************************
@ -11,9 +13,9 @@ class UserAdapter extends TypeAdapter<User> {
final int typeId = 1;
@override
User read(BinaryReader reader) {
final numOfFields = reader.readByte();
final fields = <int, dynamic>{
User read(final BinaryReader reader) {
final int numOfFields = reader.readByte();
final Map<int, dynamic> fields = <int, dynamic>{
for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
};
return User(
@ -26,7 +28,7 @@ class UserAdapter extends TypeAdapter<User> {
}
@override
void write(BinaryWriter writer, User obj) {
void write(final BinaryWriter writer, final User obj) {
writer
..writeByte(5)
..writeByte(0)
@ -45,7 +47,7 @@ class UserAdapter extends TypeAdapter<User> {
int get hashCode => typeId.hashCode;
@override
bool operator ==(Object other) =>
bool operator ==(final Object other) =>
identical(this, other) ||
other is UserAdapter &&
runtimeType == other.runtimeType &&

13
lib/logic/models/job.dart
View file

@ -1,16 +1,18 @@
// ignore_for_file: always_specify_types
import 'package:easy_localization/easy_localization.dart';
import 'package:equatable/equatable.dart';
import 'package:flutter/material.dart';
import 'package:selfprivacy/logic/common_enum/common_enum.dart';
import 'package:selfprivacy/utils/password_generator.dart';
import 'hive/user.dart';
import 'package:selfprivacy/logic/models/hive/user.dart';
@immutable
class Job extends Equatable {
Job({
String? id,
required this.title,
final String? id,
}) : id = id ?? StringGenerators.simpleId();
final String title;
@ -45,8 +47,8 @@ class DeleteUserJob extends Job {
class ToggleJob extends Job {
ToggleJob({
required this.type,
required String title,
}) : super(title: title);
required final super.title,
});
final dynamic type;
@ -56,12 +58,11 @@ class ToggleJob extends Job {
class ServiceToggleJob extends ToggleJob {
ServiceToggleJob({
required ServiceTypes type,
required final ServiceTypes super.type,
required this.needToTurnOn,
}) : super(
title:
'${needToTurnOn ? "jobs.serviceTurnOn".tr() : "jobs.serviceTurnOff".tr()} ${type.title}',
type: type,
);
final bool needToTurnOn;

6
lib/logic/models/json/api_token.dart
View file

@ -4,6 +4,9 @@ part 'api_token.g.dart';
@JsonSerializable()
class ApiToken {
factory ApiToken.fromJson(final Map<String, dynamic> json) =>
_$ApiTokenFromJson(json);
ApiToken({
required this.name,
required this.date,
@ -14,7 +17,4 @@ class ApiToken {
final DateTime date;
@JsonKey(name: 'is_caller')
final bool isCaller;
factory ApiToken.fromJson(Map<String, dynamic> json) =>
_$ApiTokenFromJson(json);
}

10
lib/logic/models/json/auto_upgrade_settings.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: always_specify_types
import 'package:equatable/equatable.dart';
import 'package:json_annotation/json_annotation.dart';
@ -5,18 +7,18 @@ part 'auto_upgrade_settings.g.dart';
@JsonSerializable(createToJson: true)
class AutoUpgradeSettings extends Equatable {
final bool enable;
final bool allowReboot;
factory AutoUpgradeSettings.fromJson(final Map<String, dynamic> json) =>
_$AutoUpgradeSettingsFromJson(json);
const AutoUpgradeSettings({
required this.enable,
required this.allowReboot,
});
final bool enable;
final bool allowReboot;
@override
List<Object?> get props => [enable, allowReboot];
factory AutoUpgradeSettings.fromJson(Map<String, dynamic> json) =>
_$AutoUpgradeSettingsFromJson(json);
Map<String, dynamic> toJson() => _$AutoUpgradeSettingsToJson(this);
}

12
lib/logic/models/json/backup.dart
View file

@ -4,14 +4,14 @@ part 'backup.g.dart';
@JsonSerializable()
class Backup {
factory Backup.fromJson(final Map<String, dynamic> json) => _$BackupFromJson(json);
Backup({required this.time, required this.id});
// Time of the backup
final DateTime time;
@JsonKey(name: 'short_id')
final String id;
factory Backup.fromJson(Map<String, dynamic> json) => _$BackupFromJson(json);
}
enum BackupStatusEnum {
@ -33,16 +33,16 @@ enum BackupStatusEnum {
@JsonSerializable()
class BackupStatus {
factory BackupStatus.fromJson(final Map<String, dynamic> json) =>
_$BackupStatusFromJson(json);
BackupStatus(
{required this.status,
required this.progress,
required this.errorMessage});
required this.errorMessage,});
final BackupStatusEnum status;
final double progress;
@JsonKey(name: 'error_message')
final String? errorMessage;
factory BackupStatus.fromJson(Map<String, dynamic> json) =>
_$BackupStatusFromJson(json);
}

6
lib/logic/models/json/device_token.dart
View file

@ -4,6 +4,9 @@ part 'device_token.g.dart';
@JsonSerializable()
class DeviceToken {
factory DeviceToken.fromJson(final Map<String, dynamic> json) =>
_$DeviceTokenFromJson(json);
DeviceToken({
required this.device,
required this.token,
@ -11,7 +14,4 @@ class DeviceToken {
final String device;
final String token;
factory DeviceToken.fromJson(Map<String, dynamic> json) =>
_$DeviceTokenFromJson(json);
}

2
lib/logic/models/json/dns_records.dart
View file

@ -20,5 +20,5 @@ class DnsRecord {
final int priority;
final bool proxied;
toJson() => _$DnsRecordToJson(this);
Map<String, dynamic> toJson() => _$DnsRecordToJson(this);
}

58
lib/logic/models/json/hetzner_server_info.dart
View file

@ -1,9 +1,22 @@
// ignore_for_file: always_specify_types
import 'package:json_annotation/json_annotation.dart';
part 'hetzner_server_info.g.dart';
@JsonSerializable()
class HetznerServerInfo {
HetznerServerInfo(
this.id,
this.name,
this.status,
this.created,
this.serverType,
this.location,
this.publicNet,
this.volumes,
);
final int id;
final String name;
final ServerStatus status;
@ -19,46 +32,35 @@ class HetznerServerInfo {
@JsonKey(name: 'public_net')
final HetznerPublicNetInfo publicNet;
static HetznerLocation locationFromJson(Map json) =>
static HetznerLocation locationFromJson(final Map json) =>
HetznerLocation.fromJson(json['location']);
static HetznerServerInfo fromJson(Map<String, dynamic> json) =>
static HetznerServerInfo fromJson(final Map<String, dynamic> json) =>
_$HetznerServerInfoFromJson(json);
HetznerServerInfo(
this.id,
this.name,
this.status,
this.created,
this.serverType,
this.location,
this.publicNet,
this.volumes,
);
}
@JsonSerializable()
class HetznerPublicNetInfo {
final HetznerIp4 ipv4;
static HetznerPublicNetInfo fromJson(Map<String, dynamic> json) =>
_$HetznerPublicNetInfoFromJson(json);
HetznerPublicNetInfo(this.ipv4);
final HetznerIp4 ipv4;
static HetznerPublicNetInfo fromJson(final Map<String, dynamic> json) =>
_$HetznerPublicNetInfoFromJson(json);
}
@JsonSerializable()
class HetznerIp4 {
HetznerIp4(this.id, this.ip, this.blocked, this.reverseDns);
final bool blocked;
@JsonKey(name: 'dns_ptr')
final String reverseDns;
final int id;
final String ip;
static HetznerIp4 fromJson(Map<String, dynamic> json) =>
static HetznerIp4 fromJson(final Map<String, dynamic> json) =>
_$HetznerIp4FromJson(json);
HetznerIp4(this.id, this.ip, this.blocked, this.reverseDns);
}
enum ServerStatus {
@ -75,15 +77,15 @@ enum ServerStatus {
@JsonSerializable()
class HetznerServerTypeInfo {
HetznerServerTypeInfo(this.cores, this.memory, this.disk, this.prices);
final int cores;
final num memory;
final int disk;
final List<HetznerPriceInfo> prices;
HetznerServerTypeInfo(this.cores, this.memory, this.disk, this.prices);
static HetznerServerTypeInfo fromJson(Map<String, dynamic> json) =>
static HetznerServerTypeInfo fromJson(final Map<String, dynamic> json) =>
_$HetznerServerTypeInfoFromJson(json);
}
@ -97,14 +99,16 @@ class HetznerPriceInfo {
@JsonKey(name: 'price_monthly', fromJson: HetznerPriceInfo.getPrice)
final double monthly;
static HetznerPriceInfo fromJson(Map<String, dynamic> json) =>
static HetznerPriceInfo fromJson(final Map<String, dynamic> json) =>
_$HetznerPriceInfoFromJson(json);
static double getPrice(Map json) => double.parse(json['gross'] as String);
static double getPrice(final Map json) => double.parse(json['gross'] as String);
}
@JsonSerializable()
class HetznerLocation {
HetznerLocation(this.country, this.city, this.description, this.zone);
final String country;
final String city;
final String description;
@ -112,8 +116,6 @@ class HetznerLocation {
@JsonKey(name: 'network_zone')
final String zone;
HetznerLocation(this.country, this.city, this.description, this.zone);
static HetznerLocation fromJson(Map<String, dynamic> json) =>
static HetznerLocation fromJson(final Map<String, dynamic> json) =>
_$HetznerLocationFromJson(json);
}

8
lib/logic/models/json/recovery_token_status.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: always_specify_types
import 'package:equatable/equatable.dart';
import 'package:json_annotation/json_annotation.dart';
@ -5,6 +7,9 @@ part 'recovery_token_status.g.dart';
@JsonSerializable()
class RecoveryKeyStatus extends Equatable {
factory RecoveryKeyStatus.fromJson(final Map<String, dynamic> json) =>
_$RecoveryKeyStatusFromJson(json);
const RecoveryKeyStatus({
required this.exists,
required this.valid,
@ -20,9 +25,6 @@ class RecoveryKeyStatus extends Equatable {
final int? usesLeft;
final bool valid;
factory RecoveryKeyStatus.fromJson(Map<String, dynamic> json) =>
_$RecoveryKeyStatusFromJson(json);
@override
List<Object?> get props => [
exists,

8
lib/logic/models/json/server_configurations.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: always_specify_types
import 'package:equatable/equatable.dart';
import 'package:json_annotation/json_annotation.dart';
@ -5,6 +7,9 @@ part 'server_configurations.g.dart';
@JsonSerializable(createToJson: true)
class AutoUpgradeConfigurations extends Equatable {
factory AutoUpgradeConfigurations.fromJson(final Map<String, dynamic> json) =>
_$AutoUpgradeConfigurationsFromJson(json);
const AutoUpgradeConfigurations({
required this.enable,
required this.allowReboot,
@ -12,9 +17,6 @@ class AutoUpgradeConfigurations extends Equatable {
final bool enable;
final bool allowReboot;
factory AutoUpgradeConfigurations.fromJson(Map<String, dynamic> json) =>
_$AutoUpgradeConfigurationsFromJson(json);
Map<String, dynamic> toJson() => _$AutoUpgradeConfigurationsToJson(this);
@override

4
lib/logic/models/message.dart
View file

@ -1,6 +1,6 @@
import 'package:intl/intl.dart';
final formatter = DateFormat('hh:mm');
final DateFormat formatter = DateFormat('hh:mm');
class Message {
Message({this.text, this.type = MessageType.normal}) : time = DateTime.now();
@ -10,7 +10,7 @@ class Message {
final MessageType type;
String get timeString => formatter.format(time);
static Message warn({String? text}) => Message(
static Message warn({final String? text}) => Message(
text: text,
type: MessageType.warning,
);

4
lib/logic/models/provider.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: always_specify_types
import 'package:equatable/equatable.dart';
import 'package:flutter/widgets.dart';
import 'package:selfprivacy/logic/models/state_types.dart';
@ -15,7 +17,7 @@ class ProviderModel extends Equatable {
final StateType state;
final ProviderType type;
ProviderModel updateState(StateType newState) => ProviderModel(
ProviderModel updateState(final StateType newState) => ProviderModel(
state: newState,
type: type,
);

53
lib/logic/models/server_basic_info.dart
View file

@ -1,10 +1,6 @@
// ignore_for_file: always_specify_types
class ServerBasicInfo {
final int id;
final String name;
final String reverseDns;
final String ip;
final DateTime created;
final int volumeId;
ServerBasicInfo({
required this.id,
@ -14,34 +10,20 @@ class ServerBasicInfo {
required this.created,
required this.volumeId,
});
final int id;
final String name;
final String reverseDns;
final String ip;
final DateTime created;
final int volumeId;
}
class ServerBasicInfoWithValidators extends ServerBasicInfo {
final bool isIpValid;
final bool isReverseDnsValid;
ServerBasicInfoWithValidators({
required int id,
required String name,
required String reverseDns,
required String ip,
required DateTime created,
required int volumeId,
required this.isIpValid,
required this.isReverseDnsValid,
}) : super(
id: id,
name: name,
reverseDns: reverseDns,
ip: ip,
created: created,
volumeId: volumeId,
);
ServerBasicInfoWithValidators.fromServerBasicInfo({
required ServerBasicInfo serverBasicInfo,
required isIpValid,
required isReverseDnsValid,
required final ServerBasicInfo serverBasicInfo,
required final isIpValid,
required final isReverseDnsValid,
}) : this(
id: serverBasicInfo.id,
name: serverBasicInfo.name,
@ -52,4 +34,17 @@ class ServerBasicInfoWithValidators extends ServerBasicInfo {
isIpValid: isIpValid,
isReverseDnsValid: isReverseDnsValid,
);
ServerBasicInfoWithValidators({
required final super.id,
required final super.name,
required final super.reverseDns,
required final super.ip,
required final super.created,
required final super.volumeId,
required this.isIpValid,
required this.isReverseDnsValid,
});
final bool isIpValid;
final bool isReverseDnsValid;
}

12
lib/logic/models/server_status.dart
View file

@ -1,24 +1,22 @@
class ServerStatus {
final StatusTypes http;
final StatusTypes imap;
final StatusTypes smtp;
ServerStatus({
required this.http,
this.imap = StatusTypes.nodata,
this.smtp = StatusTypes.nodata,
});
final StatusTypes http;
final StatusTypes imap;
final StatusTypes smtp;
ServerStatus fromJson(Map<String, dynamic> json) {
return ServerStatus(
ServerStatus fromJson(final Map<String, dynamic> json) => ServerStatus(
http: statusTypeFromNumber(json['http']),
imap: statusTypeFromNumber(json['imap']),
smtp: statusTypeFromNumber(json['smtp']),
);
}
}
StatusTypes statusTypeFromNumber(int? number) {
StatusTypes statusTypeFromNumber(final int? number) {
if (number == 0) {
return StatusTypes.ok;
} else if (number == 1) {

18
lib/logic/models/timezone_settings.dart
View file

@ -1,18 +1,18 @@
// ignore_for_file: always_specify_types
import 'package:timezone/timezone.dart';
class TimeZoneSettings {
final Location timezone;
factory TimeZoneSettings.fromString(final String string) {
final Location location = timeZoneDatabase.locations[string]!;
return TimeZoneSettings(location);
}
TimeZoneSettings(this.timezone);
final Location timezone;
Map<String, dynamic> toJson() {
return {
Map<String, dynamic> toJson() => {
'timezone': timezone.name,
};
}
factory TimeZoneSettings.fromString(String string) {
var location = timeZoneDatabase.locations[string]!;
return TimeZoneSettings(location);
}
}

36
lib/main.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: always_specify_types
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
@ -11,11 +13,11 @@ import 'package:selfprivacy/ui/pages/root_route.dart';
import 'package:wakelock/wakelock.dart';
import 'package:timezone/data/latest.dart' as tz;
import 'config/bloc_config.dart';
import 'config/bloc_observer.dart';
import 'config/get_it_config.dart';
import 'config/localization.dart';
import 'logic/cubit/app_settings/app_settings_cubit.dart';
import 'package:selfprivacy/config/bloc_config.dart';
import 'package:selfprivacy/config/bloc_observer.dart';
import 'package:selfprivacy/config/get_it_config.dart';
import 'package:selfprivacy/config/localization.dart';
import 'package:selfprivacy/logic/cubit/app_settings/app_settings_cubit.dart';
void main() async {
WidgetsFlutterBinding.ensureInitialized();
@ -34,11 +36,11 @@ void main() async {
await EasyLocalization.ensureInitialized();
tz.initializeTimeZones();
final lightThemeData = await AppThemeFactory.create(
final ThemeData lightThemeData = await AppThemeFactory.create(
isDark: false,
fallbackColor: BrandColors.primary,
);
final darkThemeData = await AppThemeFactory.create(
final ThemeData darkThemeData = await AppThemeFactory.create(
isDark: true,
fallbackColor: BrandColors.primary,
);
@ -48,30 +50,28 @@ void main() async {
child: MyApp(
lightThemeData: lightThemeData,
darkThemeData: darkThemeData,
))),
),),),
blocObserver: SimpleBlocObserver(),
);
}
class MyApp extends StatelessWidget {
const MyApp({
Key? key,
required this.lightThemeData,
required this.darkThemeData,
}) : super(key: key);
final super.key,
});
final ThemeData lightThemeData;
final ThemeData darkThemeData;
@override
Widget build(BuildContext context) {
return Localization(
Widget build(final BuildContext context) => Localization(
child: AnnotatedRegion<SystemUiOverlayStyle>(
value: SystemUiOverlayStyle.light, // Manually changing appbar color
child: BlocAndProviderConfig(
child: BlocBuilder<AppSettingsCubit, AppSettingsState>(
builder: (context, appSettings) {
return MaterialApp(
builder: (final BuildContext context, final AppSettingsState appSettings) => MaterialApp(
scaffoldMessengerKey:
getIt.get<NavigationService>().scaffoldMessengerKey,
navigatorKey: getIt.get<NavigationService>().navigatorKey,
@ -87,20 +87,18 @@ class MyApp extends StatelessWidget {
home: appSettings.isOnboardingShowing
? const OnboardingPage(nextPage: InitializingPage())
: const RootPage(),
builder: (BuildContext context, Widget? widget) {
builder: (final BuildContext context, final Widget? widget) {
Widget error = const Text('...rendering error...');
if (widget is Scaffold || widget is Navigator) {
error = Scaffold(body: Center(child: error));
}
ErrorWidget.builder =
(FlutterErrorDetails errorDetails) => error;
(final FlutterErrorDetails errorDetails) => error;
return widget!;
},
);
},
),
),
),
),
);
}
}

35
lib/theming/factory/app_theme_factory.dart
View file

@ -1,8 +1,11 @@
// ignore_for_file: always_specify_types
import 'dart:io';
import 'package:dynamic_color/dynamic_color.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:material_color_utilities/palettes/core_palette.dart';
import 'package:system_theme/system_theme.dart';
import 'package:gtk_theme_fl/gtk_theme_fl.dart';
@ -10,27 +13,25 @@ abstract class AppThemeFactory {
AppThemeFactory._();
static Future<ThemeData> create(
{required bool isDark, required Color fallbackColor}) {
return _createAppTheme(
{required final bool isDark, required final Color fallbackColor,}) => _createAppTheme(
isDark: isDark,
fallbackColor: fallbackColor,
);
}
static Future<ThemeData> _createAppTheme({
bool isDark = false,
required Color fallbackColor,
required final Color fallbackColor,
final bool isDark = false,
}) async {
ColorScheme? gtkColorsScheme;
var brightness = isDark ? Brightness.dark : Brightness.light;
final Brightness brightness = isDark ? Brightness.dark : Brightness.light;
final dynamicColorsScheme = await _getDynamicColors(brightness);
final ColorScheme? dynamicColorsScheme = await _getDynamicColors(brightness);
if (Platform.isLinux) {
GtkThemeData themeData = await GtkThemeData.initialize();
final isGtkDark =
final GtkThemeData themeData = await GtkThemeData.initialize();
final bool isGtkDark =
Color(themeData.theme_bg_color).computeLuminance() < 0.5;
final isInverseNeeded = isGtkDark != isDark;
final bool isInverseNeeded = isGtkDark != isDark;
gtkColorsScheme = ColorScheme.fromSeed(
seedColor: Color(themeData.theme_selected_bg_color),
brightness: brightness,
@ -39,7 +40,7 @@ abstract class AppThemeFactory {
);
}
final accentColor = SystemAccentColor(fallbackColor);
final SystemAccentColor accentColor = SystemAccentColor(fallbackColor);
try {
await accentColor.load();
@ -47,17 +48,17 @@ abstract class AppThemeFactory {
print('_createAppTheme: ${e.message}');
}
final fallbackColorScheme = ColorScheme.fromSeed(
final ColorScheme fallbackColorScheme = ColorScheme.fromSeed(
seedColor: accentColor.accent,
brightness: brightness,
);
final colorScheme =
final ColorScheme colorScheme =
dynamicColorsScheme ?? gtkColorsScheme ?? fallbackColorScheme;
final appTypography = Typography.material2021();
final Typography appTypography = Typography.material2021();
final materialThemeData = ThemeData(
final ThemeData materialThemeData = ThemeData(
colorScheme: colorScheme,
brightness: colorScheme.brightness,
typography: appTypography,
@ -73,10 +74,10 @@ abstract class AppThemeFactory {
return materialThemeData;
}
static Future<ColorScheme?> _getDynamicColors(Brightness brightness) {
static Future<ColorScheme?> _getDynamicColors(final Brightness brightness) {
try {
return DynamicColorPlugin.getCorePalette().then(
(corePallet) => corePallet?.toColorScheme(brightness: brightness));
(final CorePalette? corePallet) => corePallet?.toColorScheme(brightness: brightness),);
} on PlatformException {
return Future.value(null);
}

8
lib/ui/components/action_button/action_button.dart
View file

@ -3,19 +3,19 @@ import 'package:selfprivacy/config/brand_colors.dart';
class ActionButton extends StatelessWidget {
const ActionButton({
Key? key,
final super.key,
this.text,
this.onPressed,
this.isRed = false,
}) : super(key: key);
});
final VoidCallback? onPressed;
final String? text;
final bool isRed;
@override
Widget build(BuildContext context) {
var navigator = Navigator.of(context);
Widget build(final BuildContext context) {
final NavigatorState navigator = Navigator.of(context);
return TextButton(
child: Text(

10
lib/ui/components/brand_alert/brand_alert.dart
View file

@ -2,14 +2,12 @@ import 'package:flutter/material.dart';
class BrandAlert extends AlertDialog {
BrandAlert({
Key? key,
String? title,
String? contentText,
List<Widget>? actions,
final super.key,
final String? title,
final String? contentText,
final super.actions,
}) : super(
key: key,
title: title != null ? Text(title) : null,
content: title != null ? Text(contentText!) : null,
actions: actions,
);
}

10
lib/ui/components/brand_bottom_sheet/brand_bottom_sheet.dart
View file

@ -1,19 +1,21 @@
// ignore_for_file: always_specify_types
import 'package:flutter/material.dart';
import 'package:selfprivacy/config/brand_colors.dart';
class BrandBottomSheet extends StatelessWidget {
const BrandBottomSheet({
Key? key,
required this.child,
final super.key,
this.isExpended = false,
}) : super(key: key);
});
final Widget child;
final bool isExpended;
@override
Widget build(BuildContext context) {
var mainHeight = MediaQuery.of(context).size.height -
Widget build(final BuildContext context) {
final double mainHeight = MediaQuery.of(context).size.height -
MediaQuery.of(context).padding.top -
100;
late Widget innerWidget;

37
lib/ui/components/brand_button/brand_button.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: always_specify_types
import 'package:flutter/material.dart';
import 'package:selfprivacy/ui/components/brand_button/filled_button.dart';
import 'package:selfprivacy/ui/components/brand_text/brand_text.dart';
@ -5,11 +7,11 @@ import 'package:selfprivacy/ui/components/brand_text/brand_text.dart';
enum BrandButtonTypes { rised, text, iconText }
class BrandButton {
static rised({
Key? key,
required VoidCallback? onPressed,
String? text,
Widget? child,
static ConstrainedBox rised({
required final VoidCallback? onPressed,
final Key? key,
final String? text,
final Widget? child,
}) {
assert(text == null || child == null, 'required title or child');
assert(text != null || child != null, 'required title or child');
@ -27,10 +29,10 @@ class BrandButton {
);
}
static text({
Key? key,
required VoidCallback onPressed,
required String title,
static ConstrainedBox text({
required final VoidCallback onPressed,
required final String title,
final Key? key,
}) =>
ConstrainedBox(
constraints: const BoxConstraints(
@ -40,11 +42,11 @@ class BrandButton {
child: TextButton(onPressed: onPressed, child: Text(title)),
);
static emptyWithIconText({
Key? key,
required VoidCallback onPressed,
required String title,
required Icon icon,
static _IconTextButton emptyWithIconText({
required final VoidCallback onPressed,
required final String title,
required final Icon icon,
final Key? key,
}) =>
_IconTextButton(
key: key,
@ -55,16 +57,14 @@ class BrandButton {
}
class _IconTextButton extends StatelessWidget {
const _IconTextButton({Key? key, this.onPressed, this.title, this.icon})
: super(key: key);
const _IconTextButton({final super.key, this.onPressed, this.title, this.icon});
final VoidCallback? onPressed;
final String? title;
final Icon? icon;
@override
Widget build(BuildContext context) {
return Material(
Widget build(final BuildContext context) => Material(
color: Colors.transparent,
child: InkWell(
onTap: onPressed,
@ -86,4 +86,3 @@ class _IconTextButton extends StatelessWidget {
),
);
}
}

6
lib/ui/components/brand_button/filled_button.dart
View file

@ -2,12 +2,12 @@ import 'package:flutter/material.dart';
class FilledButton extends StatelessWidget {
const FilledButton({
Key? key,
final super.key,
this.onPressed,
this.title,
this.child,
this.disabled = false,
}) : super(key: key);
});
final VoidCallback? onPressed;
final String? title;
@ -15,7 +15,7 @@ class FilledButton extends StatelessWidget {
final bool disabled;
@override
Widget build(BuildContext context) {
Widget build(final BuildContext context) {
final ButtonStyle enabledStyle = ElevatedButton.styleFrom(
onPrimary: Theme.of(context).colorScheme.onPrimary,
primary: Theme.of(context).colorScheme.primary,

40
lib/ui/components/brand_cards/brand_cards.dart
View file

@ -1,7 +1,9 @@
// ignore_for_file: always_specify_types
import 'package:flutter/material.dart';
class BrandCards {
static Widget big({required Widget child}) => _BrandCard(
static Widget big({required final Widget child}) => _BrandCard(
padding: const EdgeInsets.symmetric(
horizontal: 20,
vertical: 15,
@ -10,7 +12,7 @@ class BrandCards {
borderRadius: BorderRadius.circular(20),
child: child,
);
static Widget small({required Widget child}) => _BrandCard(
static Widget small({required final Widget child}) => _BrandCard(
padding: const EdgeInsets.symmetric(
horizontal: 15,
vertical: 10,
@ -19,10 +21,11 @@ class BrandCards {
borderRadius: BorderRadius.circular(10),
child: child,
);
static Widget outlined({required Widget child}) => _OutlinedCard(
static Widget outlined({required final Widget child}) => _OutlinedCard(
child: child,
);
static Widget filled({required Widget child, bool tertiary = false}) =>
static Widget filled(
{required final Widget child, final bool tertiary = false,}) =>
_FilledCard(
tertiary: tertiary,
child: child,
@ -31,12 +34,12 @@ class BrandCards {
class _BrandCard extends StatelessWidget {
const _BrandCard({
Key? key,
required this.child,
required this.padding,
required this.shadow,
required this.borderRadius,
}) : super(key: key);
final super.key,
});
final Widget child;
final EdgeInsets padding;
@ -44,8 +47,7 @@ class _BrandCard extends StatelessWidget {
final BorderRadius borderRadius;
@override
Widget build(BuildContext context) {
return Container(
Widget build(final BuildContext context) => Container(
decoration: BoxDecoration(
color: Theme.of(context).colorScheme.surface,
borderRadius: borderRadius,
@ -55,18 +57,16 @@ class _BrandCard extends StatelessWidget {
child: child,
);
}
}
class _OutlinedCard extends StatelessWidget {
const _OutlinedCard({
Key? key,
final super.key,
required this.child,
}) : super(key: key);
});
final Widget child;
@override
Widget build(BuildContext context) {
return Card(
Widget build(final BuildContext context) => Card(
elevation: 0.0,
shape: RoundedRectangleBorder(
borderRadius: const BorderRadius.all(Radius.circular(12)),
@ -78,17 +78,18 @@ class _OutlinedCard extends StatelessWidget {
child: child,
);
}
}
class _FilledCard extends StatelessWidget {
const _FilledCard({Key? key, required this.child, required this.tertiary})
: super(key: key);
const _FilledCard({
required this.child,
required this.tertiary,
final super.key,
});
final Widget child;
final bool tertiary;
@override
Widget build(BuildContext context) {
return Card(
Widget build(final BuildContext context) => Card(
elevation: 0.0,
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(12)),
@ -100,9 +101,8 @@ class _FilledCard extends StatelessWidget {
child: child,
);
}
}
final bigShadow = [
final List<BoxShadow> bigShadow = [
BoxShadow(
offset: const Offset(0, 4),
blurRadius: 8,

6
lib/ui/components/brand_divider/brand_divider.dart
View file

@ -2,14 +2,12 @@ import 'package:flutter/material.dart';
import 'package:selfprivacy/config/brand_colors.dart';
class BrandDivider extends StatelessWidget {
const BrandDivider({Key? key}) : super(key: key);
const BrandDivider({super.key});
@override
Widget build(BuildContext context) {
return Container(
Widget build(final BuildContext context) => Container(
width: double.infinity,
height: 1,
color: BrandColors.dividerColor,
);
}
}

10
lib/ui/components/brand_header/brand_header.dart
View file

@ -1,22 +1,23 @@
// ignore_for_file: always_specify_types
import 'package:flutter/material.dart';
import 'package:selfprivacy/ui/components/brand_icons/brand_icons.dart';
import 'package:selfprivacy/ui/components/brand_text/brand_text.dart';
class BrandHeader extends StatelessWidget {
const BrandHeader({
Key? key,
final super.key,
this.title = '',
this.hasBackButton = false,
this.onBackButtonPressed,
}) : super(key: key);
});
final String title;
final bool hasBackButton;
final VoidCallback? onBackButtonPressed;
@override
Widget build(BuildContext context) {
return Container(
Widget build(final BuildContext context) => Container(
height: 52,
alignment: Alignment.centerLeft,
padding: EdgeInsets.only(
@ -38,4 +39,3 @@ class BrandHeader extends StatelessWidget {
),
);
}
}

12
lib/ui/components/brand_hero_screen/brand_hero_screen.dart
View file

@ -4,16 +4,16 @@ import 'package:selfprivacy/ui/components/pre_styled_buttons/flash_fab.dart';
class BrandHeroScreen extends StatelessWidget {
const BrandHeroScreen({
Key? key,
required this.children,
final super.key,
this.headerTitle = '',
this.hasBackButton = true,
this.hasFlashButton = true,
required this.children,
this.heroIcon,
this.heroTitle,
this.heroSubtitle,
this.onBackButtonPressed,
}) : super(key: key);
});
final List<Widget> children;
final String headerTitle;
@ -25,8 +25,7 @@ class BrandHeroScreen extends StatelessWidget {
final VoidCallback? onBackButtonPressed;
@override
Widget build(BuildContext context) {
return SafeArea(
Widget build(BuildContext context) => SafeArea(
child: Scaffold(
appBar: PreferredSize(
preferredSize: const Size.fromHeight(52.0),
@ -63,7 +62,7 @@ class BrandHeroScreen extends StatelessWidget {
style: Theme.of(context).textTheme.bodyMedium!.copyWith(
color: Theme.of(context).colorScheme.onBackground,
),
textAlign: TextAlign.start),
textAlign: TextAlign.start,),
const SizedBox(height: 16.0),
...children,
],
@ -71,4 +70,3 @@ class BrandHeroScreen extends StatelessWidget {
),
);
}
}

2
lib/ui/components/brand_icons/brand_icons.dart
View file

@ -18,7 +18,7 @@ import 'package:flutter/widgets.dart';
class BrandIcons {
BrandIcons._();
static const _kFontFam = 'BrandIcons';
static const String _kFontFam = 'BrandIcons';
static const String? _kFontPkg = null;
static const IconData connection =

6
lib/ui/components/brand_loader/brand_loader.dart
View file

@ -2,13 +2,12 @@ import 'package:flutter/material.dart';
import 'package:easy_localization/easy_localization.dart';
class BrandLoader {
static horizontal() => _HorizontalLoader();
static _HorizontalLoader horizontal() => _HorizontalLoader();
}
class _HorizontalLoader extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Column(
Widget build(final BuildContext context) => Column(
mainAxisSize: MainAxisSize.min,
children: [
Text('basis.wait'.tr()),
@ -17,4 +16,3 @@ class _HorizontalLoader extends StatelessWidget {
],
);
}
}

16
lib/ui/components/brand_md/brand_md.dart
View file

@ -8,9 +8,9 @@ import 'package:url_launcher/url_launcher_string.dart';
class BrandMarkdown extends StatefulWidget {
const BrandMarkdown({
Key? key,
required this.fileName,
}) : super(key: key);
final super.key,
});
final String fileName;
@ -28,7 +28,7 @@ class _BrandMarkdownState extends State<BrandMarkdown> {
}
void _loadMdFile() async {
String mdFromFile = await rootBundle
final String mdFromFile = await rootBundle
.loadString('assets/markdown/${widget.fileName}-${'locale'.tr()}.md');
setState(() {
_mdContent = mdFromFile;
@ -36,9 +36,9 @@ class _BrandMarkdownState extends State<BrandMarkdown> {
}
@override
Widget build(BuildContext context) {
var isDark = Theme.of(context).brightness == Brightness.dark;
var markdown = MarkdownStyleSheet(
Widget build(final BuildContext context) {
final bool isDark = Theme.of(context).brightness == Brightness.dark;
final MarkdownStyleSheet markdown = MarkdownStyleSheet(
p: defaultTextStyle.copyWith(
color: isDark ? BrandColors.white : null,
),
@ -58,9 +58,9 @@ class _BrandMarkdownState extends State<BrandMarkdown> {
return Markdown(
shrinkWrap: true,
styleSheet: markdown,
onTapLink: (String text, String? href, String title) {
onTapLink: (final String text, final String? href, final String title) {
if (href != null) {
canLaunchUrlString(href).then((canLaunchURL) {
canLaunchUrlString(href).then((final bool canLaunchURL) {
if (canLaunchURL) {
launchUrlString(href);
}

12
lib/ui/components/brand_radio/brand_radio.dart
View file

@ -3,15 +3,14 @@ import 'package:selfprivacy/config/brand_colors.dart';
class BrandRadio extends StatelessWidget {
const BrandRadio({
Key? key,
super.key,
required this.isChecked,
}) : super(key: key);
});
final bool isChecked;
@override
Widget build(BuildContext context) {
return Container(
Widget build(final BuildContext context) => Container(
height: 20,
width: 20,
alignment: Alignment.center,
@ -31,12 +30,9 @@ class BrandRadio extends StatelessWidget {
)
: null,
);
}
BoxBorder? _getBorder() {
return Border.all(
BoxBorder? _getBorder() => Border.all(
color: isChecked ? BrandColors.primary : BrandColors.gray1,
width: 2,
);
}
}

8
lib/ui/components/brand_radio_tile/brand_radio_tile.dart
View file

@ -4,11 +4,11 @@ import 'package:selfprivacy/ui/components/brand_text/brand_text.dart';
class BrandRadioTile extends StatelessWidget {
const BrandRadioTile({
Key? key,
super.key,
required this.isChecked,
required this.text,
required this.onPress,
}) : super(key: key);
});
final bool isChecked;
@ -16,8 +16,7 @@ class BrandRadioTile extends StatelessWidget {
final VoidCallback onPress;
@override
Widget build(BuildContext context) {
return GestureDetector(
Widget build(BuildContext context) => GestureDetector(
onTap: onPress,
behavior: HitTestBehavior.translucent,
child: Padding(
@ -34,4 +33,3 @@ class BrandRadioTile extends StatelessWidget {
),
);
}
}

16
lib/ui/components/brand_span_button/brand_span_button.dart
View file

@ -5,19 +5,19 @@ import 'package:url_launcher/url_launcher.dart';
class BrandSpanButton extends TextSpan {
BrandSpanButton({
required String text,
required VoidCallback onTap,
TextStyle? style,
required final String text,
required final VoidCallback onTap,
final TextStyle? style,
}) : super(
recognizer: TapGestureRecognizer()..onTap = onTap,
text: text,
style: (style ?? const TextStyle()).copyWith(color: BrandColors.blue),
);
static link({
required String text,
String? urlString,
TextStyle? style,
static BrandSpanButton link({
required final String text,
final String? urlString,
final TextStyle? style,
}) =>
BrandSpanButton(
text: text,
@ -25,7 +25,7 @@ class BrandSpanButton extends TextSpan {
onTap: () => _launchURL(urlString ?? text),
);
static _launchURL(String link) async {
static _launchURL(final String link) async {
if (await canLaunchUrl(Uri.parse(link))) {
await launchUrl(Uri.parse(link));
} else {

8
lib/ui/components/brand_switch/brand_switch.dart
View file

@ -2,20 +2,18 @@ import 'package:flutter/material.dart';
class BrandSwitch extends StatelessWidget {
const BrandSwitch({
Key? key,
required this.onChanged,
required this.value,
}) : super(key: key);
final super.key,
});
final ValueChanged<bool> onChanged;
final bool value;
@override
Widget build(BuildContext context) {
return Switch(
Widget build(BuildContext context) => Switch(
activeColor: Theme.of(context).colorScheme.primary,
value: value,
onChanged: onChanged,
);
}
}

12
lib/ui/components/brand_tab_bar/brand_tab_bar.dart
View file

@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
import 'package:selfprivacy/ui/components/brand_icons/brand_icons.dart';
class BrandTabBar extends StatefulWidget {
const BrandTabBar({Key? key, this.controller}) : super(key: key);
const BrandTabBar({final super.key, this.controller});
final TabController? controller;
@override
@ -34,26 +34,22 @@ class _BrandTabBarState extends State<BrandTabBar> {
}
@override
Widget build(BuildContext context) {
return NavigationBar(
Widget build(final BuildContext context) => NavigationBar(
destinations: [
_getIconButton('basis.providers'.tr(), BrandIcons.server, 0),
_getIconButton('basis.services'.tr(), BrandIcons.box, 1),
_getIconButton('basis.users'.tr(), BrandIcons.users, 2),
_getIconButton('basis.more'.tr(), Icons.menu_rounded, 3),
],
onDestinationSelected: (index) {
onDestinationSelected: (final index) {
widget.controller!.animateTo(index);
},
selectedIndex: currentIndex ?? 0,
labelBehavior: NavigationDestinationLabelBehavior.onlyShowSelected,
);
}
_getIconButton(String label, IconData iconData, int index) {
return NavigationDestination(
NavigationDestination _getIconButton(final String label, final IconData iconData, final int index) => NavigationDestination(
icon: Icon(iconData),
label: label,
);
}
}

180
lib/ui/components/brand_text/brand_text.dart
View file

@ -18,66 +18,10 @@ enum TextType {
}
class BrandText extends StatelessWidget {
const BrandText(
this.text, {
Key? key,
this.style,
required this.type,
this.overflow,
this.softWrap,
this.textAlign,
this.maxLines,
}) : super(key: key);
final String? text;
final TextStyle? style;
final TextType type;
final TextOverflow? overflow;
final bool? softWrap;
final TextAlign? textAlign;
final int? maxLines;
factory BrandText.h1(
String? text, {
TextStyle? style,
TextOverflow? overflow,
bool? softWrap,
}) =>
BrandText(
text,
type: TextType.h1,
style: style,
);
factory BrandText.onboardingTitle(String text, {TextStyle? style}) =>
BrandText(
text,
type: TextType.onboardingTitle,
style: style,
);
factory BrandText.h2(
String? text, {
TextStyle? style,
TextAlign? textAlign,
}) =>
BrandText(
text,
type: TextType.h2,
style: style,
textAlign: textAlign,
);
factory BrandText.h3(String text, {TextStyle? style, TextAlign? textAlign}) =>
BrandText(
text,
type: TextType.h3,
style: style,
textAlign: textAlign,
overflow: TextOverflow.ellipsis,
);
factory BrandText.h4(
String? text, {
TextStyle? style,
TextAlign? textAlign,
final String? text, {
final TextStyle? style,
final TextAlign? textAlign,
}) =>
BrandText(
text,
@ -89,10 +33,25 @@ class BrandText extends StatelessWidget {
textAlign: textAlign,
);
factory BrandText.onboardingTitle(final String text, {final TextStyle? style}) =>
BrandText(
text,
type: TextType.onboardingTitle,
style: style,
);
factory BrandText.h3(final String text, {final TextStyle? style, final TextAlign? textAlign}) =>
BrandText(
text,
type: TextType.h3,
style: style,
textAlign: textAlign,
overflow: TextOverflow.ellipsis,
);
factory BrandText.h4Underlined(
String? text, {
TextStyle? style,
TextAlign? textAlign,
final String? text, {
final TextStyle? style,
final TextAlign? textAlign,
}) =>
BrandText(
text,
@ -104,10 +63,54 @@ class BrandText extends StatelessWidget {
textAlign: textAlign,
);
factory BrandText.h1(
final String? text, {
final TextStyle? style,
final TextOverflow? overflow,
final bool? softWrap,
}) =>
BrandText(
text,
type: TextType.h1,
style: style,
);
factory BrandText.h2(
final String? text, {
final TextStyle? style,
final TextAlign? textAlign,
}) =>
BrandText(
text,
type: TextType.h2,
style: style,
textAlign: textAlign,
);
factory BrandText.body1(final String? text, {final TextStyle? style}) => BrandText(
text,
type: TextType.body1,
style: style,
);
factory BrandText.small(final String text, {final TextStyle? style}) => BrandText(
text,
type: TextType.small,
style: style,
);
factory BrandText.body2(final String? text, {final TextStyle? style}) => BrandText(
text,
type: TextType.body2,
style: style,
);
factory BrandText.buttonTitleText(final String? text, {final TextStyle? style}) =>
BrandText(
text,
type: TextType.buttonTitleText,
style: style,
);
factory BrandText.h5(
String? text, {
TextStyle? style,
TextAlign? textAlign,
final String? text, {
final TextStyle? style,
final TextAlign? textAlign,
}) =>
BrandText(
text,
@ -115,39 +118,36 @@ class BrandText extends StatelessWidget {
style: style,
textAlign: textAlign,
);
factory BrandText.body1(String? text, {TextStyle? style}) => BrandText(
text,
type: TextType.body1,
style: style,
);
factory BrandText.body2(String? text, {TextStyle? style}) => BrandText(
text,
type: TextType.body2,
style: style,
);
factory BrandText.medium(String? text,
{TextStyle? style, TextAlign? textAlign}) =>
factory BrandText.medium(final String? text,
{final TextStyle? style, final TextAlign? textAlign}) =>
BrandText(
text,
type: TextType.medium,
style: style,
textAlign: textAlign,
);
factory BrandText.small(String text, {TextStyle? style}) => BrandText(
text,
type: TextType.small,
style: style,
);
factory BrandText.buttonTitleText(String? text, {TextStyle? style}) =>
BrandText(
text,
type: TextType.buttonTitleText,
style: style,
);
const BrandText(
this.text, {
super.key,
this.style,
required this.type,
this.overflow,
this.softWrap,
this.textAlign,
this.maxLines,
});
final String? text;
final TextStyle? style;
final TextType type;
final TextOverflow? overflow;
final bool? softWrap;
final TextAlign? textAlign;
final int? maxLines;
@override
Text build(BuildContext context) {
Text build(final BuildContext context) {
TextStyle style;
var isDark = Theme.of(context).brightness == Brightness.dark;
final bool isDark = Theme.of(context).brightness == Brightness.dark;
switch (type) {
case TextType.h1:
style = isDark

22
lib/ui/components/brand_timer/brand_timer.dart
View file

@ -7,10 +7,10 @@ import 'package:selfprivacy/utils/named_font_weight.dart';
class BrandTimer extends StatefulWidget {
const BrandTimer({
Key? key,
super.key,
required this.startDateTime,
required this.duration,
}) : super(key: key);
});
final DateTime startDateTime;
final Duration duration;
@ -31,8 +31,8 @@ class _BrandTimerState extends State<BrandTimer> {
_timerStart() {
_timeString = differenceFromStart;
timer = Timer.periodic(const Duration(seconds: 1), (Timer t) {
var timePassed = DateTime.now().difference(widget.startDateTime);
timer = Timer.periodic(const Duration(seconds: 1), (final Timer t) {
final Duration timePassed = DateTime.now().difference(widget.startDateTime);
if (timePassed > widget.duration) {
t.cancel();
} else {
@ -42,7 +42,7 @@ class _BrandTimerState extends State<BrandTimer> {
}
@override
void didUpdateWidget(BrandTimer oldWidget) {
void didUpdateWidget(final BrandTimer oldWidget) {
if (timer.isActive) {
timer.cancel();
}
@ -51,14 +51,12 @@ class _BrandTimerState extends State<BrandTimer> {
}
@override
Widget build(BuildContext context) {
return BrandText.medium(
Widget build(final BuildContext context) => BrandText.medium(
_timeString,
style: const TextStyle(
fontWeight: NamedFontWeight.demiBold,
),
);
}
void _getTime() {
setState(() {
@ -69,10 +67,10 @@ class _BrandTimerState extends State<BrandTimer> {
String get differenceFromStart =>
_durationToString(DateTime.now().difference(widget.startDateTime));
String _durationToString(Duration duration) {
var timeLeft = widget.duration - duration;
String twoDigits(int n) => n.toString().padLeft(2, '0');
String twoDigitSeconds = twoDigits(timeLeft.inSeconds);
String _durationToString(final Duration duration) {
final Duration timeLeft = widget.duration - duration;
String twoDigits(final int n) => n.toString().padLeft(2, '0');
final String twoDigitSeconds = twoDigits(timeLeft.inSeconds);
return 'timer.sec'.tr(args: [twoDigitSeconds]);
}

10
lib/ui/components/dots_indicator/dots_indicator.dart
View file

@ -3,19 +3,19 @@ import 'package:selfprivacy/config/brand_colors.dart';
class DotsIndicator extends StatelessWidget {
const DotsIndicator({
Key? key,
required this.activeIndex,
required this.count,
}) : super(key: key);
final super.key,
});
final int activeIndex;
final int count;
@override
Widget build(BuildContext context) {
var dots = List.generate(
Widget build(final BuildContext context) {
final List<Container> dots = List.generate(
count,
(index) => Container(
(final index) => Container(
margin: const EdgeInsets.symmetric(horizontal: 5, vertical: 10),
height: 10,
width: 10,

6
lib/ui/components/error/error.dart
View file

@ -1,14 +1,13 @@
import 'package:flutter/material.dart';
class BrandError extends StatelessWidget {
const BrandError({Key? key, this.error, this.stackTrace}) : super(key: key);
const BrandError({final super.key, this.error, this.stackTrace});
final Object? error;
final StackTrace? stackTrace;
@override
Widget build(BuildContext context) {
return SafeArea(
Widget build(final BuildContext context) => SafeArea(
child: Scaffold(
body: Center(
child: SingleChildScrollView(
@ -25,4 +24,3 @@ class BrandError extends StatelessWidget {
),
);
}
}

8
lib/ui/components/icon_status_mask/icon_status_mask.dart
View file

@ -4,16 +4,16 @@ import 'package:selfprivacy/logic/models/state_types.dart';
class IconStatusMask extends StatelessWidget {
const IconStatusMask({
Key? key,
super.key,
required this.child,
required this.status,
}) : super(key: key);
});
final Icon child;
final StateType status;
@override
Widget build(BuildContext context) {
Widget build(final BuildContext context) {
late List<Color> colors;
switch (status) {
case StateType.uninitialized:
@ -30,7 +30,7 @@ class IconStatusMask extends StatelessWidget {
break;
}
return ShaderMask(
shaderCallback: (bounds) => LinearGradient(
shaderCallback: (final bounds) => LinearGradient(
begin: const Alignment(-1, -0.8),
end: const Alignment(0.9, 0.9),
colors: colors,

Some files were not shown because too many files have changed in this diff Show more