Skip to content

Remove deprecated server validation use #648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tomasMizera merged 3 commits into from
Jan 10, 2025
Merged

Remove deprecated server validation use #648

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2193e07
Remove deprecated server validation use
tomasMizera Nov 29, 2024
9128658
Update Mergin/utils.py
tomasMizera Jan 9, 2025
4d37a0f
Update utils.py
tomasMizera Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions Mergin/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,14 +399,13 @@ def send_logs(username, logfile):

def validate_mergin_url(url):
"""
Validation of mergin URL by pinging. Checks if URL points at compatible Mergin server.
Initiates connection to the provided server URL to check if the server is accessible
:param url: String Mergin Maps URL to ping.
:return: String error message as result of validation. If None, URL is valid.
"""
try:
mc = MerginClient(url, proxy_config=get_qgis_proxy_config(url))
if not mc.is_server_compatible():
return "Incompatible Mergin Maps server"
MerginClient(url, proxy_config=get_qgis_proxy_config(url))

# Valid but not Mergin URl
except ClientError:
return "Invalid Mergin Maps URL"
Expand Down Expand Up @@ -1223,7 +1222,7 @@ def test_server_connection(url, username, password):
result = True, "<font color=green> OK </font>"
proxy_config = get_qgis_proxy_config(url)
try:
mc = MerginClient(url, None, username, password, get_plugin_version(), proxy_config)
MerginClient(url, None, username, password, get_plugin_version(), proxy_config)
except (LoginError, ClientError) as e:
QgsApplication.messageLog().logMessage(f"Mergin Maps plugin: {str(e)}")
result = False, f"<font color=red> Connection failed, {str(e)} </font>"
Expand Down
Loading