introduces group/global usage & permissions, validates in endpoints and tests endpoints

src/endpoints/default.py

@@ -39,13 +39,21 @@ async def active(
     return {"active": user.active}
 
 
-# TODO: test
 @default_router.get("/user/permissions", summary="Get the user's global 'all' permissions and the permissions for each group they belong to.")
 def get_user_permissions(
     user: UserState = Depends(get_user_state),
 ) -> Dict[str, GroupPermissions]:
     return user.permissions
 
+@default_router.get("/user/usage", summary="Get the user's monthly URLs/MBs usage along with the total active sheets, breakdown by group.")
+def get_user_usage(
+    user: UserState = Depends(get_user_state),
+):
+    if not user.active:
+        raise HTTPException(status_code=403, detail="User is not active.")
+    return user.usage()
+    
+
 
 @default_router.get('/favicon.ico', include_in_schema=False)
 async def favicon():

src/endpoints/url.py

@@ -13,6 +13,7 @@ from db import crud, schemas
 from db.database import get_db_dependency
 
 from worker.main import create_archive_task
+from urllib.parse import urlparse
 
 url_router = APIRouter(prefix="/url", tags=["Single URL operations"])
 
@@ -25,14 +26,18 @@ def archive_url(
 ) -> schemas.Task:
     logger.info(f"new {archive.public=} task for {email=} and {archive.group_id=}: {archive.url}")
 
+    parsed_url = urlparse(archive.url)
+    if not all([parsed_url.scheme, parsed_url.netloc]):
+        raise HTTPException(status_code=400, detail="Invalid URL received.")
+
     if email != ALLOW_ANY_EMAIL:
         user = UserState(db, email)
-        if not user.has_quota_max_monthly_urls():
-            raise HTTPException(status_code=429, detail="User has reached their monthly URL quota.")
-        if not user.has_quota_max_monthly_mbs():
-            raise HTTPException(status_code=429, detail="User has reached their monthly MB quota.")
         if archive.group_id and not user.in_group(archive.group_id):
             raise HTTPException(status_code=403, detail="User does not have access to this group.")
+        if not user.has_quota_max_monthly_urls(archive.group_id):
+            raise HTTPException(status_code=429, detail="User has reached their monthly URL quota.")
+        if not user.has_quota_max_monthly_mbs(archive.group_id):
+            raise HTTPException(status_code=429, detail="User has reached their monthly MB quota.")
     
     # TODO: deprecate ArchiveCreate
     backwards_compatible_archive = schemas.ArchiveCreate(