mirror of
				https://github.com/inventree/inventree-app.git
				synced 2025-11-03 23:05:44 +00:00 
			
		
		
		
	Check for malformed URLs and display correct error message
This commit is contained in:
		@@ -4,6 +4,7 @@
 | 
				
			|||||||
### 0.1.6 - May 2021
 | 
					### 0.1.6 - May 2021
 | 
				
			||||||
---
 | 
					---
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- Display error message for improperly formatted server address
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
### 0.1.5 - May 2021
 | 
					### 0.1.5 - May 2021
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										35
									
								
								lib/api.dart
									
									
									
									
									
								
							
							
						
						
									
										35
									
								
								lib/api.dart
									
									
									
									
									
								
							@@ -421,14 +421,22 @@ class InvenTreeAPI {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    print("PATCH: " + _url);
 | 
					    print("PATCH: " + _url);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    final uri = Uri.parse(_url);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // Check for invalid host
 | 
				
			||||||
 | 
					    if (uri.host.isEmpty) {
 | 
				
			||||||
 | 
					      showServerError(L10().invalidHost, L10().invalidHostDetails);
 | 
				
			||||||
 | 
					      return null;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    var client = createClient(true);
 | 
					    var client = createClient(true);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // Open a connection to the server
 | 
					    // Open a connection to the server
 | 
				
			||||||
    HttpClientRequest request = await client.patchUrl(Uri.parse(_url))
 | 
					    HttpClientRequest request = await client.patchUrl(uri)
 | 
				
			||||||
    .timeout(Duration(seconds: 10))
 | 
					    .timeout(Duration(seconds: 10))
 | 
				
			||||||
    .catchError((error) {
 | 
					    .catchError((error) {
 | 
				
			||||||
      print("PATCH request return error");
 | 
					      print("PATCH request return error");
 | 
				
			||||||
      print("URL: ${_url}");
 | 
					      print("URL: ${uri}");
 | 
				
			||||||
      print("Error: ${error.toString()}");
 | 
					      print("Error: ${error.toString()}");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      var ctx = OneContext().context;
 | 
					      var ctx = OneContext().context;
 | 
				
			||||||
@@ -541,12 +549,19 @@ class InvenTreeAPI {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    var client = createClient(true);
 | 
					    var client = createClient(true);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    final uri = Uri.parse(_url);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (uri.host.isEmpty) {
 | 
				
			||||||
 | 
					      showServerError(L10().invalidHost, L10().invalidHostDetails);
 | 
				
			||||||
 | 
					      return null;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // Open a connection to the server
 | 
					    // Open a connection to the server
 | 
				
			||||||
    HttpClientRequest request = await client.postUrl(Uri.parse(_url))
 | 
					    HttpClientRequest request = await client.postUrl(uri)
 | 
				
			||||||
    .timeout(Duration(seconds: 10))
 | 
					    .timeout(Duration(seconds: 10))
 | 
				
			||||||
    .catchError((error) {
 | 
					    .catchError((error) {
 | 
				
			||||||
      print("POST request returned error");
 | 
					      print("POST request returned error");
 | 
				
			||||||
      print("URL: ${_url}");
 | 
					      print("URL: ${uri}");
 | 
				
			||||||
      print("Error: ${error.toString()}");
 | 
					      print("Error: ${error.toString()}");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      var ctx = OneContext().context;
 | 
					      var ctx = OneContext().context;
 | 
				
			||||||
@@ -679,12 +694,20 @@ class InvenTreeAPI {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    var client = createClient(true);
 | 
					    var client = createClient(true);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    final uri = Uri.parse(_url);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // Check for invalid host
 | 
				
			||||||
 | 
					    if (uri.host.isEmpty) {
 | 
				
			||||||
 | 
					      showServerError(L10().invalidHost, L10().invalidHostDetails);
 | 
				
			||||||
 | 
					      return null;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // Open a connection
 | 
					    // Open a connection
 | 
				
			||||||
    HttpClientRequest request = await client.getUrl(Uri.parse(_url))
 | 
					    HttpClientRequest request = await client.getUrl(uri)
 | 
				
			||||||
        .timeout(Duration(seconds: 10))
 | 
					        .timeout(Duration(seconds: 10))
 | 
				
			||||||
        .catchError((error) {
 | 
					        .catchError((error) {
 | 
				
			||||||
      print("GET request returned error");
 | 
					      print("GET request returned error");
 | 
				
			||||||
      print("URL: ${_url}");
 | 
					      print("URL: ${uri}");
 | 
				
			||||||
      print("Error: ${error.toString()}");
 | 
					      print("Error: ${error.toString()}");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      var ctx = OneContext().context;
 | 
					      var ctx = OneContext().context;
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user