mirror of
https://github.com/Lyxminxx/jast-frontend.git
synced 2026-10-11 20:57:44 +02:00
fixed login finally
This commit is contained in:
Lyxminxx committed
1 parent
f0094826e7
commit
e07036acf4
10 files changed
+118
-220
No files matched your search
+48
-138
@@ -1,25 +1,23 @@
|
||||
import httpx
|
||||
from services.storage import get_setting, remove_setting, save_setting
|
||||
|
||||
class ApiClient:
|
||||
def __init__(self, timeout: float = 10.0):
|
||||
def __init__(self, storage, timeout: float = 10.0):
|
||||
self.storage = storage
|
||||
self.timeout = timeout
|
||||
|
||||
@property
|
||||
def base_url(self) -> str | None:
|
||||
return get_setting("server_url")
|
||||
return self.storage.get_setting("server_url")
|
||||
|
||||
def get_headers(self) -> dict[str, str]:
|
||||
headers = {"Content-Type": "application/json"}
|
||||
token = get_setting("auth_token")
|
||||
token = self.storage.get_setting("auth_token")
|
||||
if token:
|
||||
headers["Authorization"] = f"Bearer {token}"
|
||||
return headers
|
||||
|
||||
def get_me(self) -> tuple[bool, dict | str]:
|
||||
"""Fetches profile info for current authenticated user."""
|
||||
if not self.base_url:
|
||||
return False, "Server URL is not configured."
|
||||
if not self.base_url: return False, "Server URL is not configured."
|
||||
try:
|
||||
with httpx.Client(timeout=self.timeout) as client:
|
||||
res = client.get(f"{self.base_url}/auth/me", headers=self.get_headers())
|
||||
@@ -30,22 +28,18 @@ class ApiClient:
|
||||
return False, str(err)
|
||||
|
||||
def get_categories(self) -> tuple[bool, list]:
|
||||
"""Fetches available categories from Django Ninja."""
|
||||
if not self.base_url:
|
||||
return False, []
|
||||
if not self.base_url: return False, []
|
||||
try:
|
||||
with httpx.Client(timeout=self.timeout) as client:
|
||||
res = client.get(f"{self.base_url}/categories", headers=self.get_headers())
|
||||
if res.status_code == 200:
|
||||
return True, res.json()
|
||||
return False, []
|
||||
except Exception as err:
|
||||
except Exception:
|
||||
return False, []
|
||||
|
||||
def get_transactions(self) -> tuple[bool, list | str]:
|
||||
"""Fetches transactions list from Django Ninja."""
|
||||
if not self.base_url:
|
||||
return False, "Server URL is not configured."
|
||||
if not self.base_url: return False, "Server URL is not configured."
|
||||
try:
|
||||
with httpx.Client(timeout=self.timeout) as client:
|
||||
res = client.get(f"{self.base_url}/transactions", headers=self.get_headers())
|
||||
@@ -55,142 +49,81 @@ class ApiClient:
|
||||
except Exception as err:
|
||||
return False, str(err)
|
||||
|
||||
def create_transaction(
|
||||
self, title: str, amount: str | float, date_str: str, category_id: int | None = None
|
||||
) -> tuple[bool, str]:
|
||||
"""Posts a new transaction."""
|
||||
if not self.base_url:
|
||||
return False, "Server URL is not configured."
|
||||
payload = {
|
||||
"title": title,
|
||||
"amount": str(amount),
|
||||
"date": date_str,
|
||||
"category_id": category_id,
|
||||
}
|
||||
def create_transaction(self, title: str, amount: str | float, date_str: str, category_id: int | None = None) -> tuple[bool, str]:
|
||||
if not self.base_url: return False, "Server URL is not configured."
|
||||
payload = {"title": title, "amount": str(amount), "date": date_str, "category_id": category_id}
|
||||
try:
|
||||
with httpx.Client(timeout=self.timeout) as client:
|
||||
res = client.post(
|
||||
f"{self.base_url}/transactions",
|
||||
json=payload,
|
||||
headers=self.get_headers(),
|
||||
)
|
||||
if res.status_code == 200:
|
||||
return True, "Transaction created"
|
||||
res = client.post(f"{self.base_url}/transactions", json=payload, headers=self.get_headers())
|
||||
if res.status_code == 200: return True, "Transaction created"
|
||||
return False, f"Error creating transaction ({res.status_code})"
|
||||
except Exception as err:
|
||||
return False, str(err)
|
||||
|
||||
def update_transaction(
|
||||
self, transaction_id: int, title: str, amount: str | float, date_str: str, category_id: int | None = None
|
||||
) -> tuple[bool, str]:
|
||||
"""Updates an existing transaction by ID."""
|
||||
if not self.base_url:
|
||||
return False, "Server URL is not configured."
|
||||
payload = {
|
||||
"title": title,
|
||||
"amount": str(amount),
|
||||
"date": date_str,
|
||||
"category_id": category_id,
|
||||
}
|
||||
def update_transaction(self, transaction_id: int, title: str, amount: str | float, date_str: str, category_id: int | None = None) -> tuple[bool, str]:
|
||||
if not self.base_url: return False, "Server URL is not configured."
|
||||
payload = {"title": title, "amount": str(amount), "date": date_str, "category_id": category_id}
|
||||
try:
|
||||
with httpx.Client(timeout=self.timeout) as client:
|
||||
res = client.put(
|
||||
f"{self.base_url}/transactions/{transaction_id}",
|
||||
json=payload,
|
||||
headers=self.get_headers(),
|
||||
)
|
||||
if res.status_code == 200:
|
||||
return True, "Transaction updated"
|
||||
res = client.put(f"{self.base_url}/transactions/{transaction_id}", json=payload, headers=self.get_headers())
|
||||
if res.status_code == 200: return True, "Transaction updated"
|
||||
return False, f"Error updating transaction ({res.status_code})"
|
||||
except Exception as err:
|
||||
return False, str(err)
|
||||
|
||||
def delete_transaction(self, transaction_id: int) -> tuple[bool, str]:
|
||||
"""Deletes a transaction by ID."""
|
||||
if not self.base_url:
|
||||
return False, "Server URL is not configured."
|
||||
if not self.base_url: return False, "Server URL is not configured."
|
||||
try:
|
||||
with httpx.Client(timeout=self.timeout) as client:
|
||||
res = client.delete(
|
||||
f"{self.base_url}/transactions/{transaction_id}",
|
||||
headers=self.get_headers(),
|
||||
)
|
||||
if res.status_code == 200:
|
||||
return True, "Transaction deleted"
|
||||
res = client.delete(f"{self.base_url}/transactions/{transaction_id}", headers=self.get_headers())
|
||||
if res.status_code == 200: return True, "Transaction deleted"
|
||||
return False, f"Error deleting transaction ({res.status_code})"
|
||||
except Exception as err:
|
||||
return False, str(err)
|
||||
|
||||
def login(self, username: str, password: str) -> tuple[bool, str]:
|
||||
if not self.base_url:
|
||||
return False, "Server URL is not configured."
|
||||
if not self.base_url: return False, "Server URL is not configured."
|
||||
try:
|
||||
with httpx.Client(timeout=self.timeout) as client:
|
||||
response = client.post(
|
||||
f"{self.base_url}/auth/login",
|
||||
json={"username": username, "password": password},
|
||||
)
|
||||
response = client.post(f"{self.base_url}/auth/login", json={"username": username, "password": password})
|
||||
if response.status_code == 200:
|
||||
data = response.json()
|
||||
save_setting("auth_token", data.get("access_token"))
|
||||
self.storage.save_setting("auth_token", data.get("access_token"))
|
||||
if data.get("refresh_token"):
|
||||
save_setting("refresh_token", data.get("refresh_token"))
|
||||
self.storage.save_setting("refresh_token", data.get("refresh_token"))
|
||||
return True, "Login successful"
|
||||
return False, "Invalid username or password"
|
||||
except Exception as err:
|
||||
return False, str(err)
|
||||
|
||||
def logout(self) -> None:
|
||||
remove_setting("auth_token")
|
||||
remove_setting("refresh_token")
|
||||
self.storage.remove_setting("auth_token")
|
||||
self.storage.remove_setting("refresh_token")
|
||||
|
||||
def update_me(
|
||||
self,
|
||||
username: str | None = None,
|
||||
email: str | None = None,
|
||||
first_name: str | None = None,
|
||||
last_name: str | None = None,
|
||||
password: str | None = None,
|
||||
) -> tuple[bool, dict | str]:
|
||||
"""Updates profile details for the authenticated user."""
|
||||
if not self.base_url:
|
||||
return False, "Server URL is not configured."
|
||||
def update_me(self, username: str | None = None, email: str | None = None, first_name: str | None = None, last_name: str | None = None, password: str | None = None) -> tuple[bool, dict | str]:
|
||||
if not self.base_url: return False, "Server URL is not configured."
|
||||
payload = {}
|
||||
if username:
|
||||
payload["username"] = username
|
||||
if email is not None:
|
||||
payload["email"] = email
|
||||
if first_name is not None:
|
||||
payload["first_name"] = first_name
|
||||
if last_name is not None:
|
||||
payload["last_name"] = last_name
|
||||
if password:
|
||||
payload["password"] = password
|
||||
if username: payload["username"] = username
|
||||
if email is not None: payload["email"] = email
|
||||
if first_name is not None: payload["first_name"] = first_name
|
||||
if last_name is not None: payload["last_name"] = last_name
|
||||
if password: payload["password"] = password
|
||||
|
||||
try:
|
||||
with httpx.Client(timeout=self.timeout) as client:
|
||||
res = client.put(
|
||||
f"{self.base_url}/auth/me",
|
||||
json=payload,
|
||||
headers=self.get_headers(),
|
||||
)
|
||||
res = client.put(f"{self.base_url}/auth/me", json=payload, headers=self.get_headers())
|
||||
if res.status_code == 200:
|
||||
try:
|
||||
return True, res.json()
|
||||
except Exception:
|
||||
return True, {}
|
||||
try: return True, res.json()
|
||||
except Exception: return True, {}
|
||||
try:
|
||||
err_json = res.json()
|
||||
return False, err_json.get("detail", f"Update failed ({res.status_code})")
|
||||
return False, res.json().get("detail", f"Update failed ({res.status_code})")
|
||||
except Exception:
|
||||
return False, f"Update failed ({res.status_code}): {res.text}"
|
||||
except Exception as err:
|
||||
return False, str(err)
|
||||
|
||||
def delete_me(self) -> tuple[bool, str]:
|
||||
"""Deletes the current user account."""
|
||||
if not self.base_url:
|
||||
return False, "Server URL is not configured."
|
||||
if not self.base_url: return False, "Server URL is not configured."
|
||||
try:
|
||||
with httpx.Client(timeout=self.timeout) as client:
|
||||
res = client.delete(f"{self.base_url}/auth/me", headers=self.get_headers())
|
||||
@@ -200,45 +133,22 @@ class ApiClient:
|
||||
return False, "Failed to delete account."
|
||||
except Exception as err:
|
||||
return False, str(err)
|
||||
|
||||
def register(
|
||||
self,
|
||||
username: str,
|
||||
password: str,
|
||||
email: str | None = None,
|
||||
first_name: str | None = None,
|
||||
last_name: str | None = None,
|
||||
) -> tuple[bool, str]:
|
||||
"""Registers a new user account and saves the auth tokens."""
|
||||
if not self.base_url:
|
||||
return False, "Server URL is not configured."
|
||||
payload = {
|
||||
"username": username,
|
||||
"password": password,
|
||||
"email": email or "",
|
||||
"first_name": first_name or "",
|
||||
"last_name": last_name or "",
|
||||
}
|
||||
|
||||
def register(self, username: str, password: str, email: str | None = None, first_name: str | None = None, last_name: str | None = None) -> tuple[bool, str]:
|
||||
if not self.base_url: return False, "Server URL is not configured."
|
||||
payload = {"username": username, "password": password, "email": email or "", "first_name": first_name or "", "last_name": last_name or ""}
|
||||
try:
|
||||
with httpx.Client(timeout=self.timeout) as client:
|
||||
res = client.post(
|
||||
f"{self.base_url}/auth/register",
|
||||
json=payload,
|
||||
)
|
||||
res = client.post(f"{self.base_url}/auth/register", json=payload)
|
||||
if res.status_code == 200:
|
||||
data = res.json()
|
||||
save_setting("auth_token", data.get("access_token"))
|
||||
self.storage.save_setting("auth_token", data.get("access_token"))
|
||||
if data.get("refresh_token"):
|
||||
save_setting("refresh_token", data.get("refresh_token"))
|
||||
self.storage.save_setting("refresh_token", data.get("refresh_token"))
|
||||
return True, "Registration successful"
|
||||
|
||||
try:
|
||||
err_detail = res.json().get("detail", "Registration failed")
|
||||
except Exception:
|
||||
err_detail = f"Registration failed ({res.status_code})"
|
||||
try: err_detail = res.json().get("detail", "Registration failed")
|
||||
except: err_detail = f"Registration failed ({res.status_code})"
|
||||
return False, err_detail
|
||||
except Exception as err:
|
||||
return False, str(err)
|
||||
api_client = ApiClient()
|
||||
|
||||
|
||||
Reference in new issue
Block a user