fix: api tests

2024-10-17 10:37:46 +02:00
parent 4361fc7cc2
commit 4aae00c4fa
8 changed files with 99 additions and 107 deletions
@@ -255,7 +255,8 @@ async def test_register_email_twice(http_client: AsyncClient):
            "email": f"u21.{tiny_id}@lnbits.com",
        },
    )
-    assert response.status_code == 403, "Not allowed."
+
+    assert response.status_code == 400, "Not allowed."
    assert response.json().get("detail") == "Email already exists."


@@ -285,7 +286,7 @@ async def test_register_username_twice(http_client: AsyncClient):
            "email": f"u21.{tiny_id_2}@lnbits.com",
        },
    )
-    assert response.status_code == 403, "Not allowed."
+    assert response.status_code == 400, "Not allowed."
    assert response.json().get("detail") == "Username already exists."


@@ -414,8 +415,8 @@ async def test_alan_change_password_old_nok(user_alan: User, http_client: AsyncC
        },
    )

-    assert response.status_code == 403, "Old password bad."
-    assert response.json().get("detail") == "Invalid credentials."
+    assert response.status_code == 400, "Old password bad."
+    assert response.json().get("detail") == "Invalid old password."


@pytest.mark.asyncio
@@ -469,7 +470,7 @@ async def test_alan_change_password_auth_threshold_expired(
        },
    )

-    assert response.status_code == 403, "Treshold expired."
+    assert response.status_code == 400
    assert (
        response.json().get("detail") == "You can only update your credentials"
        " in the first 1 seconds."
@@ -507,6 +508,7 @@ async def test_register_nostr_ok(http_client: AsyncClient):
    response = await http_client.get(
        "/api/v1/auth", headers={"Authorization": f"Bearer {access_token}"}
    )
+
    user = User(**response.json())
    assert user.username is None, "No username."
    assert user.email is None, "No email."
@@ -547,13 +549,13 @@ async def test_register_nostr_bad_header(http_client: AsyncClient):
    )

    assert response.status_code == 401, "Non nostr header."
-    assert response.json().get("detail") == "Authorization header is not nostr."
+    assert response.json().get("detail") == "Invalid Authorization scheme."

    response = await http_client.post(
        "/api/v1/auth/nostr",
        headers={"Authorization": "nostr xyz"},
    )
-    assert response.status_code == 401, "Nostr not base64."
+    assert response.status_code == 400, "Nostr not base64."
    assert response.json().get("detail") == "Nostr login event cannot be parsed."


@@ -565,7 +567,7 @@ async def test_register_nostr_bad_event(http_client: AsyncClient):
        "/api/v1/auth/nostr",
        headers={"Authorization": f"nostr {base64_event}"},
    )
-    assert response.status_code == 401, "Nostr event expired."
+    assert response.status_code == 400, "Nostr event expired."
    assert (
        response.json().get("detail")
        == f"More than {settings.auth_credetials_update_threshold}"
@@ -581,7 +583,7 @@ async def test_register_nostr_bad_event(http_client: AsyncClient):
        "/api/v1/auth/nostr",
        headers={"Authorization": f"nostr {base64_event}"},
    )
-    assert response.status_code == 401, "Nostr event signature invalid."
+    assert response.status_code == 400, "Nostr event signature invalid."
    assert response.json().get("detail") == "Nostr login event is not valid."


@@ -598,7 +600,7 @@ async def test_register_nostr_bad_event_kind(http_client: AsyncClient):
        "/api/v1/auth/nostr",
        headers={"Authorization": f"nostr {base64_event_bad_kind}"},
    )
-    assert response.status_code == 401, "Nostr event kind invalid."
+    assert response.status_code == 400, "Nostr event kind invalid."
    assert response.json().get("detail") == "Invalid event kind."


@@ -617,7 +619,7 @@ async def test_register_nostr_bad_event_tag_u(http_client: AsyncClient):
        "/api/v1/auth/nostr",
        headers={"Authorization": f"nostr {base64_event_tag_kind}"},
    )
-    assert response.status_code == 401, "Nostr event tag missing."
+    assert response.status_code == 400, "Nostr event tag missing."
    assert response.json().get("detail") == "Tag 'method' is missing."

    event_bad_kind["tags"] = [["u", "http://localhost:5000/nostr"], ["method", "XYZ"]]
@@ -630,8 +632,8 @@ async def test_register_nostr_bad_event_tag_u(http_client: AsyncClient):
        "/api/v1/auth/nostr",
        headers={"Authorization": f"nostr {base64_event_tag_kind}"},
    )
-    assert response.status_code == 401, "Nostr event tag invalid."
-    assert response.json().get("detail") == "Incorrect value for tag 'method'."
+    assert response.status_code == 400, "Nostr event tag invalid."
+    assert response.json().get("detail") == "Invalid value for tag 'method'."


@pytest.mark.asyncio
@@ -649,7 +651,7 @@ async def test_register_nostr_bad_event_tag_menthod(http_client: AsyncClient):
        "/api/v1/auth/nostr",
        headers={"Authorization": f"nostr {base64_event}"},
    )
-    assert response.status_code == 401, "Nostr event tag missing."
+    assert response.status_code == 400, "Nostr event tag missing."
    assert response.json().get("detail") == "Tag 'u' for URL is missing."

    event_bad_kind["tags"] = [["u", "http://demo.lnbits.com/nostr"], ["method", "POST"]]
@@ -662,15 +664,15 @@ async def test_register_nostr_bad_event_tag_menthod(http_client: AsyncClient):
        "/api/v1/auth/nostr",
        headers={"Authorization": f"nostr {base64_event}"},
    )
-    assert response.status_code == 401, "Nostr event tag invalid."
+    assert response.status_code == 400, "Nostr event tag invalid."
    assert (
-        response.json().get("detail") == "Incorrect value for tag 'u':"
+        response.json().get("detail") == "Invalid value for tag 'u':"
        " 'http://demo.lnbits.com/nostr'."
    )


 ################################ CHANGE PUBLIC KEY ################################
-async def test_change_pubkey_npub_ok(http_client: AsyncClient, user_alan: User):
+async def test_change_pubkey_npub_ok(http_client: AsyncClient):
    tiny_id = shortuuid.uuid()[:8]
    response = await http_client.post(
        "/api/v1/auth/register",
@@ -790,7 +792,7 @@ async def test_change_pubkey_ok(http_client: AsyncClient, user_alan: User):
        },
    )

-    assert response.status_code == 403, "Pubkey already used."
+    assert response.status_code == 400, "Pubkey already used."
    assert response.json().get("detail") == "Public key already in use."


@@ -852,11 +854,11 @@ async def test_alan_change_pubkey_auth_threshold_expired(
        },
    )

-    assert response.status_code == 403, "Treshold expired."
+    assert response.status_code == 400, "Treshold expired."
    assert (
        response.json().get("detail") == "You can only update your credentials"
-        " in the first 1 seconds after login."
-        " Please login again!"
+        " in the first 1 seconds."
+        " Please login again or ask a new reset key!"
    )


@@ -929,7 +931,7 @@ async def test_request_reset_key_user_not_found(http_client: AsyncClient):
        },
    )

-    assert response.status_code == 403, "User does not exist."
+    assert response.status_code == 404, "User does not exist."
    assert response.json().get("detail") == "User not found."


@@ -975,7 +977,7 @@ async def test_reset_username_passwords_do_not_matcj(
        },
    )

-    assert response.status_code == 403, "Passwords do not match."
+    assert response.status_code == 400, "Passwords do not match."
    assert response.json().get("detail") == "Passwords do not match."


@@ -990,8 +992,8 @@ async def test_reset_username_password_bad_key(http_client: AsyncClient):
            "password_repeat": "secret0000",
        },
    )
-    assert response.status_code == 500, "Bad reset key."
-    assert response.json().get("detail") == "Cannot reset user password."
+    assert response.status_code == 400, "Bad reset key."
+    assert response.json().get("detail") == "Invalid reset key."


@pytest.mark.asyncio
@@ -1013,7 +1015,7 @@ async def test_reset_password_auth_threshold_expired(
        },
    )

-    assert response.status_code == 403, "Treshold expired."
+    assert response.status_code == 400, "Treshold expired."
    assert (
        response.json().get("detail") == "You can only update your credentials"
        " in the first 1 seconds."
@@ -18,15 +18,15 @@ from httpx import ASGITransport, AsyncClient

 from lnbits.app import create_app
 from lnbits.core.crud import (
-    create_account,
    create_wallet,
+    delete_account,
    get_account,
    get_account_by_username,
    get_user,
    update_payment_status,
 )
 from lnbits.core.models import Account, CreateInvoice, PaymentState
-from lnbits.core.services import update_wallet_balance
+from lnbits.core.services import create_user_account, update_wallet_balance
 from lnbits.core.views.payment_api import api_payments_create_invoice
 from lnbits.db import DB_TYPE, SQLITE, Database
 from lnbits.settings import AuthMethods, settings
@@ -47,6 +47,7 @@ def run_before_and_after_tests():
    ##### BEFORE TEST RUN #####

    settings.lnbits_allow_new_accounts = True
+    settings.lnbits_allowed_users = []
    settings.auth_allowed_methods = AuthMethods.all()
    settings.auth_credetials_update_threshold = 120
    settings.lnbits_reserve_fee_percent = 1
@@ -105,20 +106,23 @@ async def db():
@pytest_asyncio.fixture(scope="session")
 async def user_alan():
    account = await get_account_by_username("alan")
-    if not account:
-        account = Account(
-            id=uuid4().hex,
-            email="alan@lnbits.com",
-            username="alan",
-        )
-        account.hash_password("secret1234")
-        account = await create_account(account)
-    yield account
+    if account:
+        await delete_account(account.id)
+
+    account = Account(
+        id=uuid4().hex,
+        email="alan@lnbits.com",
+        username="alan",
+    )
+    account.hash_password("secret1234")
+    user = await create_user_account(account)
+
+    yield user


@pytest_asyncio.fixture(scope="session")
 async def from_user():
-    user = await create_account()
+    user = await create_user_account()
    yield user


@@ -143,7 +147,7 @@ async def from_wallet_ws(from_wallet, test_client):

@pytest_asyncio.fixture(scope="session")
 async def to_user():
-    user = await create_account()
+    user = await create_user_account()
    yield user