klbr/khoj
1
0
Fork 0
mirror of https://github.com/khoaliber/khoj.git synced 2026-03-06 05:39:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Multi-User Part 2]: Add login pages and gate access to application behind login wall (#503)

Browse Source 
- Make most routes conditional on authentication *if anonymous mode is not enabled*. If anonymous mode is enabled, it scaffolds a default user and uses that for all application interactions.
- Add a basic login page and add routes for redirecting the user if logged in
This commit is contained in:
sabaimran
2023-10-26 10:17:29 -07:00
committed by GitHub
parent 216acf545f
commit a8a82d274a
13 changed files with 327 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/conftest.py
View File

@@ -25,7 +25,6 @@ from khoj.utils.rawconfig import (
OfflineChatProcessorConfig,
OpenAIProcessorConfig,
ProcessorConfig,
TextContentConfig,
ImageContentConfig,
SearchConfig,
TextSearchConfig,
@@ -38,7 +37,6 @@ from database.models import (
LocalOrgConfig,
LocalMarkdownConfig,
LocalPlaintextConfig,
LocalPdfConfig,
GithubConfig,
KhojUser,
GithubRepoConfig,
@@ -95,6 +93,19 @@ def default_user():
return UserFactory()
@pytest.mark.django_db
@pytest.fixture
def default_user2():
if KhojUser.objects.filter(username="default").exists():
return KhojUser.objects.get(username="default")
return UserFactory(
username="default",
email="default@example.com",
password="default",
)
@pytest.fixture(scope="session")
def search_models(search_config: SearchConfig):
search_models = SearchModels()

27
tests/test_client.py
View File

@@ -7,6 +7,7 @@ import pytest
# External Packages
from fastapi.testclient import TestClient
from fastapi import FastAPI
import pytest
# Internal Packages
from khoj.configure import configure_routes, configure_search_types
@@ -115,16 +116,11 @@ def test_get_configured_types_via_api(client, sample_org_data):
# ----------------------------------------------------------------------------------------------------
@pytest.mark.django_db(transaction=True)
def test_get_api_config_types(client, search_config: SearchConfig, sample_org_data):
def test_get_api_config_types(client, search_config: SearchConfig, sample_org_data, default_user2: KhojUser):
# Arrange
text_search.setup(OrgToJsonl, sample_org_data, regenerate=False)
# Act
text_search.setup(OrgToJsonl, sample_org_data, regenerate=False, user=default_user2)
response = client.get(f"/api/config/types")
# Assert
assert response.status_code == 200
assert response.json() == ["all", "org", "markdown", "image"]
assert response.json() == ["all", "org", "image"]
# ----------------------------------------------------------------------------------------------------
@@ -150,6 +146,7 @@ def test_get_configured_types_with_no_content_config(fastapi_app: FastAPI):
# ----------------------------------------------------------------------------------------------------
@pytest.mark.django_db(transaction=True)
def test_image_search(client, content_config: ContentConfig, search_config: SearchConfig):
# Arrange
search_models.image_search = image_search.initialize_model(search_config.image)
@@ -177,9 +174,9 @@ def test_image_search(client, content_config: ContentConfig, search_config: Sear
# ----------------------------------------------------------------------------------------------------
@pytest.mark.django_db(transaction=True)
def test_notes_search(client, search_config: SearchConfig, sample_org_data):
def test_notes_search(client, search_config: SearchConfig, sample_org_data, default_user2: KhojUser):
# Arrange
text_search.setup(OrgToJsonl, sample_org_data, regenerate=False)
text_search.setup(OrgToJsonl, sample_org_data, regenerate=False, user=default_user2)
user_query = quote("How to git install application?")
# Act
@@ -195,13 +192,14 @@ def test_notes_search(client, search_config: SearchConfig, sample_org_data):
# ----------------------------------------------------------------------------------------------------
@pytest.mark.django_db(transaction=True)
def test_notes_search_with_only_filters(
client, content_config: ContentConfig, search_config: SearchConfig, sample_org_data
client, content_config: ContentConfig, search_config: SearchConfig, sample_org_data, default_user2: KhojUser
):
# Arrange
text_search.setup(
OrgToJsonl,
sample_org_data,
regenerate=False,
user=default_user2,
)
user_query = quote('+"Emacs" file:"*.org"')
@@ -217,9 +215,9 @@ def test_notes_search_with_only_filters(
# ----------------------------------------------------------------------------------------------------
@pytest.mark.django_db(transaction=True)
def test_notes_search_with_include_filter(client, sample_org_data):
def test_notes_search_with_include_filter(client, sample_org_data, default_user2: KhojUser):
# Arrange
text_search.setup(OrgToJsonl, sample_org_data, regenerate=False)
text_search.setup(OrgToJsonl, sample_org_data, regenerate=False, user=default_user2)
user_query = quote('How to git install application? +"Emacs"')
# Act
@@ -234,12 +232,13 @@ def test_notes_search_with_include_filter(client, sample_org_data):
# ----------------------------------------------------------------------------------------------------
@pytest.mark.django_db(transaction=True)
def test_notes_search_with_exclude_filter(client, sample_org_data):
def test_notes_search_with_exclude_filter(client, sample_org_data, default_user2: KhojUser):
# Arrange
text_search.setup(
OrgToJsonl,
sample_org_data,
regenerate=False,
user=default_user2,
)
user_query = quote('How to git install application? -"clone"')