Skip to content

Explicitly allow creation of MC without auth #249

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
uclaros merged 12 commits into from
Jul 16, 2025
Merged

Explicitly allow creation of MC without auth #249

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0018fd7
explicitly allow creation of MC without auth, do not try to check aut…
JanCaha Jul 10, 2025
f0be547
do not store _has_auth variable
JanCaha Jul 11, 2025
31e3899
handle kwargs here
JanCaha Jul 11, 2025
ea81940
do not check token in _do_request()
JanCaha Jul 11, 2025
e428182
use _check_token on functions that actually need user to have valid t…
JanCaha Jul 11, 2025
53a3380
fix test
JanCaha Jul 11, 2025
1c76fb2
make _check_token function more readable
JanCaha Jul 11, 2025
af43b8e
simplify login function to use API instead of custom logic
JanCaha Jul 11, 2025
db37a2e
use f-string here
JanCaha Jul 11, 2025
a1ce295
add test cases for validate_auth()
JanCaha Jul 11, 2025
b8af66d
function name refactor
JanCaha Jul 14, 2025
b5d7c14
drop decorator, add new parameter to _do_request()
JanCaha Jul 16, 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
10 changes: 7 additions & 3 deletions mergin/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,15 @@ def __init__(
proxy_config=None,
):
self.url = url if url is not None else MerginClient.default_url()
self._auth_params = None
self._auth_params = {}
self._auth_session = None
self._user_info = None
self._server_type = None
self._server_version = None
self.client_version = "Python-client/" + __version__
if plugin_version is not None: # this could be e.g. "Plugin/2020.1 QGIS/3.14"
self.client_version += " " + plugin_version
self._has_auth = auth_token is not None or login is not None or password is not None
self.setup_logging()
if auth_token:
try:
Expand Down Expand Up @@ -196,7 +197,10 @@ def _check_token(f):
"""Wrapper for creating/renewing authorization token."""

def wrapper(self, *args):
if self._auth_params:

# if user has not provided auth information (token or login/password) it does not make sense to try these checks
# the client without auth can still be used to access public information like server config
if self._has_auth:
if self._auth_session:
# Refresh auth token if it expired or will expire very soon
delta = self._auth_session["expire"] - datetime.now(timezone.utc)
Expand All @@ -209,7 +213,7 @@ def wrapper(self, *args):
raise AuthTokenExpiredError("Token has expired - please re-login")
else:
# Create a new authorization token
self.log.info(f"No token - login user: {self._auth_params['login']}")
self.log.info(f"No token - login user: {self._auth_params.get('login', None)}")
if self._auth_params.get("login", None) and self._auth_params.get("password", None):
self.login(self._auth_params["login"], self._auth_params["password"])
else:
Expand Down