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

chore: Merge master into digital-ocean

Browse source
This commit is contained in:
NaiJi 2022-11-02 18:45:36 +04:00
parent 57d82d0f7a 667c59e93e
commit 8c053f50b0
30 changed files with 638 additions and 784 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
assets/translations/en.json
View file

@ -422,7 +422,8 @@
"create_ssh_key": "Create SSH key for {}",
"delete_ssh_key": "Delete SSH key for {}",
"server_jobs": "Jobs on the server",
"reset_user_password": "Reset password of user"
"reset_user_password": "Reset password of user",
"generic_error": "Couldn't connect to the server!"
},
"validations": {
"required": "Required",

3
assets/translations/ru.json
View file

@ -422,7 +422,8 @@
"create_ssh_key": "Создать SSH ключ для {}",
"delete_ssh_key": "Удалить SSH ключ для {}",
"server_jobs": "Задачи на сервере",
"reset_user_password": "Сбросить пароль пользователя"
"reset_user_password": "Сбросить пароль пользователя",
"generic_error": "Не удалось подключиться к серверу!"
},
"validations": {
"required": "Обязательное поле",

8
lib/logic/api_maps/graphql_maps/schema/schema.graphql
View file

@ -349,3 +349,11 @@ type Users {
allUsers: [User!]!
getUser(username: String!): User
}
fragment dnsRecordFields on DnsRecord {
content
name
priority
recordType
ttl
}

216
lib/logic/api_maps/graphql_maps/schema/schema.graphql.dart
View file

@ -1,3 +1,5 @@
import 'package:gql/ast.dart';
import 'package:graphql/client.dart' as graphql;
import 'package:json_annotation/json_annotation.dart';
import 'package:selfprivacy/utils/scalars.dart';
part 'schema.graphql.g.dart';
@ -736,6 +738,220 @@ enum Enum$UserType {
$unknown
}
@JsonSerializable(explicitToJson: true)
class Fragment$dnsRecordFields {
Fragment$dnsRecordFields(
{required this.content,
required this.name,
this.priority,
required this.recordType,
required this.ttl,
required this.$__typename});
@override
factory Fragment$dnsRecordFields.fromJson(Map<String, dynamic> json) =>
_$Fragment$dnsRecordFieldsFromJson(json);
final String content;
final String name;
final int? priority;
final String recordType;
final int ttl;
@JsonKey(name: '__typename')
final String $__typename;
Map<String, dynamic> toJson() => _$Fragment$dnsRecordFieldsToJson(this);
int get hashCode {
final l$content = content;
final l$name = name;
final l$priority = priority;
final l$recordType = recordType;
final l$ttl = ttl;
final l$$__typename = $__typename;
return Object.hashAll(
[l$content, l$name, l$priority, l$recordType, l$ttl, l$$__typename]);
}
@override
bool operator ==(Object other) {
if (identical(this, other)) return true;
if (!(other is Fragment$dnsRecordFields) ||
runtimeType != other.runtimeType) return false;
final l$content = content;
final lOther$content = other.content;
if (l$content != lOther$content) return false;
final l$name = name;
final lOther$name = other.name;
if (l$name != lOther$name) return false;
final l$priority = priority;
final lOther$priority = other.priority;
if (l$priority != lOther$priority) return false;
final l$recordType = recordType;
final lOther$recordType = other.recordType;
if (l$recordType != lOther$recordType) return false;
final l$ttl = ttl;
final lOther$ttl = other.ttl;
if (l$ttl != lOther$ttl) return false;
final l$$__typename = $__typename;
final lOther$$__typename = other.$__typename;
if (l$$__typename != lOther$$__typename) return false;
return true;
}
}
extension UtilityExtension$Fragment$dnsRecordFields
on Fragment$dnsRecordFields {
CopyWith$Fragment$dnsRecordFields<Fragment$dnsRecordFields> get copyWith =>
CopyWith$Fragment$dnsRecordFields(this, (i) => i);
}
abstract class CopyWith$Fragment$dnsRecordFields<TRes> {
factory CopyWith$Fragment$dnsRecordFields(Fragment$dnsRecordFields instance,
TRes Function(Fragment$dnsRecordFields) then) =
_CopyWithImpl$Fragment$dnsRecordFields;
factory CopyWith$Fragment$dnsRecordFields.stub(TRes res) =
_CopyWithStubImpl$Fragment$dnsRecordFields;
TRes call(
{String? content,
String? name,
int? priority,
String? recordType,
int? ttl,
String? $__typename});
}
class _CopyWithImpl$Fragment$dnsRecordFields<TRes>
implements CopyWith$Fragment$dnsRecordFields<TRes> {
_CopyWithImpl$Fragment$dnsRecordFields(this._instance, this._then);
final Fragment$dnsRecordFields _instance;
final TRes Function(Fragment$dnsRecordFields) _then;
static const _undefined = {};
TRes call(
{Object? content = _undefined,
Object? name = _undefined,
Object? priority = _undefined,
Object? recordType = _undefined,
Object? ttl = _undefined,
Object? $__typename = _undefined}) =>
_then(Fragment$dnsRecordFields(
content: content == _undefined || content == null
? _instance.content
: (content as String),
name: name == _undefined || name == null
? _instance.name
: (name as String),
priority:
priority == _undefined ? _instance.priority : (priority as int?),
recordType: recordType == _undefined || recordType == null
? _instance.recordType
: (recordType as String),
ttl: ttl == _undefined || ttl == null ? _instance.ttl : (ttl as int),
$__typename: $__typename == _undefined || $__typename == null
? _instance.$__typename
: ($__typename as String)));
}
class _CopyWithStubImpl$Fragment$dnsRecordFields<TRes>
implements CopyWith$Fragment$dnsRecordFields<TRes> {
_CopyWithStubImpl$Fragment$dnsRecordFields(this._res);
TRes _res;
call(
{String? content,
String? name,
int? priority,
String? recordType,
int? ttl,
String? $__typename}) =>
_res;
}
const fragmentDefinitiondnsRecordFields = FragmentDefinitionNode(
name: NameNode(value: 'dnsRecordFields'),
typeCondition: TypeConditionNode(
on: NamedTypeNode(
name: NameNode(value: 'DnsRecord'), isNonNull: false)),
directives: [],
selectionSet: SelectionSetNode(selections: [
FieldNode(
name: NameNode(value: 'content'),
alias: null,
arguments: [],
directives: [],
selectionSet: null),
FieldNode(
name: NameNode(value: 'name'),
alias: null,
arguments: [],
directives: [],
selectionSet: null),
FieldNode(
name: NameNode(value: 'priority'),
alias: null,
arguments: [],
directives: [],
selectionSet: null),
FieldNode(
name: NameNode(value: 'recordType'),
alias: null,
arguments: [],
directives: [],
selectionSet: null),
FieldNode(
name: NameNode(value: 'ttl'),
alias: null,
arguments: [],
directives: [],
selectionSet: null),
FieldNode(
name: NameNode(value: '__typename'),
alias: null,
arguments: [],
directives: [],
selectionSet: null)
]));
const documentNodeFragmentdnsRecordFields = DocumentNode(definitions: [
fragmentDefinitiondnsRecordFields,
]);
extension ClientExtension$Fragment$dnsRecordFields on graphql.GraphQLClient {
void writeFragment$dnsRecordFields(
{required Fragment$dnsRecordFields data,
required Map<String, dynamic> idFields,
bool broadcast = true}) =>
this.writeFragment(
graphql.FragmentRequest(
idFields: idFields,
fragment: const graphql.Fragment(
fragmentName: 'dnsRecordFields',
document: documentNodeFragmentdnsRecordFields)),
data: data.toJson(),
broadcast: broadcast);
Fragment$dnsRecordFields? readFragment$dnsRecordFields(
{required Map<String, dynamic> idFields, bool optimistic = true}) {
final result = this.readFragment(
graphql.FragmentRequest(
idFields: idFields,
fragment: const graphql.Fragment(
fragmentName: 'dnsRecordFields',
document: documentNodeFragmentdnsRecordFields)),
optimistic: optimistic);
return result == null ? null : Fragment$dnsRecordFields.fromJson(result);
}
}
const possibleTypesMap = {
'MutationReturnInterface': {
'ApiKeyMutationReturn',

22
lib/logic/api_maps/graphql_maps/schema/schema.graphql.g.dart
View file

@ -123,3 +123,25 @@ Map<String, dynamic> _$Input$UserMutationInputToJson(
'username': instance.username,
'password': instance.password,
};
Fragment$dnsRecordFields _$Fragment$dnsRecordFieldsFromJson(
Map<String, dynamic> json) =>
Fragment$dnsRecordFields(
content: json['content'] as String,
name: json['name'] as String,
priority: json['priority'] as int?,
recordType: json['recordType'] as String,
ttl: json['ttl'] as int,
$__typename: json['__typename'] as String,
);
Map<String, dynamic> _$Fragment$dnsRecordFieldsToJson(
Fragment$dnsRecordFields instance) =>
<String, dynamic>{
'content': instance.content,
'name': instance.name,
'priority': instance.priority,
'recordType': instance.recordType,
'ttl': instance.ttl,
'__typename': instance.$__typename,
};

6
lib/logic/api_maps/graphql_maps/schema/server_settings.graphql
View file

@ -35,11 +35,7 @@ query DomainInfo {
hostname
provider
requiredDnsRecords {
content
name
priority
recordType
ttl
...dnsRecordFields
}
}
}

218
lib/logic/api_maps/graphql_maps/schema/server_settings.graphql.dart
View file

@ -1444,36 +1444,9 @@ const documentNodeQueryDomainInfo = DocumentNode(definitions: [
arguments: [],
directives: [],
selectionSet: SelectionSetNode(selections: [
FieldNode(
name: NameNode(value: 'content'),
alias: null,
arguments: [],
directives: [],
selectionSet: null),
FieldNode(
name: NameNode(value: 'name'),
alias: null,
arguments: [],
directives: [],
selectionSet: null),
FieldNode(
name: NameNode(value: 'priority'),
alias: null,
arguments: [],
directives: [],
selectionSet: null),
FieldNode(
name: NameNode(value: 'recordType'),
alias: null,
arguments: [],
directives: [],
selectionSet: null),
FieldNode(
name: NameNode(value: 'ttl'),
alias: null,
arguments: [],
directives: [],
selectionSet: null),
FragmentSpreadNode(
name: NameNode(value: 'dnsRecordFields'),
directives: []),
FieldNode(
name: NameNode(value: '__typename'),
alias: null,
@ -1502,6 +1475,7 @@ const documentNodeQueryDomainInfo = DocumentNode(definitions: [
directives: [],
selectionSet: null)
])),
fragmentDefinitiondnsRecordFields,
]);
Query$DomainInfo _parserFn$Query$DomainInfo(Map<String, dynamic> data) =>
Query$DomainInfo.fromJson(data);
@ -1699,8 +1673,7 @@ class Query$DomainInfo$system$domainInfo {
@JsonKey(unknownEnumValue: Enum$DnsProvider.$unknown)
final Enum$DnsProvider provider;
final List<Query$DomainInfo$system$domainInfo$requiredDnsRecords>
requiredDnsRecords;
final List<Fragment$dnsRecordFields> requiredDnsRecords;
@JsonKey(name: '__typename')
final String $__typename;
@ -1775,14 +1748,12 @@ abstract class CopyWith$Query$DomainInfo$system$domainInfo<TRes> {
{String? domain,
String? hostname,
Enum$DnsProvider? provider,
List<Query$DomainInfo$system$domainInfo$requiredDnsRecords>?
requiredDnsRecords,
List<Fragment$dnsRecordFields>? requiredDnsRecords,
String? $__typename});
TRes requiredDnsRecords(
Iterable<Query$DomainInfo$system$domainInfo$requiredDnsRecords> Function(
Iterable<Fragment$dnsRecordFields> Function(
Iterable<
CopyWith$Query$DomainInfo$system$domainInfo$requiredDnsRecords<
Query$DomainInfo$system$domainInfo$requiredDnsRecords>>)
CopyWith$Fragment$dnsRecordFields<Fragment$dnsRecordFields>>)
_fn);
}
@ -1815,21 +1786,20 @@ class _CopyWithImpl$Query$DomainInfo$system$domainInfo<TRes>
requiredDnsRecords:
requiredDnsRecords == _undefined || requiredDnsRecords == null
? _instance.requiredDnsRecords
: (requiredDnsRecords as List<
Query$DomainInfo$system$domainInfo$requiredDnsRecords>),
: (requiredDnsRecords as List<Fragment$dnsRecordFields>),
$__typename: $__typename == _undefined || $__typename == null
? _instance.$__typename
: ($__typename as String)));
TRes requiredDnsRecords(
Iterable<Query$DomainInfo$system$domainInfo$requiredDnsRecords> Function(
Iterable<Fragment$dnsRecordFields> Function(
Iterable<
CopyWith$Query$DomainInfo$system$domainInfo$requiredDnsRecords<
Query$DomainInfo$system$domainInfo$requiredDnsRecords>>)
CopyWith$Fragment$dnsRecordFields<
Fragment$dnsRecordFields>>)
_fn) =>
call(
requiredDnsRecords: _fn(_instance.requiredDnsRecords.map((e) =>
CopyWith$Query$DomainInfo$system$domainInfo$requiredDnsRecords(
e, (i) => i))).toList());
requiredDnsRecords: _fn(_instance.requiredDnsRecords
.map((e) => CopyWith$Fragment$dnsRecordFields(e, (i) => i)))
.toList());
}
class _CopyWithStubImpl$Query$DomainInfo$system$domainInfo<TRes>
@ -1842,168 +1812,12 @@ class _CopyWithStubImpl$Query$DomainInfo$system$domainInfo<TRes>
{String? domain,
String? hostname,
Enum$DnsProvider? provider,
List<Query$DomainInfo$system$domainInfo$requiredDnsRecords>?
requiredDnsRecords,
List<Fragment$dnsRecordFields>? requiredDnsRecords,
String? $__typename}) =>
_res;
requiredDnsRecords(_fn) => _res;
}
@JsonSerializable(explicitToJson: true)
class Query$DomainInfo$system$domainInfo$requiredDnsRecords {
Query$DomainInfo$system$domainInfo$requiredDnsRecords(
{required this.content,
required this.name,
this.priority,
required this.recordType,
required this.ttl,
required this.$__typename});
@override
factory Query$DomainInfo$system$domainInfo$requiredDnsRecords.fromJson(
Map<String, dynamic> json) =>
_$Query$DomainInfo$system$domainInfo$requiredDnsRecordsFromJson(json);
final String content;
final String name;
final int? priority;
final String recordType;
final int ttl;
@JsonKey(name: '__typename')
final String $__typename;
Map<String, dynamic> toJson() =>
_$Query$DomainInfo$system$domainInfo$requiredDnsRecordsToJson(this);
int get hashCode {
final l$content = content;
final l$name = name;
final l$priority = priority;
final l$recordType = recordType;
final l$ttl = ttl;
final l$$__typename = $__typename;
return Object.hashAll(
[l$content, l$name, l$priority, l$recordType, l$ttl, l$$__typename]);
}
@override
bool operator ==(Object other) {
if (identical(this, other)) return true;
if (!(other is Query$DomainInfo$system$domainInfo$requiredDnsRecords) ||
runtimeType != other.runtimeType) return false;
final l$content = content;
final lOther$content = other.content;
if (l$content != lOther$content) return false;
final l$name = name;
final lOther$name = other.name;
if (l$name != lOther$name) return false;
final l$priority = priority;
final lOther$priority = other.priority;
if (l$priority != lOther$priority) return false;
final l$recordType = recordType;
final lOther$recordType = other.recordType;
if (l$recordType != lOther$recordType) return false;
final l$ttl = ttl;
final lOther$ttl = other.ttl;
if (l$ttl != lOther$ttl) return false;
final l$$__typename = $__typename;
final lOther$$__typename = other.$__typename;
if (l$$__typename != lOther$$__typename) return false;
return true;
}
}
extension UtilityExtension$Query$DomainInfo$system$domainInfo$requiredDnsRecords
on Query$DomainInfo$system$domainInfo$requiredDnsRecords {
CopyWith$Query$DomainInfo$system$domainInfo$requiredDnsRecords<
Query$DomainInfo$system$domainInfo$requiredDnsRecords>
get copyWith =>
CopyWith$Query$DomainInfo$system$domainInfo$requiredDnsRecords(
this, (i) => i);
}
abstract class CopyWith$Query$DomainInfo$system$domainInfo$requiredDnsRecords<
TRes> {
factory CopyWith$Query$DomainInfo$system$domainInfo$requiredDnsRecords(
Query$DomainInfo$system$domainInfo$requiredDnsRecords instance,
TRes Function(Query$DomainInfo$system$domainInfo$requiredDnsRecords)
then) =
_CopyWithImpl$Query$DomainInfo$system$domainInfo$requiredDnsRecords;
factory CopyWith$Query$DomainInfo$system$domainInfo$requiredDnsRecords.stub(
TRes res) =
_CopyWithStubImpl$Query$DomainInfo$system$domainInfo$requiredDnsRecords;
TRes call(
{String? content,
String? name,
int? priority,
String? recordType,
int? ttl,
String? $__typename});
}
class _CopyWithImpl$Query$DomainInfo$system$domainInfo$requiredDnsRecords<TRes>
implements
CopyWith$Query$DomainInfo$system$domainInfo$requiredDnsRecords<TRes> {
_CopyWithImpl$Query$DomainInfo$system$domainInfo$requiredDnsRecords(
this._instance, this._then);
final Query$DomainInfo$system$domainInfo$requiredDnsRecords _instance;
final TRes Function(Query$DomainInfo$system$domainInfo$requiredDnsRecords)
_then;
static const _undefined = {};
TRes call(
{Object? content = _undefined,
Object? name = _undefined,
Object? priority = _undefined,
Object? recordType = _undefined,
Object? ttl = _undefined,
Object? $__typename = _undefined}) =>
_then(Query$DomainInfo$system$domainInfo$requiredDnsRecords(
content: content == _undefined || content == null
? _instance.content
: (content as String),
name: name == _undefined || name == null
? _instance.name
: (name as String),
priority:
priority == _undefined ? _instance.priority : (priority as int?),
recordType: recordType == _undefined || recordType == null
? _instance.recordType
: (recordType as String),
ttl: ttl == _undefined || ttl == null ? _instance.ttl : (ttl as int),
$__typename: $__typename == _undefined || $__typename == null
? _instance.$__typename
: ($__typename as String)));
}
class _CopyWithStubImpl$Query$DomainInfo$system$domainInfo$requiredDnsRecords<
TRes>
implements
CopyWith$Query$DomainInfo$system$domainInfo$requiredDnsRecords<TRes> {
_CopyWithStubImpl$Query$DomainInfo$system$domainInfo$requiredDnsRecords(
this._res);
TRes _res;
call(
{String? content,
String? name,
int? priority,
String? recordType,
int? ttl,
String? $__typename}) =>
_res;
}
@JsonSerializable(explicitToJson: true)
class Variables$Mutation$ChangeTimezone {
Variables$Mutation$ChangeTimezone({required this.timezone});

27
lib/logic/api_maps/graphql_maps/schema/server_settings.graphql.g.dart
View file

@ -190,8 +190,7 @@ Query$DomainInfo$system$domainInfo _$Query$DomainInfo$system$domainInfoFromJson(
unknownValue: Enum$DnsProvider.$unknown),
requiredDnsRecords: (json['requiredDnsRecords'] as List<dynamic>)
.map((e) =>
Query$DomainInfo$system$domainInfo$requiredDnsRecords.fromJson(
e as Map<String, dynamic>))
Fragment$dnsRecordFields.fromJson(e as Map<String, dynamic>))
.toList(),
$__typename: json['__typename'] as String,
);
@ -212,30 +211,6 @@ const _$Enum$DnsProviderEnumMap = {
Enum$DnsProvider.$unknown: r'$unknown',
};
Query$DomainInfo$system$domainInfo$requiredDnsRecords
_$Query$DomainInfo$system$domainInfo$requiredDnsRecordsFromJson(
Map<String, dynamic> json) =>
Query$DomainInfo$system$domainInfo$requiredDnsRecords(
content: json['content'] as String,
name: json['name'] as String,
priority: json['priority'] as int?,
recordType: json['recordType'] as String,
ttl: json['ttl'] as int,
$__typename: json['__typename'] as String,
);
Map<String, dynamic>
_$Query$DomainInfo$system$domainInfo$requiredDnsRecordsToJson(
Query$DomainInfo$system$domainInfo$requiredDnsRecords instance) =>
<String, dynamic>{
'content': instance.content,
'name': instance.name,
'priority': instance.priority,
'recordType': instance.recordType,
'ttl': instance.ttl,
'__typename': instance.$__typename,
};
Variables$Mutation$ChangeTimezone _$Variables$Mutation$ChangeTimezoneFromJson(
Map<String, dynamic> json) =>
Variables$Mutation$ChangeTimezone(

6
lib/logic/api_maps/graphql_maps/schema/services.graphql
View file

@ -10,11 +10,7 @@ query AllServices {
description
displayName
dnsRecords {
content
name
priority
recordType
ttl
...dnsRecordFields
}
id
isEnabled

213
lib/logic/api_maps/graphql_maps/schema/services.graphql.dart
View file

@ -312,36 +312,9 @@ const documentNodeQueryAllServices = DocumentNode(definitions: [
arguments: [],
directives: [],
selectionSet: SelectionSetNode(selections: [
FieldNode(
name: NameNode(value: 'content'),
alias: null,
arguments: [],
directives: [],
selectionSet: null),
FieldNode(
name: NameNode(value: 'name'),
alias: null,
arguments: [],
directives: [],
selectionSet: null),
FieldNode(
name: NameNode(value: 'priority'),
alias: null,
arguments: [],
directives: [],
selectionSet: null),
FieldNode(
name: NameNode(value: 'recordType'),
alias: null,
arguments: [],
directives: [],
selectionSet: null),
FieldNode(
name: NameNode(value: 'ttl'),
alias: null,
arguments: [],
directives: [],
selectionSet: null),
FragmentSpreadNode(
name: NameNode(value: 'dnsRecordFields'),
directives: []),
FieldNode(
name: NameNode(value: '__typename'),
alias: null,
@ -456,6 +429,7 @@ const documentNodeQueryAllServices = DocumentNode(definitions: [
directives: [],
selectionSet: null)
])),
fragmentDefinitiondnsRecordFields,
]);
Query$AllServices _parserFn$Query$AllServices(Map<String, dynamic> data) =>
Query$AllServices.fromJson(data);
@ -679,7 +653,7 @@ class Query$AllServices$services$allServices {
final String displayName;
final List<Query$AllServices$services$allServices$dnsRecords>? dnsRecords;
final List<Fragment$dnsRecordFields>? dnsRecords;
final String id;
@ -807,7 +781,7 @@ abstract class CopyWith$Query$AllServices$services$allServices<TRes> {
TRes call(
{String? description,
String? displayName,
List<Query$AllServices$services$allServices$dnsRecords>? dnsRecords,
List<Fragment$dnsRecordFields>? dnsRecords,
String? id,
bool? isEnabled,
bool? isMovable,
@ -818,10 +792,9 @@ abstract class CopyWith$Query$AllServices$services$allServices<TRes> {
String? url,
String? $__typename});
TRes dnsRecords(
Iterable<Query$AllServices$services$allServices$dnsRecords>? Function(
Iterable<Fragment$dnsRecordFields>? Function(
Iterable<
CopyWith$Query$AllServices$services$allServices$dnsRecords<
Query$AllServices$services$allServices$dnsRecords>>?)
CopyWith$Fragment$dnsRecordFields<Fragment$dnsRecordFields>>?)
_fn);
CopyWith$Query$AllServices$services$allServices$storageUsage<TRes>
get storageUsage;
@ -860,8 +833,7 @@ class _CopyWithImpl$Query$AllServices$services$allServices<TRes>
: (displayName as String),
dnsRecords: dnsRecords == _undefined
? _instance.dnsRecords
: (dnsRecords
as List<Query$AllServices$services$allServices$dnsRecords>?),
: (dnsRecords as List<Fragment$dnsRecordFields>?),
id: id == _undefined || id == null ? _instance.id : (id as String),
isEnabled: isEnabled == _undefined || isEnabled == null
? _instance.isEnabled
@ -887,15 +859,15 @@ class _CopyWithImpl$Query$AllServices$services$allServices<TRes>
? _instance.$__typename
: ($__typename as String)));
TRes dnsRecords(
Iterable<Query$AllServices$services$allServices$dnsRecords>? Function(
Iterable<Fragment$dnsRecordFields>? Function(
Iterable<
CopyWith$Query$AllServices$services$allServices$dnsRecords<
Query$AllServices$services$allServices$dnsRecords>>?)
CopyWith$Fragment$dnsRecordFields<
Fragment$dnsRecordFields>>?)
_fn) =>
call(
dnsRecords: _fn(_instance.dnsRecords?.map((e) =>
CopyWith$Query$AllServices$services$allServices$dnsRecords(
e, (i) => i)))?.toList());
dnsRecords: _fn(_instance.dnsRecords
?.map((e) => CopyWith$Fragment$dnsRecordFields(e, (i) => i)))
?.toList());
CopyWith$Query$AllServices$services$allServices$storageUsage<TRes>
get storageUsage {
final local$storageUsage = _instance.storageUsage;
@ -913,7 +885,7 @@ class _CopyWithStubImpl$Query$AllServices$services$allServices<TRes>
call(
{String? description,
String? displayName,
List<Query$AllServices$services$allServices$dnsRecords>? dnsRecords,
List<Fragment$dnsRecordFields>? dnsRecords,
String? id,
bool? isEnabled,
bool? isMovable,
@ -931,159 +903,6 @@ class _CopyWithStubImpl$Query$AllServices$services$allServices<TRes>
_res);
}
@JsonSerializable(explicitToJson: true)
class Query$AllServices$services$allServices$dnsRecords {
Query$AllServices$services$allServices$dnsRecords(
{required this.content,
required this.name,
this.priority,
required this.recordType,
required this.ttl,
required this.$__typename});
@override
factory Query$AllServices$services$allServices$dnsRecords.fromJson(
Map<String, dynamic> json) =>
_$Query$AllServices$services$allServices$dnsRecordsFromJson(json);
final String content;
final String name;
final int? priority;
final String recordType;
final int ttl;
@JsonKey(name: '__typename')
final String $__typename;
Map<String, dynamic> toJson() =>
_$Query$AllServices$services$allServices$dnsRecordsToJson(this);
int get hashCode {
final l$content = content;
final l$name = name;
final l$priority = priority;
final l$recordType = recordType;
final l$ttl = ttl;
final l$$__typename = $__typename;
return Object.hashAll(
[l$content, l$name, l$priority, l$recordType, l$ttl, l$$__typename]);
}
@override
bool operator ==(Object other) {
if (identical(this, other)) return true;
if (!(other is Query$AllServices$services$allServices$dnsRecords) ||
runtimeType != other.runtimeType) return false;
final l$content = content;
final lOther$content = other.content;
if (l$content != lOther$content) return false;
final l$name = name;
final lOther$name = other.name;
if (l$name != lOther$name) return false;
final l$priority = priority;
final lOther$priority = other.priority;
if (l$priority != lOther$priority) return false;
final l$recordType = recordType;
final lOther$recordType = other.recordType;
if (l$recordType != lOther$recordType) return false;
final l$ttl = ttl;
final lOther$ttl = other.ttl;
if (l$ttl != lOther$ttl) return false;
final l$$__typename = $__typename;
final lOther$$__typename = other.$__typename;
if (l$$__typename != lOther$$__typename) return false;
return true;
}
}
extension UtilityExtension$Query$AllServices$services$allServices$dnsRecords
on Query$AllServices$services$allServices$dnsRecords {
CopyWith$Query$AllServices$services$allServices$dnsRecords<
Query$AllServices$services$allServices$dnsRecords>
get copyWith =>
CopyWith$Query$AllServices$services$allServices$dnsRecords(
this, (i) => i);
}
abstract class CopyWith$Query$AllServices$services$allServices$dnsRecords<
TRes> {
factory CopyWith$Query$AllServices$services$allServices$dnsRecords(
Query$AllServices$services$allServices$dnsRecords instance,
TRes Function(Query$AllServices$services$allServices$dnsRecords)
then) =
_CopyWithImpl$Query$AllServices$services$allServices$dnsRecords;
factory CopyWith$Query$AllServices$services$allServices$dnsRecords.stub(
TRes res) =
_CopyWithStubImpl$Query$AllServices$services$allServices$dnsRecords;
TRes call(
{String? content,
String? name,
int? priority,
String? recordType,
int? ttl,
String? $__typename});
}
class _CopyWithImpl$Query$AllServices$services$allServices$dnsRecords<TRes>
implements
CopyWith$Query$AllServices$services$allServices$dnsRecords<TRes> {
_CopyWithImpl$Query$AllServices$services$allServices$dnsRecords(
this._instance, this._then);
final Query$AllServices$services$allServices$dnsRecords _instance;
final TRes Function(Query$AllServices$services$allServices$dnsRecords) _then;
static const _undefined = {};
TRes call(
{Object? content = _undefined,
Object? name = _undefined,
Object? priority = _undefined,
Object? recordType = _undefined,
Object? ttl = _undefined,
Object? $__typename = _undefined}) =>
_then(Query$AllServices$services$allServices$dnsRecords(
content: content == _undefined || content == null
? _instance.content
: (content as String),
name: name == _undefined || name == null
? _instance.name
: (name as String),
priority:
priority == _undefined ? _instance.priority : (priority as int?),
recordType: recordType == _undefined || recordType == null
? _instance.recordType
: (recordType as String),
ttl: ttl == _undefined || ttl == null ? _instance.ttl : (ttl as int),
$__typename: $__typename == _undefined || $__typename == null
? _instance.$__typename
: ($__typename as String)));
}
class _CopyWithStubImpl$Query$AllServices$services$allServices$dnsRecords<TRes>
implements
CopyWith$Query$AllServices$services$allServices$dnsRecords<TRes> {
_CopyWithStubImpl$Query$AllServices$services$allServices$dnsRecords(
this._res);
TRes _res;
call(
{String? content,
String? name,
int? priority,
String? recordType,
int? ttl,
String? $__typename}) =>
_res;
}
@JsonSerializable(explicitToJson: true)
class Query$AllServices$services$allServices$storageUsage {
Query$AllServices$services$allServices$storageUsage(

26
lib/logic/api_maps/graphql_maps/schema/services.graphql.g.dart
View file

@ -62,8 +62,7 @@ Query$AllServices$services$allServices
displayName: json['displayName'] as String,
dnsRecords: (json['dnsRecords'] as List<dynamic>?)
?.map((e) =>
Query$AllServices$services$allServices$dnsRecords.fromJson(
e as Map<String, dynamic>))
Fragment$dnsRecordFields.fromJson(e as Map<String, dynamic>))
.toList(),
id: json['id'] as String,
isEnabled: json['isEnabled'] as bool,
@ -107,29 +106,6 @@ const _$Enum$ServiceStatusEnumEnumMap = {
Enum$ServiceStatusEnum.$unknown: r'$unknown',
};
Query$AllServices$services$allServices$dnsRecords
_$Query$AllServices$services$allServices$dnsRecordsFromJson(
Map<String, dynamic> json) =>
Query$AllServices$services$allServices$dnsRecords(
content: json['content'] as String,
name: json['name'] as String,
priority: json['priority'] as int?,
recordType: json['recordType'] as String,
ttl: json['ttl'] as int,
$__typename: json['__typename'] as String,
);
Map<String, dynamic> _$Query$AllServices$services$allServices$dnsRecordsToJson(
Query$AllServices$services$allServices$dnsRecords instance) =>
<String, dynamic>{
'content': instance.content,
'name': instance.name,
'priority': instance.priority,
'recordType': instance.recordType,
'ttl': instance.ttl,
'__typename': instance.$__typename,
};
Query$AllServices$services$allServices$storageUsage
_$Query$AllServices$services$allServices$storageUsageFromJson(
Map<String, dynamic> json) =>

6
lib/logic/api_maps/graphql_maps/server_api/jobs_api.dart
View file

@ -22,20 +22,22 @@ mixin JobsApi on ApiMap {
return jobsList;
}
Future<GenericMutationResult> removeApiJob(final String uid) async {
Future<GenericMutationResult<bool>> removeApiJob(final String uid) async {
try {
final GraphQLClient client = await getClient();
final variables = Variables$Mutation$RemoveJob(jobId: uid);
final mutation = Options$Mutation$RemoveJob(variables: variables);
final response = await client.mutate$RemoveJob(mutation);
return GenericMutationResult(
success: response.parsedData?.removeJob.success ?? false,
data: response.parsedData?.removeJob.success ?? false,
success: true,
code: response.parsedData?.removeJob.code ?? 0,
message: response.parsedData?.removeJob.message,
);
} catch (e) {
print(e);
return GenericMutationResult(
data: false,
success: false,
code: 0,
message: e.toString(),

131
lib/logic/api_maps/graphql_maps/server_api/server.dart
View file

@ -13,6 +13,7 @@ import 'package:selfprivacy/logic/models/hive/user.dart';
import 'package:selfprivacy/logic/models/json/api_token.dart';
import 'package:selfprivacy/logic/models/json/backup.dart';
import 'package:selfprivacy/logic/models/json/device_token.dart';
import 'package:selfprivacy/logic/models/json/dns_records.dart';
import 'package:selfprivacy/logic/models/json/recovery_token_status.dart';
import 'package:selfprivacy/logic/models/json/server_disk_volume.dart';
import 'package:selfprivacy/logic/models/json/server_job.dart';
@ -26,39 +27,28 @@ part 'services_api.dart';
part 'users_api.dart';
part 'volume_api.dart';
class GenericMutationResult {
GenericMutationResult({
required this.success,
required this.code,
this.message,
});
final bool success;
final int code;
final String? message;
}
class GenericJobMutationReturn extends GenericMutationResult {
GenericJobMutationReturn({
required super.success,
required super.code,
super.message,
this.job,
});
final ServerJob? job;
}
@Deprecated(
'Extend GenericMutationResult for mutations, return data for queries',
)
class ApiResponse<D> {
ApiResponse({
class GenericResult<T> {
GenericResult({
required this.success,
required this.data,
this.message,
});
/// Whether was a response successfully received,
/// doesn't represent success of the request if `data<T>` is `bool`
final bool success;
final String? message;
final D data;
final T data;
}
class GenericMutationResult<T> extends GenericResult<T> {
GenericMutationResult({
required super.success,
required this.code,
required super.data,
super.message,
});
final int code;
}
class ServerApi extends ApiMap
@ -196,7 +186,7 @@ class ServerApi extends ApiMap
return settings;
}
Future<ApiResponse<RecoveryKeyStatus?>> getRecoveryTokenStatus() async {
Future<GenericResult<RecoveryKeyStatus?>> getRecoveryTokenStatus() async {
RecoveryKeyStatus? key;
QueryResult<Query$RecoveryKey> response;
String? error;
@ -213,18 +203,18 @@ class ServerApi extends ApiMap
print(e);
}
return ApiResponse<RecoveryKeyStatus?>(
return GenericResult<RecoveryKeyStatus?>(
success: error == null,
data: key,
message: error,
);
}
Future<ApiResponse<String>> generateRecoveryToken(
Future<GenericResult<String>> generateRecoveryToken(
final DateTime? expirationDate,
final int? numberOfUses,
) async {
ApiResponse<String> key;
GenericResult<String> key;
QueryResult<Mutation$GetNewRecoveryApiKey> response;
try {
@ -245,19 +235,19 @@ class ServerApi extends ApiMap
);
if (response.hasException) {
print(response.exception.toString());
key = ApiResponse<String>(
key = GenericResult<String>(
success: false,
data: '',
message: response.exception.toString(),
);
}
key = ApiResponse<String>(
key = GenericResult<String>(
success: true,
data: response.parsedData!.getNewRecoveryApiKey.key!,
);
} catch (e) {
print(e);
key = ApiResponse<String>(
key = GenericResult<String>(
success: false,
data: '',
message: e.toString(),
@ -267,11 +257,8 @@ class ServerApi extends ApiMap
return key;
}
@Deprecated(
'Server now aware of all required DNS records. More general approach has to be implemented',
)
Future<String?> getDkim() async {
String? dkim;
Future<List<DnsRecord>> getDnsRecords() async {
List<DnsRecord> records = [];
QueryResult<Query$DomainInfo> response;
try {
@ -280,25 +267,21 @@ class ServerApi extends ApiMap
if (response.hasException) {
print(response.exception.toString());
}
dkim = response.parsedData!.system.domainInfo.requiredDnsRecords
.firstWhere(
(
final Query$DomainInfo$system$domainInfo$requiredDnsRecords
dnsRecord,
) =>
dnsRecord.name == 'selector._domainkey' &&
dnsRecord.recordType == 'TXT',
records = response.parsedData!.system.domainInfo.requiredDnsRecords
.map<DnsRecord>(
(final Fragment$dnsRecordFields fragment) =>
DnsRecord.fromGraphQL(fragment),
)
.content;
.toList();
} catch (e) {
print(e);
}
return dkim;
return records;
}
Future<ApiResponse<List<ApiToken>>> getApiTokens() async {
ApiResponse<List<ApiToken>> tokens;
Future<GenericResult<List<ApiToken>>> getApiTokens() async {
GenericResult<List<ApiToken>> tokens;
QueryResult<Query$GetApiTokens> response;
try {
@ -307,7 +290,7 @@ class ServerApi extends ApiMap
if (response.hasException) {
final message = response.exception.toString();
print(message);
tokens = ApiResponse<List<ApiToken>>(
tokens = GenericResult<List<ApiToken>>(
success: false,
data: [],
message: message,
@ -321,13 +304,13 @@ class ServerApi extends ApiMap
ApiToken.fromGraphQL(device),
)
.toList();
tokens = ApiResponse<List<ApiToken>>(
tokens = GenericResult<List<ApiToken>>(
success: true,
data: parsed,
);
} catch (e) {
print(e);
tokens = ApiResponse<List<ApiToken>>(
tokens = GenericResult<List<ApiToken>>(
success: false,
data: [],
message: e.toString(),
@ -337,8 +320,8 @@ class ServerApi extends ApiMap
return tokens;
}
Future<ApiResponse<void>> deleteApiToken(final String name) async {
ApiResponse<void> returnable;
Future<GenericResult<void>> deleteApiToken(final String name) async {
GenericResult<void> returnable;
QueryResult<Mutation$DeleteDeviceApiToken> response;
try {
@ -355,19 +338,19 @@ class ServerApi extends ApiMap
);
if (response.hasException) {
print(response.exception.toString());
returnable = ApiResponse<void>(
returnable = GenericResult<void>(
success: false,
data: null,
message: response.exception.toString(),
);
}
returnable = ApiResponse<void>(
returnable = GenericResult<void>(
success: true,
data: null,
);
} catch (e) {
print(e);
returnable = ApiResponse<void>(
returnable = GenericResult<void>(
success: false,
data: null,
message: e.toString(),
@ -377,8 +360,8 @@ class ServerApi extends ApiMap
return returnable;
}
Future<ApiResponse<String>> createDeviceToken() async {
ApiResponse<String> token;
Future<GenericResult<String>> createDeviceToken() async {
GenericResult<String> token;
QueryResult<Mutation$GetNewDeviceApiKey> response;
try {
@ -390,19 +373,19 @@ class ServerApi extends ApiMap
);
if (response.hasException) {
print(response.exception.toString());
token = ApiResponse<String>(
token = GenericResult<String>(
success: false,
data: '',
message: response.exception.toString(),
);
}
token = ApiResponse<String>(
token = GenericResult<String>(
success: true,
data: response.parsedData!.getNewDeviceApiKey.key!,
);
} catch (e) {
print(e);
token = ApiResponse<String>(
token = GenericResult<String>(
success: false,
data: '',
message: e.toString(),
@ -414,10 +397,10 @@ class ServerApi extends ApiMap
Future<bool> isHttpServerWorking() async => (await getApiVersion()) != null;
Future<ApiResponse<String>> authorizeDevice(
Future<GenericResult<String>> authorizeDevice(
final DeviceToken deviceToken,
) async {
ApiResponse<String> token;
GenericResult<String> token;
QueryResult<Mutation$AuthorizeWithNewDeviceApiKey> response;
try {
@ -439,19 +422,19 @@ class ServerApi extends ApiMap
);
if (response.hasException) {
print(response.exception.toString());
token = ApiResponse<String>(
token = GenericResult<String>(
success: false,
data: '',
message: response.exception.toString(),
);
}
token = ApiResponse<String>(
token = GenericResult<String>(
success: true,
data: response.parsedData!.authorizeWithNewDeviceApiKey.token!,
);
} catch (e) {
print(e);
token = ApiResponse<String>(
token = GenericResult<String>(
success: false,
data: '',
message: e.toString(),
@ -461,10 +444,10 @@ class ServerApi extends ApiMap
return token;
}
Future<ApiResponse<String>> useRecoveryToken(
Future<GenericResult<String>> useRecoveryToken(
final DeviceToken deviceToken,
) async {
ApiResponse<String> token;
GenericResult<String> token;
QueryResult<Mutation$UseRecoveryApiKey> response;
try {
@ -486,19 +469,19 @@ class ServerApi extends ApiMap
);
if (response.hasException) {
print(response.exception.toString());
token = ApiResponse<String>(
token = GenericResult<String>(
success: false,
data: '',
message: response.exception.toString(),
);
}
token = ApiResponse<String>(
token = GenericResult<String>(
success: true,
data: response.parsedData!.useRecoveryApiKey.token!,
);
} catch (e) {
print(e);
token = ApiResponse<String>(
token = GenericResult<String>(
success: false,
data: '',
message: e.toString(),

44
lib/logic/api_maps/graphql_maps/server_api/services_api.dart
View file

@ -20,20 +20,24 @@ mixin ServicesApi on ApiMap {
return services;
}
Future<GenericMutationResult> enableService(final String serviceId) async {
Future<GenericMutationResult<bool>> enableService(
final String serviceId,
) async {
try {
final GraphQLClient client = await getClient();
final variables = Variables$Mutation$EnableService(serviceId: serviceId);
final mutation = Options$Mutation$EnableService(variables: variables);
final response = await client.mutate$EnableService(mutation);
return GenericMutationResult(
success: response.parsedData?.enableService.success ?? false,
data: response.parsedData?.enableService.success ?? false,
success: true,
code: response.parsedData?.enableService.code ?? 0,
message: response.parsedData?.enableService.message,
);
} catch (e) {
print(e);
return GenericMutationResult(
data: false,
success: false,
code: 0,
message: e.toString(),
@ -41,13 +45,16 @@ mixin ServicesApi on ApiMap {
}
}
Future<GenericMutationResult> disableService(final String serviceId) async {
Future<GenericMutationResult<void>> disableService(
final String serviceId,
) async {
try {
final GraphQLClient client = await getClient();
final variables = Variables$Mutation$DisableService(serviceId: serviceId);
final mutation = Options$Mutation$DisableService(variables: variables);
final response = await client.mutate$DisableService(mutation);
return GenericMutationResult(
data: null,
success: response.parsedData?.disableService.success ?? false,
code: response.parsedData?.disableService.code ?? 0,
message: response.parsedData?.disableService.message,
@ -55,6 +62,7 @@ mixin ServicesApi on ApiMap {
} catch (e) {
print(e);
return GenericMutationResult(
data: null,
success: false,
code: 0,
message: e.toString(),
@ -62,20 +70,24 @@ mixin ServicesApi on ApiMap {
}
}
Future<GenericMutationResult> stopService(final String serviceId) async {
Future<GenericMutationResult<bool>> stopService(
final String serviceId,
) async {
try {
final GraphQLClient client = await getClient();
final variables = Variables$Mutation$StopService(serviceId: serviceId);
final mutation = Options$Mutation$StopService(variables: variables);
final response = await client.mutate$StopService(mutation);
return GenericMutationResult(
success: response.parsedData?.stopService.success ?? false,
data: response.parsedData?.stopService.success ?? false,
success: true,
code: response.parsedData?.stopService.code ?? 0,
message: response.parsedData?.stopService.message,
);
} catch (e) {
print(e);
return GenericMutationResult(
data: false,
success: false,
code: 0,
message: e.toString(),
@ -90,6 +102,7 @@ mixin ServicesApi on ApiMap {
final mutation = Options$Mutation$StartService(variables: variables);
final response = await client.mutate$StartService(mutation);
return GenericMutationResult(
data: null,
success: response.parsedData?.startService.success ?? false,
code: response.parsedData?.startService.code ?? 0,
message: response.parsedData?.startService.message,
@ -97,6 +110,7 @@ mixin ServicesApi on ApiMap {
} catch (e) {
print(e);
return GenericMutationResult(
data: null,
success: false,
code: 0,
message: e.toString(),
@ -104,20 +118,24 @@ mixin ServicesApi on ApiMap {
}
}
Future<GenericMutationResult> restartService(final String serviceId) async {
Future<GenericMutationResult<bool>> restartService(
final String serviceId,
) async {
try {
final GraphQLClient client = await getClient();
final variables = Variables$Mutation$RestartService(serviceId: serviceId);
final mutation = Options$Mutation$RestartService(variables: variables);
final response = await client.mutate$RestartService(mutation);
return GenericMutationResult(
success: response.parsedData?.restartService.success ?? false,
data: response.parsedData?.restartService.success ?? false,
success: true,
code: response.parsedData?.restartService.code ?? 0,
message: response.parsedData?.restartService.message,
);
} catch (e) {
print(e);
return GenericMutationResult(
data: false,
success: false,
code: 0,
message: e.toString(),
@ -125,7 +143,7 @@ mixin ServicesApi on ApiMap {
}
}
Future<GenericJobMutationReturn> moveService(
Future<GenericMutationResult<ServerJob?>> moveService(
final String serviceId,
final String destination,
) async {
@ -140,19 +158,19 @@ mixin ServicesApi on ApiMap {
final mutation = Options$Mutation$MoveService(variables: variables);
final response = await client.mutate$MoveService(mutation);
final jobJson = response.parsedData?.moveService.job?.toJson();
return GenericJobMutationReturn(
success: response.parsedData?.moveService.success ?? false,
return GenericMutationResult(
success: true,
code: response.parsedData?.moveService.code ?? 0,
message: response.parsedData?.moveService.message,
job: jobJson != null ? ServerJob.fromJson(jobJson) : null,
data: jobJson != null ? ServerJob.fromJson(jobJson) : null,
);
} catch (e) {
print(e);
return GenericJobMutationReturn(
return GenericMutationResult(
success: false,
code: 0,
message: e.toString(),
job: null,
data: null,
);
}
}

59
lib/logic/api_maps/graphql_maps/server_api/users_api.dart
View file

@ -1,16 +1,5 @@
part of 'server.dart';
class UserMutationResult extends GenericMutationResult {
UserMutationResult({
required super.success,
required super.code,
super.message,
this.user,
});
final User? user;
}
mixin UsersApi on ApiMap {
Future<List<User>> getAllUsers() async {
QueryResult<Query$AllUsers> response;
@ -56,7 +45,7 @@ mixin UsersApi on ApiMap {
return user;
}
Future<UserMutationResult> createUser(
Future<GenericMutationResult<User?>> createUser(
final String username,
final String password,
) async {
@ -67,25 +56,26 @@ mixin UsersApi on ApiMap {
);
final mutation = Options$Mutation$CreateUser(variables: variables);
final response = await client.mutate$CreateUser(mutation);
return UserMutationResult(
success: response.parsedData?.createUser.success ?? false,
return GenericMutationResult(
success: true,
code: response.parsedData?.createUser.code ?? 500,
message: response.parsedData?.createUser.message,
user: response.parsedData?.createUser.user != null
data: response.parsedData?.createUser.user != null
? User.fromGraphQL(response.parsedData!.createUser.user!)
: null,
);
} catch (e) {
print(e);
return UserMutationResult(
return GenericMutationResult(
success: false,
code: 0,
message: e.toString(),
data: null,
);
}
}
Future<GenericMutationResult> deleteUser(
Future<GenericMutationResult<bool>> deleteUser(
final String username,
) async {
try {
@ -94,13 +84,15 @@ mixin UsersApi on ApiMap {
final mutation = Options$Mutation$DeleteUser(variables: variables);
final response = await client.mutate$DeleteUser(mutation);
return GenericMutationResult(
success: response.parsedData?.deleteUser.success ?? false,
data: response.parsedData?.deleteUser.success ?? false,
success: true,
code: response.parsedData?.deleteUser.code ?? 500,
message: response.parsedData?.deleteUser.message,
);
} catch (e) {
print(e);
return GenericMutationResult(
data: false,
success: false,
code: 500,
message: e.toString(),
@ -108,7 +100,7 @@ mixin UsersApi on ApiMap {
}
}
Future<UserMutationResult> updateUser(
Future<GenericMutationResult<User?>> updateUser(
final String username,
final String password,
) async {
@ -119,17 +111,18 @@ mixin UsersApi on ApiMap {
);
final mutation = Options$Mutation$UpdateUser(variables: variables);
final response = await client.mutate$UpdateUser(mutation);
return UserMutationResult(
success: response.parsedData?.updateUser.success ?? false,
return GenericMutationResult(
success: true,
code: response.parsedData?.updateUser.code ?? 500,
message: response.parsedData?.updateUser.message,
user: response.parsedData?.updateUser.user != null
data: response.parsedData?.updateUser.user != null
? User.fromGraphQL(response.parsedData!.updateUser.user!)
: null,
);
} catch (e) {
print(e);
return UserMutationResult(
return GenericMutationResult(
data: null,
success: false,
code: 0,
message: e.toString(),
@ -137,7 +130,7 @@ mixin UsersApi on ApiMap {
}
}
Future<UserMutationResult> addSshKey(
Future<GenericMutationResult<User?>> addSshKey(
final String username,
final String sshKey,
) async {
@ -151,17 +144,18 @@ mixin UsersApi on ApiMap {
);
final mutation = Options$Mutation$AddSshKey(variables: variables);
final response = await client.mutate$AddSshKey(mutation);
return UserMutationResult(
success: response.parsedData?.addSshKey.success ?? false,
return GenericMutationResult(
success: true,
code: response.parsedData?.addSshKey.code ?? 500,
message: response.parsedData?.addSshKey.message,
user: response.parsedData?.addSshKey.user != null
data: response.parsedData?.addSshKey.user != null
? User.fromGraphQL(response.parsedData!.addSshKey.user!)
: null,
);
} catch (e) {
print(e);
return UserMutationResult(
return GenericMutationResult(
data: null,
success: false,
code: 0,
message: e.toString(),
@ -169,7 +163,7 @@ mixin UsersApi on ApiMap {
}
}
Future<UserMutationResult> removeSshKey(
Future<GenericMutationResult<User?>> removeSshKey(
final String username,
final String sshKey,
) async {
@ -183,17 +177,18 @@ mixin UsersApi on ApiMap {
);
final mutation = Options$Mutation$RemoveSshKey(variables: variables);
final response = await client.mutate$RemoveSshKey(mutation);
return UserMutationResult(
return GenericMutationResult(
success: response.parsedData?.removeSshKey.success ?? false,
code: response.parsedData?.removeSshKey.code ?? 500,
message: response.parsedData?.removeSshKey.message,
user: response.parsedData?.removeSshKey.user != null
data: response.parsedData?.removeSshKey.user != null
? User.fromGraphQL(response.parsedData!.removeSshKey.user!)
: null,
);
} catch (e) {
print(e);
return UserMutationResult(
return GenericMutationResult(
data: null,
success: false,
code: 0,
message: e.toString(),

24
lib/logic/api_maps/graphql_maps/server_api/volume_api.dart
View file

@ -1,15 +1,5 @@
part of 'server.dart';
class MigrateToBindsMutationReturn extends GenericMutationResult {
MigrateToBindsMutationReturn({
required super.success,
required super.code,
super.message,
this.jobUid,
});
final String? jobUid;
}
mixin VolumeApi on ApiMap {
Future<List<ServerDiskVolume>> getServerDiskVolumes() async {
QueryResult response;
@ -67,10 +57,10 @@ mixin VolumeApi on ApiMap {
}
}
Future<MigrateToBindsMutationReturn> migrateToBinds(
Future<GenericMutationResult<String?>> migrateToBinds(
final Map<String, String> serviceToDisk,
) async {
MigrateToBindsMutationReturn? mutation;
GenericMutationResult<String?>? mutation;
try {
final GraphQLClient client = await getClient();
@ -88,19 +78,19 @@ mixin VolumeApi on ApiMap {
await client.mutate$MigrateToBinds(
migrateMutation,
);
mutation = mutation = MigrateToBindsMutationReturn(
success: result.parsedData!.migrateToBinds.success,
mutation = mutation = GenericMutationResult(
success: true,
code: result.parsedData!.migrateToBinds.code,
message: result.parsedData!.migrateToBinds.message,
jobUid: result.parsedData!.migrateToBinds.job?.uid,
data: result.parsedData!.migrateToBinds.job?.uid,
);
} catch (e) {
print(e);
mutation = MigrateToBindsMutationReturn(
mutation = GenericMutationResult(
success: false,
code: 0,
message: e.toString(),
jobUid: null,
data: null,
);
}

13
lib/logic/api_maps/rest_maps/dns_providers/cloudflare/cloudflare.dart
View file

@ -242,25 +242,18 @@ class CloudflareApi extends DnsProviderApi {
}
@override
Future<void> setDkim(
final String dkimRecordString,
Future<void> setDnsRecord(
final DnsRecord record,
final ServerDomain domain,
) async {
final String domainZoneId = domain.zoneId;
final String url = '$rootAddress/zones/$domainZoneId/dns_records';
final DnsRecord dkimRecord = DnsRecord(
type: 'TXT',
name: 'selector._domainkey',
content: dkimRecordString,
ttl: 18000,
);
final Dio client = await getClient();
try {
await client.post(
url,
data: dkimRecord.toJson(),
data: record.toJson(),
);
} catch (e) {
print(e);

4
lib/logic/api_maps/rest_maps/dns_providers/dns_provider.dart
View file

@ -19,8 +19,8 @@ abstract class DnsProviderApi extends ApiMap {
required final ServerDomain domain,
final String? ip4,
});
Future<void> setDkim(
final String dkimRecordString,
Future<void> setDnsRecord(
final DnsRecord record,
final ServerDomain domain,
);
Future<String?> getZoneId(final String domain);

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

@ -35,7 +35,7 @@ class ApiDevicesCubit
}
Future<List<ApiToken>?> _getApiTokens() async {
final ApiResponse<List<ApiToken>> response = await api.getApiTokens();
final GenericResult<List<ApiToken>> response = await api.getApiTokens();
if (response.success) {
return response.data;
} else {
@ -44,7 +44,7 @@ class ApiDevicesCubit
}
Future<void> deleteDevice(final ApiToken device) async {
final ApiResponse<void> response = await api.deleteApiToken(device.name);
final GenericResult<void> response = await api.deleteApiToken(device.name);
if (response.success) {
emit(
ApiDevicesState(
@ -59,7 +59,7 @@ class ApiDevicesCubit
}
Future<String?> getNewDeviceKey() async {
final ApiResponse<String> response = await api.createDeviceToken();
final GenericResult<String> response = await api.createDeviceToken();
if (response.success) {
return response.data;
} else {

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

@ -8,6 +8,7 @@ import 'package:selfprivacy/logic/models/hive/server_domain.dart';
import 'package:selfprivacy/logic/models/json/dns_records.dart';
import 'package:selfprivacy/logic/api_maps/graphql_maps/server_api/server.dart';
import 'package:selfprivacy/utils/network_utils.dart';
part 'dns_records_state.dart';
@ -32,7 +33,7 @@ class DnsRecordsCubit
emit(
DnsRecordsState(
dnsState: DnsRecordsStatus.refreshing,
dnsRecords: _getDesiredDnsRecords(
dnsRecords: getDesiredDnsRecords(
serverInstallationCubit.state.serverDomain?.domainName,
'',
'',
@ -48,9 +49,10 @@ class DnsRecordsCubit
final List<DnsRecord> records = await dnsProviderApiFactory!
.getDnsProvider()
.getDnsRecords(domain: domain);
final String? dkimPublicKey = await api.getDkim();
final String? dkimPublicKey =
extractDkimRecord(await api.getDnsRecords())?.content;
final List<DesiredDnsRecord> desiredRecords =
_getDesiredDnsRecords(domain.domainName, ipAddress, dkimPublicKey);
getDesiredDnsRecords(domain.domainName, ipAddress, dkimPublicKey);
final List<DesiredDnsRecord> foundRecords = [];
for (final DesiredDnsRecord record in desiredRecords) {
if (record.description == 'record.dkim') {
@ -123,7 +125,6 @@ class DnsRecordsCubit
emit(state.copyWith(dnsState: DnsRecordsStatus.refreshing));
final ServerDomain? domain = serverInstallationCubit.state.serverDomain;
final String? ipAddress = serverInstallationCubit.state.serverDetails?.ip4;
final String? dkimPublicKey = await api.getDkim();
final DnsProviderApi dnsProviderApi =
dnsProviderApiFactory!.getDnsProvider();
await dnsProviderApi.removeSimilarRecords(domain: domain!);
@ -131,88 +132,13 @@ class DnsRecordsCubit
domain: domain,
ip4: ipAddress,
);
await dnsProviderApi.setDkim(dkimPublicKey ?? '', domain);
final List<DnsRecord> records = await api.getDnsRecords();
final DnsRecord? dkimRecord = extractDkimRecord(records);
if (dkimRecord != null) {
await dnsProviderApi.setDnsRecord(dkimRecord, domain);
}
await load();
}
List<DesiredDnsRecord> _getDesiredDnsRecords(
final String? domainName,
final String? ipAddress,
final String? dkimPublicKey,
) {
if (domainName == null || ipAddress == null) {
return [];
}
return [
DesiredDnsRecord(
name: domainName,
content: ipAddress,
description: 'record.root',
),
DesiredDnsRecord(
name: 'api.$domainName',
content: ipAddress,
description: 'record.api',
),
DesiredDnsRecord(
name: 'cloud.$domainName',
content: ipAddress,
description: 'record.cloud',
),
DesiredDnsRecord(
name: 'git.$domainName',
content: ipAddress,
description: 'record.git',
),
DesiredDnsRecord(
name: 'meet.$domainName',
content: ipAddress,
description: 'record.meet',
),
DesiredDnsRecord(
name: 'social.$domainName',
content: ipAddress,
description: 'record.social',
),
DesiredDnsRecord(
name: 'password.$domainName',
content: ipAddress,
description: 'record.password',
),
DesiredDnsRecord(
name: 'vpn.$domainName',
content: ipAddress,
description: 'record.vpn',
),
DesiredDnsRecord(
name: domainName,
content: domainName,
description: 'record.mx',
type: 'MX',
category: DnsRecordsCategory.email,
),
DesiredDnsRecord(
name: '_dmarc.$domainName',
content: 'v=DMARC1; p=none',
description: 'record.dmarc',
type: 'TXT',
category: DnsRecordsCategory.email,
),
DesiredDnsRecord(
name: domainName,
content: 'v=spf1 a mx ip4:$ipAddress -all',
description: 'record.spf',
type: 'TXT',
category: DnsRecordsCategory.email,
),
if (dkimPublicKey != null)
DesiredDnsRecord(
name: 'selector._domainkey.$domainName',
content: dkimPublicKey,
description: 'record.dkim',
type: 'TXT',
category: DnsRecordsCategory.email,
),
];
}
}

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

@ -7,12 +7,6 @@ enum DnsRecordsStatus {
error,
}
enum DnsRecordsCategory {
services,
email,
other,
}
class DnsRecordsState extends ServerInstallationDependendState {
const DnsRecordsState({
this.dnsState = DnsRecordsStatus.uninitialized,
@ -37,38 +31,3 @@ class DnsRecordsState extends ServerInstallationDependendState {
dnsRecords: dnsRecords ?? this.dnsRecords,
);
}
class DesiredDnsRecord {
const DesiredDnsRecord({
required this.name,
required this.content,
this.type = 'A',
this.description = '',
this.category = DnsRecordsCategory.services,
this.isSatisfied = false,
});
final String name;
final String type;
final String content;
final String description;
final DnsRecordsCategory category;
final bool isSatisfied;
DesiredDnsRecord copyWith({
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,
description: description ?? this.description,
category: category ?? this.category,
isSatisfied: isSatisfied ?? this.isSatisfied,
);
}

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

@ -32,7 +32,7 @@ class RecoveryKeyCubit
}
Future<RecoveryKeyStatus?> _getRecoveryKeyStatus() async {
final ApiResponse<RecoveryKeyStatus?> response =
final GenericResult<RecoveryKeyStatus?> response =
await api.getRecoveryTokenStatus();
if (response.success) {
return response.data;
@ -57,7 +57,7 @@ class RecoveryKeyCubit
final DateTime? expirationDate,
final int? numberOfUses,
}) async {
final ApiResponse<String> response =
final GenericResult<String> response =
await api.generateRecoveryToken(expirationDate, numberOfUses);
if (response.success) {
refresh();

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

@ -23,11 +23,13 @@ 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/dns_records.dart';
import 'package:selfprivacy/logic/models/message.dart';
import 'package:selfprivacy/logic/models/server_basic_info.dart';
import 'package:selfprivacy/logic/models/server_type.dart';
import 'package:selfprivacy/ui/components/action_button/action_button.dart';
import 'package:selfprivacy/ui/components/brand_alert/brand_alert.dart';
import 'package:selfprivacy/utils/network_utils.dart';
class IpNotFoundException implements Exception {
IpNotFoundException(this.message);
@ -301,7 +303,7 @@ class ServerInstallationRepository {
],
),
);
} else if (e.response!.data['error']['code'] == 'resource_unavailable') {
} else {
final NavigationService nav = getIt.get<NavigationService>();
nav.showPopUpDialog(
BrandAlert(
@ -406,15 +408,15 @@ class ServerInstallationRepository {
dnsProviderApiFactory!.getDnsProvider();
final ServerApi api = ServerApi();
String dkimRecordString = '';
late DnsRecord record;
try {
dkimRecordString = (await api.getDkim())!;
record = extractDkimRecord(await api.getDnsRecords())!;
} catch (e) {
print(e);
rethrow;
}
await dnsProviderApi.setDkim(dkimRecordString, cloudFlareDomain);
await dnsProviderApi.setDnsRecord(record, cloudFlareDomain);
}
Future<bool> isHttpServerWorking() async {
@ -510,13 +512,13 @@ class ServerInstallationRepository {
overrideDomain: serverDomain.domainName,
);
final String serverIp = await getServerIpFromDomain(serverDomain);
final ApiResponse<String> apiResponse = await serverApi.authorizeDevice(
final GenericResult<String> result = await serverApi.authorizeDevice(
DeviceToken(device: await getDeviceName(), token: newDeviceKey),
);
if (apiResponse.success) {
if (result.success) {
return ServerHostingDetails(
apiToken: apiResponse.data,
apiToken: result.data,
volume: ServerVolume(
id: 0,
name: '',
@ -533,7 +535,7 @@ class ServerInstallationRepository {
}
throw ServerAuthorizationException(
apiResponse.message ?? apiResponse.data,
result.message ?? result.data,
);
}
@ -547,13 +549,13 @@ class ServerInstallationRepository {
overrideDomain: serverDomain.domainName,
);
final String serverIp = await getServerIpFromDomain(serverDomain);
final ApiResponse<String> apiResponse = await serverApi.useRecoveryToken(
final GenericResult<String> result = await serverApi.useRecoveryToken(
DeviceToken(device: await getDeviceName(), token: recoveryKey),
);
if (apiResponse.success) {
if (result.success) {
return ServerHostingDetails(
apiToken: apiResponse.data,
apiToken: result.data,
volume: ServerVolume(
id: 0,
name: '',
@ -570,7 +572,7 @@ class ServerInstallationRepository {
}
throw ServerAuthorizationException(
apiResponse.message ?? apiResponse.data,
result.message ?? result.data,
);
}
@ -608,15 +610,15 @@ class ServerInstallationRepository {
);
}
}
final ApiResponse<String> deviceAuthKey =
final GenericResult<String> deviceAuthKey =
await serverApi.createDeviceToken();
final ApiResponse<String> apiResponse = await serverApi.authorizeDevice(
final GenericResult<String> result = await serverApi.authorizeDevice(
DeviceToken(device: await getDeviceName(), token: deviceAuthKey.data),
);
if (apiResponse.success) {
if (result.success) {
return ServerHostingDetails(
apiToken: apiResponse.data,
apiToken: result.data,
volume: ServerVolume(
id: 0,
name: '',
@ -633,7 +635,7 @@ class ServerInstallationRepository {
}
throw ServerAuthorizationException(
apiResponse.message ?? apiResponse.data,
result.message ?? result.data,
);
}

14
lib/logic/cubit/server_jobs/server_jobs_cubit.dart
View file

@ -1,5 +1,6 @@
import 'dart:async';
import 'package:easy_localization/easy_localization.dart';
import 'package:selfprivacy/config/get_it_config.dart';
import 'package:selfprivacy/logic/api_maps/graphql_maps/server_api/server.dart';
import 'package:selfprivacy/logic/cubit/app_config_dependent/authentication_dependend_cubit.dart';
@ -46,14 +47,14 @@ class ServerJobsCubit
Future<void> migrateToBinds(final Map<String, String> serviceToDisk) async {
final result = await api.migrateToBinds(serviceToDisk);
if (!result.success || result.jobUid == null) {
if (result.data == null) {
getIt<NavigationService>().showSnackBar(result.message!);
return;
}
emit(
ServerJobsState(
migrationJobUid: result.jobUid,
migrationJobUid: result.data,
),
);
}
@ -75,7 +76,13 @@ class ServerJobsCubit
Future<void> removeServerJob(final String uid) async {
final result = await api.removeApiJob(uid);
if (!result.success) {
getIt<NavigationService>().showSnackBar(result.message!);
getIt<NavigationService>().showSnackBar('jobs.generic_error'.tr());
return;
}
if (!result.data) {
getIt<NavigationService>()
.showSnackBar(result.message ?? 'jobs.generic_error'.tr());
return;
}
@ -87,7 +94,6 @@ class ServerJobsCubit
],
),
);
print('removed job $uid');
}
Future<void> removeAllFinishedJobs() async {

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

@ -1,5 +1,7 @@
import 'dart:async';
import 'package:easy_localization/easy_localization.dart';
import 'package:selfprivacy/config/get_it_config.dart';
import 'package:selfprivacy/logic/api_maps/graphql_maps/server_api/server.dart';
import 'package:selfprivacy/logic/cubit/app_config_dependent/authentication_dependend_cubit.dart';
import 'package:selfprivacy/logic/models/service.dart';
@ -39,7 +41,17 @@ class ServicesCubit extends ServerInstallationDependendCubit<ServicesState> {
Future<void> restart(final String serviceId) async {
emit(state.copyWith(lockedServices: [...state.lockedServices, serviceId]));
await api.restartService(serviceId);
final result = await api.restartService(serviceId);
if (!result.success) {
getIt<NavigationService>().showSnackBar('jobs.generic_error'.tr());
return;
}
if (!result.data) {
getIt<NavigationService>()
.showSnackBar(result.message ?? 'jobs.generic_error'.tr());
return;
}
await Future.delayed(const Duration(seconds: 2));
reload();
await Future.delayed(const Duration(seconds: 10));

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

@ -78,17 +78,16 @@ class UsersCubit extends ServerInstallationDependendCubit<UsersState> {
return;
}
// If API returned error, do nothing
final UserMutationResult result =
final GenericMutationResult<User?> result =
await api.createUser(user.login, password);
final User? createdUser = result.user;
if (!result.success || createdUser == null) {
if (result.data == null) {
getIt<NavigationService>()
.showSnackBar(result.message ?? 'users.could_not_create_user'.tr());
return;
}
final List<User> loadedUsers = List<User>.from(state.users);
loadedUsers.add(createdUser);
loadedUsers.add(result.data!);
await box.clear();
await box.addAll(loadedUsers);
emit(state.copyWith(users: loadedUsers));
@ -103,14 +102,20 @@ class UsersCubit extends ServerInstallationDependendCubit<UsersState> {
}
final List<User> loadedUsers = List<User>.from(state.users);
final GenericMutationResult result = await api.deleteUser(user.login);
if (result.success) {
if (result.success && result.data) {
loadedUsers.removeWhere((final User u) => u.login == user.login);
await box.clear();
await box.addAll(loadedUsers);
emit(state.copyWith(users: loadedUsers));
} else {
}
if (!result.success) {
getIt<NavigationService>().showSnackBar('jobs.generic_error'.tr());
}
if (!result.data) {
getIt<NavigationService>()
.showSnackBar(result.message ?? 'users.could_not_delete_user'.tr());
.showSnackBar(result.message ?? 'jobs.generic_error'.tr());
}
}
@ -123,9 +128,9 @@ class UsersCubit extends ServerInstallationDependendCubit<UsersState> {
.showSnackBar('users.could_not_change_password'.tr());
return;
}
final UserMutationResult result =
final GenericMutationResult<User?> result =
await api.updateUser(user.login, newPassword);
if (!result.success) {
if (result.data == null) {
getIt<NavigationService>().showSnackBar(
result.message ?? 'users.could_not_change_password'.tr(),
);
@ -133,10 +138,10 @@ class UsersCubit extends ServerInstallationDependendCubit<UsersState> {
}
Future<void> addSshKey(final User user, final String publicKey) async {
final UserMutationResult result =
final GenericMutationResult<User?> result =
await api.addSshKey(user.login, publicKey);
if (result.success) {
final User updatedUser = result.user!;
if (result.data != null) {
final User updatedUser = result.data!;
final int index =
state.users.indexWhere((final User u) => u.login == user.login);
await box.putAt(index, updatedUser);
@ -152,10 +157,10 @@ class UsersCubit extends ServerInstallationDependendCubit<UsersState> {
}
Future<void> deleteSshKey(final User user, final String publicKey) async {
final UserMutationResult result =
final GenericMutationResult<User?> result =
await api.removeSshKey(user.login, publicKey);
if (result.success) {
final User updatedUser = result.user!;
if (result.data != null) {
final User updatedUser = result.data!;
final int index =
state.users.indexWhere((final User u) => u.login == user.login);
await box.putAt(index, updatedUser);

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

@ -1,5 +1,5 @@
import 'package:json_annotation/json_annotation.dart';
import 'package:selfprivacy/logic/api_maps/graphql_maps/schema/services.graphql.dart';
import 'package:selfprivacy/logic/api_maps/graphql_maps/schema/schema.graphql.dart';
part 'dns_records.g.dart';
@ -15,7 +15,7 @@ class DnsRecord {
});
DnsRecord.fromGraphQL(
final Query$AllServices$services$allServices$dnsRecords record,
final Fragment$dnsRecordFields record,
) : this(
type: record.recordType,
name: record.name,

5
lib/logic/models/service.dart
View file

@ -23,7 +23,10 @@ class Service {
// Decode the base64 encoded svg icon to text.
svgIcon: utf8.decode(base64.decode(service.svgIcon)),
dnsRecords: service.dnsRecords
?.map((final record) => DnsRecord.fromGraphQL(record))
?.map(
(final Fragment$dnsRecordFields record) =>
DnsRecord.fromGraphQL(record),
)
.toList() ??
[],
url: service.url,

1
lib/ui/pages/dns_details/dns_details.dart
View file

@ -6,6 +6,7 @@ import 'package:selfprivacy/logic/cubit/dns_records/dns_records_cubit.dart';
import 'package:selfprivacy/ui/components/brand_cards/filled_card.dart';
import 'package:selfprivacy/ui/components/brand_hero_screen/brand_hero_screen.dart';
import 'package:selfprivacy/ui/components/brand_icons/brand_icons.dart';
import 'package:selfprivacy/utils/network_utils.dart';
class DnsDetailsPage extends StatefulWidget {
const DnsDetailsPage({super.key});

135
lib/utils/network_utils.dart Normal file
View file

@ -0,0 +1,135 @@
import 'package:selfprivacy/logic/models/json/dns_records.dart';
enum DnsRecordsCategory {
services,
email,
other,
}
class DesiredDnsRecord {
const DesiredDnsRecord({
required this.name,
required this.content,
this.type = 'A',
this.description = '',
this.category = DnsRecordsCategory.services,
this.isSatisfied = false,
});
final String name;
final String type;
final String content;
final String description;
final DnsRecordsCategory category;
final bool isSatisfied;
DesiredDnsRecord copyWith({
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,
description: description ?? this.description,
category: category ?? this.category,
isSatisfied: isSatisfied ?? this.isSatisfied,
);
}
List<DesiredDnsRecord> getDesiredDnsRecords(
final String? domainName,
final String? ipAddress,
final String? dkimPublicKey,
) {
if (domainName == null || ipAddress == null) {
return [];
}
return [
DesiredDnsRecord(
name: domainName,
content: ipAddress,
description: 'record.root',
),
DesiredDnsRecord(
name: 'api.$domainName',
content: ipAddress,
description: 'record.api',
),
DesiredDnsRecord(
name: 'cloud.$domainName',
content: ipAddress,
description: 'record.cloud',
),
DesiredDnsRecord(
name: 'git.$domainName',
content: ipAddress,
description: 'record.git',
),
DesiredDnsRecord(
name: 'meet.$domainName',
content: ipAddress,
description: 'record.meet',
),
DesiredDnsRecord(
name: 'social.$domainName',
content: ipAddress,
description: 'record.social',
),
DesiredDnsRecord(
name: 'password.$domainName',
content: ipAddress,
description: 'record.password',
),
DesiredDnsRecord(
name: 'vpn.$domainName',
content: ipAddress,
description: 'record.vpn',
),
DesiredDnsRecord(
name: domainName,
content: domainName,
description: 'record.mx',
type: 'MX',
category: DnsRecordsCategory.email,
),
DesiredDnsRecord(
name: '_dmarc.$domainName',
content: 'v=DMARC1; p=none',
description: 'record.dmarc',
type: 'TXT',
category: DnsRecordsCategory.email,
),
DesiredDnsRecord(
name: domainName,
content: 'v=spf1 a mx ip4:$ipAddress -all',
description: 'record.spf',
type: 'TXT',
category: DnsRecordsCategory.email,
),
if (dkimPublicKey != null)
DesiredDnsRecord(
name: 'selector._domainkey.$domainName',
content: dkimPublicKey,
description: 'record.dkim',
type: 'TXT',
category: DnsRecordsCategory.email,
),
];
}
DnsRecord? extractDkimRecord(final List<DnsRecord> records) {
DnsRecord? dkimRecord;
for (final DnsRecord record in records) {
if (record.type == 'TXT' && record.name == 'selector._domainkey') {
dkimRecord = record;
}
}
return dkimRecord;
}