luckyimnotanigger/adguard-home-manager
1
0
Fork 0
mirror of https://github.com/JGeek00/adguard-home-manager.git synced 2025-04-25 08:16:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed port wrong place

Browse source
This commit is contained in:
Juan Gilsanz Polo 2022-12-06 02:26:45 +01:00
parent 3dcf30ad75
commit 6dd133db0f
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/services/http_requests.dart
View file

@ -29,10 +29,11 @@ Future<Map<String, dynamic>> apiRequest({
required String type, required String type,
bool? overrideTimeout, bool? overrideTimeout,
}) async { }) async {
final String connectionString = "${server.connectionMethod}://${server.domain}${server.port != null ? ':${server.port}' : ""}${server.path ?? ""}/control$urlPath";
try { try {
HttpClient httpClient = HttpClient(); HttpClient httpClient = HttpClient();
if (method == 'get') { if (method == 'get') {
HttpClientRequest request = await httpClient.getUrl(Uri.parse("${server.connectionMethod}://${server.domain}${server.path ?? ""}${server.port != null ? ':${server.port}' : ""}/control$urlPath")); HttpClientRequest request = await httpClient.getUrl(Uri.parse(connectionString));
request.headers.set('Authorization', 'Basic ${server.authToken}'); request.headers.set('Authorization', 'Basic ${server.authToken}');
HttpClientResponse response = overrideTimeout == true HttpClientResponse response = overrideTimeout == true
? await request.close() ? await request.close()
@ -57,7 +58,7 @@ Future<Map<String, dynamic>> apiRequest({
} }
} }
else if (method == 'post') { else if (method == 'post') {
HttpClientRequest request = await httpClient.postUrl(Uri.parse("${server.connectionMethod}://${server.domain}${server.path ?? ""}${server.port != null ? ':${server.port}' : ""}/control$urlPath")); HttpClientRequest request = await httpClient.postUrl(Uri.parse(connectionString));
request.headers.set('Authorization', 'Basic ${server.authToken}'); request.headers.set('Authorization', 'Basic ${server.authToken}');
request.headers.set('content-type', 'application/json'); request.headers.set('content-type', 'application/json');
request.add(utf8.encode(json.encode(body))); request.add(utf8.encode(json.encode(body)));

3
lib/widgets/add_server_modal.dart
View file

@ -12,7 +12,6 @@ import 'package:adguard_home_manager/services/http_requests.dart';
import 'package:adguard_home_manager/models/app_log.dart'; import 'package:adguard_home_manager/models/app_log.dart';
import 'package:adguard_home_manager/providers/servers_provider.dart'; import 'package:adguard_home_manager/providers/servers_provider.dart';
import 'package:adguard_home_manager/models/server.dart'; import 'package:adguard_home_manager/models/server.dart';
import 'package:adguard_home_manager/config/system_overlay_style.dart';
class AddServerModal extends StatefulWidget { class AddServerModal extends StatefulWidget {
final Server? server; final Server? server;
@ -528,7 +527,7 @@ class _AddServerModalState extends State<AddServerModal> {
) )
), ),
child: Text( child: Text(
"$connectionType://${ipDomainController.text}${pathController.text}${portController.text != '' ? ':${portController.text}' : ""}", "$connectionType://${ipDomainController.text}${portController.text != '' ? ':${portController.text}' : ""}${pathController.text}",
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
color: Theme.of(context).primaryColor, color: Theme.of(context).primaryColor,