klbr/khoj
1
0
Fork 0
mirror of https://github.com/khoaliber/khoj.git synced 2026-03-09 21:29:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change subscribed scope to premium

Browse Source
This commit is contained in:
sabaimran
2023-11-27 11:39:20 -08:00
parent 6e1ba11e59
commit eb5e3096e0
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/khoj/configure.py
View File

@@ -83,9 +83,9 @@ class UserAuthenticationBackend(AuthenticationBackend):
or subscription_state == SubscriptionState.UNSUBSCRIBED.value or subscription_state == SubscriptionState.UNSUBSCRIBED.value
) )
if subscribed: if subscribed:
return AuthCredentials(["authenticated", "subscribed"]), AuthenticatedKhojUser(user) return AuthCredentials(["authenticated", "premium"]), AuthenticatedKhojUser(user)
return AuthCredentials(["authenticated"]), AuthenticatedKhojUser(user) return AuthCredentials(["authenticated"]), AuthenticatedKhojUser(user)
return AuthCredentials(["authenticated", "subscribed"]), AuthenticatedKhojUser(user) return AuthCredentials(["authenticated", "premium"]), AuthenticatedKhojUser(user)
if len(request.headers.get("Authorization", "").split("Bearer ")) == 2: if len(request.headers.get("Authorization", "").split("Bearer ")) == 2:
# Get bearer token from header # Get bearer token from header
bearer_token = request.headers["Authorization"].split("Bearer ")[1] bearer_token = request.headers["Authorization"].split("Bearer ")[1]
@@ -105,15 +105,15 @@ class UserAuthenticationBackend(AuthenticationBackend):
or subscription_state == SubscriptionState.UNSUBSCRIBED.value or subscription_state == SubscriptionState.UNSUBSCRIBED.value
) )
if subscribed: if subscribed:
return AuthCredentials(["authenticated", "subscribed"]), AuthenticatedKhojUser( return AuthCredentials(["authenticated", "premium"]), AuthenticatedKhojUser(
user_with_token.user user_with_token.user
) )
return AuthCredentials(["authenticated"]), AuthenticatedKhojUser(user_with_token.user) return AuthCredentials(["authenticated"]), AuthenticatedKhojUser(user_with_token.user)
return AuthCredentials(["authenticated", "subscribed"]), AuthenticatedKhojUser(user_with_token.user) return AuthCredentials(["authenticated", "premium"]), AuthenticatedKhojUser(user_with_token.user)
if state.anonymous_mode: if state.anonymous_mode:
user = await self.khojuser_manager.filter(username="default").prefetch_related("subscription").afirst() user = await self.khojuser_manager.filter(username="default").prefetch_related("subscription").afirst()
if user: if user:
return AuthCredentials(["authenticated", "subscribed"]), AuthenticatedKhojUser(user) return AuthCredentials(["authenticated", "premium"]), AuthenticatedKhojUser(user)
return AuthCredentials(), UnauthenticatedUser() return AuthCredentials(), UnauthenticatedUser()

4
src/khoj/routers/helpers.py
View File

@@ -280,7 +280,7 @@ class ApiUserRateLimiter:
def __call__(self, request: Request): def __call__(self, request: Request):
user: KhojUser = request.user.object user: KhojUser = request.user.object
subscribed = has_required_scope(request, ["subscribed"]) subscribed = has_required_scope(request, ["premium"])
user_requests = self.cache[user.uuid] user_requests = self.cache[user.uuid]
# Remove requests outside of the time window # Remove requests outside of the time window
@@ -314,7 +314,7 @@ class ApiIndexedDataLimiter:
def __call__(self, request: Request, files: List[UploadFile]): def __call__(self, request: Request, files: List[UploadFile]):
if state.billing_enabled is False: if state.billing_enabled is False:
return return
subscribed = has_required_scope(request, ["subscribed"]) subscribed = has_required_scope(request, ["premium"])
incoming_data_size_mb = 0 incoming_data_size_mb = 0
deletion_file_names = set() deletion_file_names = set()

16
src/khoj/routers/web_client.py
View File

@@ -47,7 +47,7 @@ def index(request: Request):
"request": request, "request": request,
"username": user.username, "username": user.username,
"user_photo": user_picture, "user_photo": user_picture,
"is_active": has_required_scope(request, ["subscribed"]), "is_active": has_required_scope(request, ["premium"]),
"has_documents": has_documents, "has_documents": has_documents,
}, },
) )
@@ -66,7 +66,7 @@ def index_post(request: Request):
"request": request, "request": request,
"username": user.username, "username": user.username,
"user_photo": user_picture, "user_photo": user_picture,
"is_active": has_required_scope(request, ["subscribed"]), "is_active": has_required_scope(request, ["premium"]),
"has_documents": has_documents, "has_documents": has_documents,
}, },
) )
@@ -85,7 +85,7 @@ def search_page(request: Request):
"request": request, "request": request,
"username": user.username, "username": user.username,
"user_photo": user_picture, "user_photo": user_picture,
"is_active": has_required_scope(request, ["subscribed"]), "is_active": has_required_scope(request, ["premium"]),
"has_documents": has_documents, "has_documents": has_documents,
}, },
) )
@@ -104,7 +104,7 @@ def chat_page(request: Request):
"request": request, "request": request,
"username": user.username, "username": user.username,
"user_photo": user_picture, "user_photo": user_picture,
"is_active": has_required_scope(request, ["subscribed"]), "is_active": has_required_scope(request, ["premium"]),
"has_documents": has_documents, "has_documents": has_documents,
}, },
) )
@@ -170,7 +170,7 @@ def config_page(request: Request):
"subscription_state": user_subscription_state, "subscription_state": user_subscription_state,
"subscription_renewal_date": subscription_renewal_date, "subscription_renewal_date": subscription_renewal_date,
"khoj_cloud_subscription_url": os.getenv("KHOJ_CLOUD_SUBSCRIPTION_URL"), "khoj_cloud_subscription_url": os.getenv("KHOJ_CLOUD_SUBSCRIPTION_URL"),
"is_active": has_required_scope(request, ["subscribed"]), "is_active": has_required_scope(request, ["premium"]),
"has_documents": has_documents, "has_documents": has_documents,
"indexed_data_size_in_mb": indexed_data_size_in_mb, "indexed_data_size_in_mb": indexed_data_size_in_mb,
}, },
@@ -211,7 +211,7 @@ def github_config_page(request: Request):
"current_config": current_config, "current_config": current_config,
"username": user.username, "username": user.username,
"user_photo": user_picture, "user_photo": user_picture,
"is_active": has_required_scope(request, ["subscribed"]), "is_active": has_required_scope(request, ["premium"]),
"has_documents": has_documents, "has_documents": has_documents,
}, },
) )
@@ -238,7 +238,7 @@ def notion_config_page(request: Request):
"current_config": current_config, "current_config": current_config,
"username": user.username, "username": user.username,
"user_photo": user_picture, "user_photo": user_picture,
"is_active": has_required_scope(request, ["subscribed"]), "is_active": has_required_scope(request, ["premium"]),
"has_documents": has_documents, "has_documents": has_documents,
}, },
) )
@@ -257,7 +257,7 @@ def computer_config_page(request: Request):
"request": request, "request": request,
"username": user.username, "username": user.username,
"user_photo": user_picture, "user_photo": user_picture,
"is_active": has_required_scope(request, ["subscribed"]), "is_active": has_required_scope(request, ["premium"]),
"has_documents": has_documents, "has_documents": has_documents,
}, },
) )