From 9d62d3af8e69bc001b6a6d3c60cb80c95fef6702 Mon Sep 17 00:00:00 2001
From: NaiJi <naijiworld@protonmail.com>
Date: Fri, 9 Jun 2023 04:10:15 -0300
Subject: [PATCH] chore: Merge master into refactoring

---
 lib/logic/api_maps/rest_maps/backblaze.dart   |  6 +-
 .../server_installation_repository.dart       | 69 ++++++-------------
 pubspec.lock                                  |  8 ---
 pubspec.yaml                                  |  1 -
 4 files changed, 27 insertions(+), 57 deletions(-)

diff --git a/lib/logic/api_maps/rest_maps/backblaze.dart b/lib/logic/api_maps/rest_maps/backblaze.dart
index 6fe5cd8e..6ce8914e 100644
--- a/lib/logic/api_maps/rest_maps/backblaze.dart
+++ b/lib/logic/api_maps/rest_maps/backblaze.dart
@@ -30,7 +30,11 @@ class BackblazeApi extends ApiMap {
 
   @override
   BaseOptions get options {
-    final BaseOptions options = BaseOptions(baseUrl: rootAddress);
+    final BaseOptions options = BaseOptions(
+      baseUrl: rootAddress,
+      contentType: Headers.jsonContentType,
+      responseType: ResponseType.json,
+    );
     if (isWithToken) {
       final BackblazeCredential? backblazeCredential =
           getIt<ApiConfigModel>().backblazeCredential;
diff --git a/lib/logic/cubit/server_installation/server_installation_repository.dart b/lib/logic/cubit/server_installation/server_installation_repository.dart
index 9444718e..a9122b33 100644
--- a/lib/logic/cubit/server_installation/server_installation_repository.dart
+++ b/lib/logic/cubit/server_installation/server_installation_repository.dart
@@ -1,7 +1,6 @@
 import 'dart:async';
 import 'dart:io';
 
-import 'package:basic_utils/basic_utils.dart';
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:dio/dio.dart';
 import 'package:easy_localization/easy_localization.dart';
@@ -20,7 +19,6 @@ 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/message.dart';
 import 'package:selfprivacy/logic/models/server_basic_info.dart';
 import 'package:selfprivacy/logic/models/server_type.dart';
 import 'package:selfprivacy/logic/providers/providers_controller.dart';
@@ -187,46 +185,20 @@ class ServerInstallationRepository {
     final String? ip4,
     final Map<String, bool> skippedMatches,
   ) async {
-    final List<String> addresses = <String>[
-      '$domainName',
-      'api.$domainName',
-      'cloud.$domainName',
-      'meet.$domainName',
-      'password.$domainName'
-    ];
-
     final Map<String, bool> matches = <String, bool>{};
-
-    for (final String address in addresses) {
-      if (skippedMatches[address] ?? false) {
-        matches[address] = true;
-        continue;
-      }
-      final List<RRecord>? lookupRecordRes = await DnsUtils.lookupRecord(
-        address,
-        RRecordType.A,
-        provider: DnsApiProvider.CLOUDFLARE,
-      );
-      getIt.get<ConsoleModel>().addMessage(
-            Message(
-              text:
-                  'DnsLookup: address: $address, $RRecordType, provider: CLOUDFLARE, ip4: $ip4',
-            ),
-          );
-      getIt.get<ConsoleModel>().addMessage(
-            Message(
-              text:
-                  'DnsLookup: ${lookupRecordRes == null ? 'empty' : (lookupRecordRes[0].data != ip4 ? 'wrong ip4' : 'right ip4')}',
-            ),
-          );
-      if (lookupRecordRes == null ||
-          lookupRecordRes.isEmpty ||
-          lookupRecordRes[0].data != ip4) {
-        matches[address] = false;
-      } else {
-        matches[address] = true;
-      }
-    }
+    await InternetAddress.lookup(domainName!).then(
+      (final records) {
+        for (final record in records) {
+          if (skippedMatches[record.host] ?? false) {
+            matches[record.host] = true;
+            continue;
+          }
+          if (record.address == ip4!) {
+            matches[record.host] = true;
+          }
+        }
+      },
+    );
 
     return matches;
   }
@@ -351,15 +323,18 @@ class ServerInstallationRepository {
   }
 
   Future<String> getServerIpFromDomain(final ServerDomain serverDomain) async {
-    final List<RRecord>? lookup = await DnsUtils.lookupRecord(
-      serverDomain.domainName,
-      RRecordType.A,
-      provider: DnsApiProvider.CLOUDFLARE,
+    String? domain;
+    await InternetAddress.lookup(serverDomain.domainName).then(
+      (final records) {
+        for (final record in records) {
+          domain = record.address;
+        }
+      },
     );
-    if (lookup == null || lookup.isEmpty) {
+    if (domain == null || domain!.isEmpty) {
       throw IpNotFoundException('No IP found for domain $serverDomain');
     }
-    return lookup[0].data;
+    return domain!;
   }
 
   Future<String> getDeviceName() async {
diff --git a/pubspec.lock b/pubspec.lock
index bd81200b..d812a890 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -73,14 +73,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.0"
-  basic_utils:
-    dependency: "direct main"
-    description:
-      name: basic_utils
-      sha256: "8815477fcf58499e42326bd858e391442425fa57db9a45e48e15224c62049262"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.5.4"
   bloc:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index b0554aba..4e5e35d7 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -11,7 +11,6 @@ dependencies:
   animations: ^2.0.7
   auto_route: ^7.3.2
   auto_size_text: ^3.0.0
-  basic_utils: ^5.5.4
   crypt: ^4.3.0
   cubit_form: ^2.0.1
   device_info_plus: ^9.0.2