highperfocused/danswer
1
0
Fork 0
mirror of https://github.com/danswer-ai/danswer.git synced 2025-03-30 04:31:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

squash

Browse Source
This commit is contained in:
pablodanswer 2024-08-29 19:36:16 -07:00
parent 06c3e2064f
commit 827e4169c5
4 changed files with 0 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backend/danswer/auth/users.py
View File

@ -285,7 +285,6 @@ class UserManager(UUIDIDMixin, BaseUserManager[User, uuid.UUID]):
user_create.role = UserRole.ADMIN user_create.role = UserRole.ADMIN
else: else:
user_create.role = UserRole.BASIC user_create.role = UserRole.BASIC
print("Creating user")
return await super().create(user_create, safe=safe, request=request) # type: ignore return await super().create(user_create, safe=safe, request=request) # type: ignore

77
backend/danswer/server/settings/api.py
View File

@ -52,8 +52,6 @@ async def sso_callback(
strategy: Strategy = Depends(get_database_strategy), strategy: Strategy = Depends(get_database_strategy),
user_manager: UserManager = Depends(get_user_manager), user_manager: UserManager = Depends(get_user_manager),
): ):
print("SSO callback reached")
payload = verify_sso_token(sso_token) payload = verify_sso_token(sso_token)
user = await user_manager.sso_authenticate( user = await user_manager.sso_authenticate(
@ -69,81 +67,6 @@ async def sso_callback(
"domain": WEB_DOMAIN.split("://")[-1], "domain": WEB_DOMAIN.split("://")[-1],
} }
# response = Response(status_code=302)
# response.set_cookie(
# key="session",
# value=session_token,
# httponly=True,
# max_age=SESSION_EXPIRE_TIME_SECONDS,
# secure=WEB_DOMAIN.startswith("https"),
# samesite="lax",Shou
# domain=WEB_DOMAIN.split("://")[-1],
# )
# response.headers["Location"] = "/"
# return response
# @basic_router.post("/auth/sso-callback")
# async def sso_callback(
# sso_token: str = Query(
# ..., alias="sso_token"
# ), # Get SSO token from query parameters
# strategy: Strategy = Depends(get_database_strategy),
# user_manager: UserManager = Depends(get_user_manager),
# ):
# print("SSO callback reached")
# print("SSO callback reached")
# payload = verify_sso_token(sso_token)
# user = await user_manager.sso_authenticate(
# payload["email"], payload["user_id"], payload["tenant_id"]
# )
# session_token = await create_user_session(user, strategy)
# logger.info(f"Session token created: {session_token[:10]}...")
# logger.info(f"User email: {user.email}")
# logger.info(f"User ID: {user.id}")
# logger.info(f"User role: {user.role}")
# logger.info(f"Session expiry time: {SESSION_EXPIRE_TIME_SECONDS} seconds")
# response = RedirectResponse(url="/", status_code=302)
# response.set_cookie(
# key="session",
# value=session_token,
# httponly=True,
# max_age=SESSION_EXPIRE_TIME_SECONDS,
# secure=WEB_DOMAIN.startswith("https"),
# samesite="lax",
# domain=WEB_DOMAIN.split("://")[-1], # Remove protocol from domain
# )
# return response
# # payload = verify_sso_token(sso_token)
# # user = await get_or_create_user(
# # payload["email"], payload["user_id"], payload["tenant_id"]
# # )
# # session_token = await create_user_session(user, strategy)
# # logger.info(f"Session token created: {session_token[:10]}...")
# # logger.info(f"User email: {user.email}")
# # logger.info(f"User ID: {user.id}")
# # logger.info(f"User role: {user.role}")
# # logger.info(f"Session expiry time: {SESSION_EXPIRE_TIME_SECONDS} seconds")
# # response = RedirectResponse(url="/", status_code=302)
# # response.set_cookie(
# # key="session",
# # value=session_token,
# # httponly=True,
# # max_age=SESSION_EXPIRE_TIME_SECONDS,
# # secure=WEB_DOMAIN.startswith("https"),
# # samesite="lax",
# # domain=WEB_DOMAIN.split("://")[-1], # Remove protocol from domain
# # )
# # return response
@admin_router.put("") @admin_router.put("")
def put_settings( def put_settings(

2
web/src/app/auth/sso-callback/page.tsx
View File

@ -30,10 +30,8 @@ export default function SSOCallback() {
credentials: "include", credentials: "include",
} }
); );
if (response.ok) { if (response.ok) {
const data = await response.json(); const data = await response.json();
console.log(data);
setAuthStatus("Authentication successful!"); setAuthStatus("Authentication successful!");
// Set the session cookie manually TODO validate safety // Set the session cookie manually TODO validate safety

1
web/src/app/ee/admin/plan/StripeCheckoutButton.tsx
View File

@ -21,7 +21,6 @@ export function StripeCheckoutButton({
const handleClick = async () => { const handleClick = async () => {
setIsLoading(true); setIsLoading(true);
console.log(newQuantity);
try { try {
const response = await fetch("/api/create-checkout-session", { const response = await fetch("/api/create-checkout-session", {
method: "POST", method: "POST",