changes to make it work with master

Author: JanCaha

Mergin/plugin.py

@@ -71,7 +71,7 @@
     create_mergin_client,
     MissingAuthConfigError,
     AuthTokenExpiredError,
-    get_stored_mergin_server_url,
+    set_qgsexpressionscontext,
 )
 from .mergin.utils import int_version, is_versioned_file
 from .mergin.merginproject import MerginProject
@@ -319,17 +319,12 @@ def configure(self):
         if dlg.exec():
             try:
                 self.mc = create_mergin_client()
+                set_qgsexpressionscontext(dlg.server_url(), mc=self.mc)
             except (MissingAuthConfigError, AuthTokenExpiredError, ClientError, ValueError) as e:
                 QMessageBox.critical(None, "Login failed", f"Could not login: {str(e)}")
-                QgsExpressionContextUtils.removeGlobalVariable("mergin_username")
+                set_qgsexpressionscontext(dlg.server_url(), mc=None)
                 return
 
-            QgsExpressionContextUtils.setGlobalVariable("mergin_url", get_stored_mergin_server_url())
-            if self.mc:
-                QgsExpressionContextUtils.setGlobalVariable("mergin_username", self.mc.username())
-            else:
-                QgsExpressionContextUtils.removeGlobalVariable("mergin_username")
-
             self.on_config_changed()
             self.show_browser_panel()
 

Mergin/utils.py

@@ -1139,28 +1139,6 @@ def get_primary_keys(layer):
         return cols
 
 
-def test_server_connection(url, username, password):
-    """
-    Test connection to Mergin Maps server. This includes check for valid server URL
-    and user credentials correctness.
-    """
-    err_msg = validate_mergin_url(url)
-    if err_msg:
-        msg = f"<font color=red>{err_msg}</font>"
-        QgsApplication.messageLog().logMessage(f"Mergin Maps plugin: {err_msg}")
-        return False, msg
-
-    result = True, "<font color=green> OK </font>"
-    proxy_config = get_qgis_proxy_config(url)
-    try:
-        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>"
-
-    return result
-
-
 def is_dark_theme():
     """
     Checks whether dark theme is used:

Mergin/utils_auth.py

@@ -5,11 +5,17 @@
 from urllib.error import URLError
 import requests
 
-from qgis.core import QgsApplication, QgsAuthMethodConfig, QgsBlockingNetworkRequest, QgsNetworkAccessManager
+from qgis.core import (
+    QgsApplication,
+    QgsAuthMethodConfig,
+    QgsBlockingNetworkRequest,
+    QgsNetworkAccessManager,
+    QgsExpressionContextUtils,
+)
 from qgis.PyQt.QtCore import QSettings, QUrl
 from qgis.PyQt.QtNetwork import QNetworkRequest
 
-from .mergin.client import LoginType, MerginClient, AuthTokenExpiredError
+from .mergin.client import LoginType, MerginClient, AuthTokenExpiredError, ServerType
 from .mergin.common import ClientError, LoginError
 
 from .utils import MERGIN_URL, get_qgis_proxy_config, get_plugin_version
@@ -325,7 +331,7 @@ def test_server_connection(
     password: typing.Optional[str] = None,
     use_sso: bool = False,
     sso_email: typing.Optional[str] = None,
-):
+) -> typing.Tuple[bool, str]:
     """
     Test connection to Mergin Maps server. This includes check for valid server URL
     and user credentials correctness.
@@ -423,3 +429,47 @@ def sso_ask_for_email(url: str) -> typing.Tuple[bool, typing.Optional[str]]:
         return True, None
 
     return False, None
+
+
+def set_qgsexpressionscontext(url: str, mc: typing.Optional[MerginClient] = None):
+    QgsExpressionContextUtils.setGlobalVariable("mergin_url", url)
+    QgsExpressionContextUtils.setGlobalVariable("mm_url", url)
+    if mc:
+        # username can be username or email, so we fetch it from api
+        user_info = mc.user_info()
+        username = user_info["username"]
+        user_email = user_info["email"]
+        user_full_name = user_info["name"]
+        settings = QSettings()
+        settings.setValue("Mergin/username", username)
+        settings.setValue("Mergin/user_email", user_email)
+        settings.setValue("Mergin/full_name", user_full_name)
+        QgsExpressionContextUtils.setGlobalVariable("mergin_username", username)
+        QgsExpressionContextUtils.setGlobalVariable("mergin_user_email", user_email)
+        QgsExpressionContextUtils.setGlobalVariable("mergin_full_name", user_full_name)
+        QgsExpressionContextUtils.setGlobalVariable("mm_username", username)
+        QgsExpressionContextUtils.setGlobalVariable("mm_user_email", user_email)
+        QgsExpressionContextUtils.setGlobalVariable("mm_full_name", user_full_name)
+    else:
+        QgsExpressionContextUtils.removeGlobalVariable("mergin_username")
+        QgsExpressionContextUtils.removeGlobalVariable("mergin_user_email")
+        QgsExpressionContextUtils.removeGlobalVariable("mergin_full_name")
+        QgsExpressionContextUtils.removeGlobalVariable("mm_username")
+        QgsExpressionContextUtils.removeGlobalVariable("mm_user_email")
+        QgsExpressionContextUtils.removeGlobalVariable("mm_full_name")
+
+
+def mergin_server_deprecated_version(url: str) -> bool:
+    mc = MerginClient(
+        url=url,
+        auth_token=None,
+        login=None,
+        password=None,
+        plugin_version=get_plugin_version(),
+        proxy_config=get_qgis_proxy_config(url),
+    )
+
+    if mc.server_type() == ServerType.OLD:
+        return True
+
+    return False