From d2346dc24e7749b0f7d19a489f05c2877aca9d77 Mon Sep 17 00:00:00 2001 From: pablodanswer Date: Sun, 20 Oct 2024 14:41:12 -0700 Subject: [PATCH] k --- backend/danswer/auth/users.py | 16 +++++------- backend/danswer/configs/app_configs.py | 2 +- .../docker_compose/docker-compose.dev.yml | 2 +- .../docker_compose/docker-compose.gpu-dev.yml | 2 +- .../docker-compose.search-testing.yml | 2 +- web/src/app/auth/login/page.tsx | 4 +-- web/src/app/auth/signup/page.tsx | 26 +++++++------------ web/src/components/auth/AuthFlowContainer.tsx | 2 +- web/src/lib/userSS.ts | 8 +++--- 9 files changed, 25 insertions(+), 39 deletions(-) diff --git a/backend/danswer/auth/users.py b/backend/danswer/auth/users.py index 8167fd751..d0997830c 100644 --- a/backend/danswer/auth/users.py +++ b/backend/danswer/auth/users.py @@ -227,14 +227,6 @@ class UserManager(UUIDIDMixin, BaseUserManager[User, uuid.UUID]): reset_password_token_secret = USER_AUTH_SECRET verification_token_secret = USER_AUTH_SECRET - # async def register( - # self, - # user_create: schemas.UC | UserCreate, - # safe: bool = False, - # request: Optional[Request] = None, - # ) -> User: - # return await super().register(user_create, safe, request) - async def create( self, user_create: schemas.UC | UserCreate, @@ -249,10 +241,12 @@ class UserManager(UUIDIDMixin, BaseUserManager[User, uuid.UUID]): raise HTTPException(status_code=401, detail="User not found") if not tenant_id: - raise HTTPException(status_code=401, detail="User not found") + raise HTTPException( + status_code=401, detail="User does not belong to an organization" + ) async with get_async_session_with_tenant(tenant_id) as db_session: - current_tenant_id.set(tenant_id) + token = current_tenant_id.set(tenant_id) verify_email_is_invited(user_create.email) verify_email_domain(user_create.email) @@ -290,6 +284,8 @@ class UserManager(UUIDIDMixin, BaseUserManager[User, uuid.UUID]): user = await self.update(user_update, user) else: raise exceptions.UserAlreadyExists() + + current_tenant_id.reset(token) return user async def on_after_login( diff --git a/backend/danswer/configs/app_configs.py b/backend/danswer/configs/app_configs.py index 505268b6e..caf7a103b 100644 --- a/backend/danswer/configs/app_configs.py +++ b/backend/danswer/configs/app_configs.py @@ -140,7 +140,7 @@ POSTGRES_PASSWORD = urllib.parse.quote_plus( os.environ.get("POSTGRES_PASSWORD") or "password" ) POSTGRES_HOST = os.environ.get("POSTGRES_HOST") or "localhost" -POSTGRES_PORT = os.environ.get("POSTGRES_PORT") or "5433" +POSTGRES_PORT = os.environ.get("POSTGRES_PORT") or "5432" POSTGRES_DB = os.environ.get("POSTGRES_DB") or "postgres" POSTGRES_API_SERVER_POOL_SIZE = int( diff --git a/deployment/docker_compose/docker-compose.dev.yml b/deployment/docker_compose/docker-compose.dev.yml index 109892f9d..d22bde5b4 100644 --- a/deployment/docker_compose/docker-compose.dev.yml +++ b/deployment/docker_compose/docker-compose.dev.yml @@ -313,7 +313,7 @@ services: - POSTGRES_USER=${POSTGRES_USER:-postgres} - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-password} ports: - - "5433:5432" + - "5432:5432" volumes: - db_volume:/var/lib/postgresql/data diff --git a/deployment/docker_compose/docker-compose.gpu-dev.yml b/deployment/docker_compose/docker-compose.gpu-dev.yml index ea40c2fef..a7e0a2afe 100644 --- a/deployment/docker_compose/docker-compose.gpu-dev.yml +++ b/deployment/docker_compose/docker-compose.gpu-dev.yml @@ -313,7 +313,7 @@ services: - POSTGRES_USER=${POSTGRES_USER:-postgres} - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-password} ports: - - "5433:5432" + - "5432:5432" volumes: - db_volume:/var/lib/postgresql/data diff --git a/deployment/docker_compose/docker-compose.search-testing.yml b/deployment/docker_compose/docker-compose.search-testing.yml index 2afd54e02..fab950c06 100644 --- a/deployment/docker_compose/docker-compose.search-testing.yml +++ b/deployment/docker_compose/docker-compose.search-testing.yml @@ -157,7 +157,7 @@ services: - POSTGRES_USER=${POSTGRES_USER:-postgres} - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-password} ports: - - "5433" + - "5432" volumes: - db_volume:/var/lib/postgresql/data diff --git a/web/src/app/auth/login/page.tsx b/web/src/app/auth/login/page.tsx index 6a7d11b56..244d2429e 100644 --- a/web/src/app/auth/login/page.tsx +++ b/web/src/app/auth/login/page.tsx @@ -71,8 +71,6 @@ const Page = async ({ if (authTypeMetadata?.autoRedirect && authUrl && !autoRedirectDisabled) { return redirect(authUrl); } - console.log("authTypeMetadata"); - console.log(authTypeMetadata); return ( @@ -80,7 +78,7 @@ const Page = async ({ -
+
{authUrl && authTypeMetadata && ( <>

diff --git a/web/src/app/auth/signup/page.tsx b/web/src/app/auth/signup/page.tsx index 6fc667ec9..f44b53247 100644 --- a/web/src/app/auth/signup/page.tsx +++ b/web/src/app/auth/signup/page.tsx @@ -42,18 +42,15 @@ const Page = async () => { } return redirect("/auth/waiting-on-verification"); } - - // only enable this page if basic login is enabled - if ( - authTypeMetadata?.authType !== "basic" && - authTypeMetadata?.authType !== "cloud" - ) { - return redirect("/"); - } const cloud = authTypeMetadata?.authType === "cloud"; + // only enable this page if basic login is enabled + if (authTypeMetadata?.authType !== "basic" && !cloud) { + return redirect("/"); + } + let authUrl: string | null = null; - if (cloud) { + if (cloud && authTypeMetadata) { authUrl = await getAuthUrlSS(authTypeMetadata.authType, null); } @@ -63,21 +60,18 @@ const Page = async () => { <>
-
+

{cloud ? "Complete your sign up" : "Sign Up for Danswer"}

{cloud && authUrl && (
- +
-
+
or -
+
)} diff --git a/web/src/components/auth/AuthFlowContainer.tsx b/web/src/components/auth/AuthFlowContainer.tsx index 35fd3d6f3..3be441a0a 100644 --- a/web/src/components/auth/AuthFlowContainer.tsx +++ b/web/src/components/auth/AuthFlowContainer.tsx @@ -7,7 +7,7 @@ export default function AuthFlowContainer({ }) { return (
-
+
{children}
diff --git a/web/src/lib/userSS.ts b/web/src/lib/userSS.ts index a7b62dfd2..8ce25555b 100644 --- a/web/src/lib/userSS.ts +++ b/web/src/lib/userSS.ts @@ -20,6 +20,8 @@ export const getAuthTypeMetadataSS = async (): Promise => { await res.json(); let authType: AuthType; + + // Override fasapi users auth so we can use both if (SERVER_SIDE_ONLY__CLOUD_ENABLED) { authType = "cloud"; } else { @@ -84,7 +86,6 @@ export const getAuthUrlSS = async ( authType: AuthType, nextUrl: string | null ): Promise => { - console.log(authType); // Returns the auth url for the given auth type switch (authType) { case "disabled": @@ -95,10 +96,7 @@ export const getAuthUrlSS = async ( return await getGoogleOAuthUrlSS(); } case "cloud": { - console.log("returning cloud auth url"); - const value = await getGoogleOAuthUrlSS(); - console.log(value); - return value; + return await getGoogleOAuthUrlSS(); } case "saml": { return await getSAMLAuthUrlSS();