Merge pull request #110 from MODSetter/dev

feat: Removed Hard Dependency on Google Auth

Author: MODSetter

README.md

@@ -130,7 +130,6 @@ Both installation guides include detailed OS-specific instructions for Windows,
 
 Before installation, make sure to complete the [prerequisite setup steps](https://www.surfsense.net/docs/) including:
 - PGVector setup
-- Google OAuth configuration
 - Unstructured.io API key
 - Other required API keys
 

surfsense_backend/.env.example

@@ -1,10 +1,15 @@
 DATABASE_URL="postgresql+asyncpg://postgres:postgres@localhost:5432/surfsense"
 
 SECRET_KEY="SECRET"
+NEXT_FRONTEND_URL="http://localhost:3000"
+
+#Auth
+AUTH_TYPE="GOOGLE" or "LOCAL"
+# For Google Auth Only
 GOOGLE_OAUTH_CLIENT_ID="924507538m"
 GOOGLE_OAUTH_CLIENT_SECRET="GOCSV"
-NEXT_FRONTEND_URL="http://localhost:3000"
 
+#Embedding Model
 EMBEDDING_MODEL="mixedbread-ai/mxbai-embed-large-v1"
 
 RERANKERS_MODEL_NAME="ms-marco-MiniLM-L-12-v2"

surfsense_backend/app/app.py

@@ -6,16 +6,18 @@
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from app.db import User, create_db_and_tables, get_async_session
-from app.retriver.chunks_hybrid_search import ChucksHybridSearchRetriever
 from app.schemas import UserCreate, UserRead, UserUpdate
+
+
+from app.routes import router as crud_router
+from app.config import config
+
 from app.users import (
     SECRET,
     auth_backend,
     fastapi_users,
-    google_oauth_client,
-    current_active_user,
+    current_active_user
 )
-from app.routes import router as crud_router
 
 
 @asynccontextmanager
@@ -59,16 +61,20 @@ async def lifespan(app: FastAPI):
     prefix="/users",
     tags=["users"],
 )
-app.include_router(
-    fastapi_users.get_oauth_router(
-        google_oauth_client,
-        auth_backend,
-        SECRET,
-        is_verified_by_default=True
-    ),
-    prefix="/auth/google",
-    tags=["auth"],
-)
+
+if config.AUTH_TYPE == "GOOGLE":
+    from app.users import google_oauth_client
+    app.include_router(
+        fastapi_users.get_oauth_router(
+            google_oauth_client,
+            auth_backend,
+            SECRET,
+            is_verified_by_default=True
+        ),
+        prefix="/auth/google",
+        tags=["auth"],
+    )
+
 app.include_router(crud_router, prefix="/api/v1", tags=["crud"])
 
 

surfsense_backend/app/config/__init__.py

@@ -38,12 +38,17 @@ class Config:
 
     # Database
     DATABASE_URL = os.getenv("DATABASE_URL")
-
-    # AUTH: Google OAuth
-    GOOGLE_OAUTH_CLIENT_ID = os.getenv("GOOGLE_OAUTH_CLIENT_ID")
-    GOOGLE_OAUTH_CLIENT_SECRET = os.getenv("GOOGLE_OAUTH_CLIENT_SECRET")
+    
     NEXT_FRONTEND_URL = os.getenv("NEXT_FRONTEND_URL")
 
+    
+    # AUTH: Google OAuth
+    AUTH_TYPE = os.getenv("AUTH_TYPE")
+    if AUTH_TYPE == "GOOGLE":
+        GOOGLE_OAUTH_CLIENT_ID = os.getenv("GOOGLE_OAUTH_CLIENT_ID")
+        GOOGLE_OAUTH_CLIENT_SECRET = os.getenv("GOOGLE_OAUTH_CLIENT_SECRET")
+        
+    
     # LONG-CONTEXT LLMS
     LONG_CONTEXT_LLM = os.getenv("LONG_CONTEXT_LLM")
     LONG_CONTEXT_LLM_API_BASE = os.getenv("LONG_CONTEXT_LLM_API_BASE")

surfsense_backend/app/db.py

@@ -3,11 +3,7 @@
 from enum import Enum
 
 from fastapi import Depends
-from fastapi_users.db import (
-    SQLAlchemyBaseOAuthAccountTableUUID,
-    SQLAlchemyBaseUserTableUUID,
-    SQLAlchemyUserDatabase,
-)
+
 from pgvector.sqlalchemy import Vector
 from sqlalchemy import (
     ARRAY,
@@ -30,6 +26,18 @@
 from app.retriver.chunks_hybrid_search import ChucksHybridSearchRetriever
 from app.retriver.documents_hybrid_search import DocumentHybridSearchRetriever
 
+if config.AUTH_TYPE == "GOOGLE":
+    from fastapi_users.db import (
+        SQLAlchemyBaseOAuthAccountTableUUID,
+        SQLAlchemyBaseUserTableUUID,
+        SQLAlchemyUserDatabase,
+    )
+else:
+    from fastapi_users.db import (
+        SQLAlchemyBaseUserTableUUID,
+        SQLAlchemyUserDatabase,
+    )
+
 DATABASE_URL = config.DATABASE_URL
 
 
@@ -141,17 +149,22 @@ class SearchSourceConnector(BaseModel, TimestampMixin):
     user_id = Column(UUID(as_uuid=True), ForeignKey("user.id", ondelete='CASCADE'), nullable=False)
     user = relationship("User", back_populates="search_source_connectors")
 
+if config.AUTH_TYPE == "GOOGLE":
+    class OAuthAccount(SQLAlchemyBaseOAuthAccountTableUUID, Base):
+        pass
 
-class OAuthAccount(SQLAlchemyBaseOAuthAccountTableUUID, Base):
-    pass
 
+    class User(SQLAlchemyBaseUserTableUUID, Base):
+        oauth_accounts: Mapped[list[OAuthAccount]] = relationship(
+            "OAuthAccount", lazy="joined"
+        )
+        search_spaces = relationship("SearchSpace", back_populates="user")
+        search_source_connectors = relationship("SearchSourceConnector", back_populates="user")
+else:
+    class User(SQLAlchemyBaseUserTableUUID, Base):
 
-class User(SQLAlchemyBaseUserTableUUID, Base):
-    oauth_accounts: Mapped[list[OAuthAccount]] = relationship(
-        "OAuthAccount", lazy="joined"
-    )
-    search_spaces = relationship("SearchSpace", back_populates="user")
-    search_source_connectors = relationship("SearchSourceConnector", back_populates="user")
+        search_spaces = relationship("SearchSpace", back_populates="user")
+        search_source_connectors = relationship("SearchSourceConnector", back_populates="user")
 
 
 engine = create_async_engine(DATABASE_URL)
@@ -180,8 +193,12 @@ async def get_async_session() -> AsyncGenerator[AsyncSession, None]:
         yield session
 
 
-async def get_user_db(session: AsyncSession = Depends(get_async_session)):
-    yield SQLAlchemyUserDatabase(session, User, OAuthAccount)
+if config.AUTH_TYPE == "GOOGLE":
+    async def get_user_db(session: AsyncSession = Depends(get_async_session)):
+        yield SQLAlchemyUserDatabase(session, User, OAuthAccount)
+else:
+    async def get_user_db(session: AsyncSession = Depends(get_async_session)):
+        yield SQLAlchemyUserDatabase(session, User)
 
 async def get_chucks_hybrid_search_retriever(session: AsyncSession = Depends(get_async_session)):
     return ChucksHybridSearchRetriever(session)

surfsense_backend/app/users.py

@@ -10,8 +10,8 @@
     JWTStrategy,
 )
 from fastapi_users.db import SQLAlchemyUserDatabase
-from httpx_oauth.clients.google import GoogleOAuth2
-
+from fastapi.responses import JSONResponse
+from fastapi_users.schemas import model_dump
 from app.config import config
 from app.db import User, get_user_db
 from pydantic import BaseModel
@@ -22,10 +22,13 @@ class BearerResponse(BaseModel):
 
 SECRET = config.SECRET_KEY
 
-google_oauth_client = GoogleOAuth2(
-    config.GOOGLE_OAUTH_CLIENT_ID,
-    config.GOOGLE_OAUTH_CLIENT_SECRET,
-)
+if config.AUTH_TYPE == "GOOGLE":
+    from httpx_oauth.clients.google import GoogleOAuth2
+    
+    google_oauth_client = GoogleOAuth2(
+        config.GOOGLE_OAUTH_CLIENT_ID,
+        config.GOOGLE_OAUTH_CLIENT_SECRET,
+    )
 
 
 class UserManager(UUIDIDMixin, BaseUserManager[User, uuid.UUID]):
@@ -79,7 +82,10 @@ class CustomBearerTransport(BearerTransport):
     async def get_login_response(self, token: str) -> Response:
         bearer_response = BearerResponse(access_token=token, token_type="bearer")
         redirect_url = f"{config.NEXT_FRONTEND_URL}/auth/callback?token={bearer_response.access_token}"
-        return RedirectResponse(redirect_url, status_code=302)
+        if config.AUTH_TYPE == "GOOGLE":
+            return RedirectResponse(redirect_url, status_code=302)
+        else:
+            return JSONResponse(model_dump(bearer_response))
 
 bearer_transport = CustomBearerTransport(tokenUrl="auth/jwt/login")
 

surfsense_web/.env.example

@@ -1 +1,2 @@
-NEXT_PUBLIC_FASTAPI_BACKEND_URL=http://localhost:8000
+NEXT_PUBLIC_FASTAPI_BACKEND_URL=http://localhost:8000
+NEXT_PUBLIC_FASTAPI_BACKEND_AUTH_TYPE=LOCAL or GOOGLE

surfsense_web/app/dashboard/page.tsx

@@ -4,7 +4,7 @@ import React from 'react'
 import Link from 'next/link'
 import { motion } from 'framer-motion'
 import { Button } from '@/components/ui/button'
-import { Plus, Search, Trash2, AlertCircle, Loader2 } from 'lucide-react'
+import { Plus, Search, Trash2, AlertCircle, Loader2, LogOut } from 'lucide-react'
 import { Tilt } from '@/components/ui/tilt'
 import { Spotlight } from '@/components/ui/spotlight'
 import { Logo } from '@/components/Logo';
@@ -145,11 +145,19 @@ const DashboardPage = () => {
     },
   };
 
+  const router = useRouter();
   const { searchSpaces, loading, error, refreshSearchSpaces } = useSearchSpaces();
 
   if (loading) return <LoadingScreen />;
   if (error) return <ErrorScreen message={error} />;
 
+  const handleLogout = () => {
+    if (typeof window !== 'undefined') {
+      localStorage.removeItem('surfsense_bearer_token');
+      router.push('/');
+    }
+  };
+
   const handleDeleteSearchSpace = async (id: number) => {
     // Send DELETE request to the API
     try {
@@ -193,7 +201,18 @@ const DashboardPage = () => {
               </p>
             </div>
           </div>
-          <ThemeTogglerComponent />
+          <div className="flex items-center space-x-3">
+            <Button 
+              variant="ghost" 
+              size="icon" 
+              onClick={handleLogout}
+              className="h-9 w-9 rounded-full"
+              aria-label="Logout"
+            >
+              <LogOut className="h-5 w-5" />
+            </Button>
+            <ThemeTogglerComponent />
+          </div>
         </div>
 
         <div className="flex flex-col space-y-6 mt-6">

surfsense_web/app/login/AmbientBackground.tsx

@@ -0,0 +1,43 @@
+"use client";
+import React from "react";
+
+export const AmbientBackground = () => {
+  return (
+    <div className="pointer-events-none absolute left-0 top-0 z-0 h-screen w-screen">
+      <div
+        style={{
+          transform: "translateY(-350px) rotate(-45deg)",
+          width: "560px",
+          height: "1380px",
+          background:
+            "radial-gradient(68.54% 68.72% at 55.02% 31.46%, rgba(59, 130, 246, 0.08) 0%, rgba(59, 130, 246, 0.02) 50%, rgba(59, 130, 246, 0) 100%)",
+        }}
+        className="absolute left-0 top-0"
+      />
+      <div
+        style={{
+          transform: "rotate(-45deg) translate(5%, -50%)",
+          transformOrigin: "top left",
+          width: "240px",
+          height: "1380px",
+          background:
+            "radial-gradient(50% 50% at 50% 50%, rgba(59, 130, 246, 0.06) 0%, rgba(59, 130, 246, 0.02) 80%, transparent 100%)",
+        }}
+        className="absolute left-0 top-0"
+      />
+      <div
+        style={{
+          position: "absolute",
+          borderRadius: "20px",
+          transform: "rotate(-45deg) translate(-180%, -70%)",
+          transformOrigin: "top left",
+          width: "240px",
+          height: "1380px",
+          background:
+            "radial-gradient(50% 50% at 50% 50%, rgba(59, 130, 246, 0.04) 0%, rgba(59, 130, 246, 0.02) 80%, transparent 100%)",
+        }}
+        className="absolute left-0 top-0"
+      />
+    </div>
+  );
+}; 

surfsense_web/app/login/GoogleLoginButton.tsx

@@ -3,6 +3,7 @@ import React from "react";
 import { IconBrandGoogleFilled } from "@tabler/icons-react";
 import { motion } from "framer-motion";
 import { Logo } from "@/components/Logo";
+import { AmbientBackground } from "./AmbientBackground";
 
 export function GoogleLoginButton() {
   const handleGoogleLogin = () => {
@@ -88,47 +89,4 @@ export function GoogleLoginButton() {
       </div>
     </div>
   );
-}
-
-
-
-const AmbientBackground = () => {
-  return (
-    <div className="pointer-events-none absolute left-0 top-0 z-0 h-screen w-screen">
-      <div
-        style={{
-          transform: "translateY(-350px) rotate(-45deg)",
-          width: "560px",
-          height: "1380px",
-          background:
-            "radial-gradient(68.54% 68.72% at 55.02% 31.46%, rgba(59, 130, 246, 0.08) 0%, rgba(59, 130, 246, 0.02) 50%, rgba(59, 130, 246, 0) 100%)",
-        }}
-        className="absolute left-0 top-0"
-      />
-      <div
-        style={{
-          transform: "rotate(-45deg) translate(5%, -50%)",
-          transformOrigin: "top left",
-          width: "240px",
-          height: "1380px",
-          background:
-            "radial-gradient(50% 50% at 50% 50%, rgba(59, 130, 246, 0.06) 0%, rgba(59, 130, 246, 0.02) 80%, transparent 100%)",
-        }}
-        className="absolute left-0 top-0"
-      />
-      <div
-        style={{
-          position: "absolute",
-          borderRadius: "20px",
-          transform: "rotate(-45deg) translate(-180%, -70%)",
-          transformOrigin: "top left",
-          width: "240px",
-          height: "1380px",
-          background:
-            "radial-gradient(50% 50% at 50% 50%, rgba(59, 130, 246, 0.04) 0%, rgba(59, 130, 246, 0.02) 80%, transparent 100%)",
-        }}
-        className="absolute left-0 top-0"
-      />
-    </div>
-  );
-}; 
+}