Simplify login options (#1953)

* remove login modal, messagesBeforeLogin and clean up options

* ensure loginEnabled

Author: krampstudio

.env

@@ -20,7 +20,6 @@ MONGODB_DIRECT_CONNECTION=false
 
 
 ## Public app configuration ##
-PUBLIC_APP_GUEST_MESSAGE=# a message to the guest user. If not set, no message will be shown. Only used if you have authentication enabled.
 PUBLIC_APP_NAME=ChatUI # name used as title throughout the app
 PUBLIC_APP_ASSETS=chatui # used to find logos & favicons in static/$PUBLIC_APP_ASSETS
 PUBLIC_APP_DESCRIPTION="Making the community's best AI chat models available to everyone."# description used throughout the app
@@ -32,11 +31,12 @@ PUBLIC_PLAUSIBLE_SCRIPT_URL=
 PUBLIC_APPLE_APP_ID=
 
 COUPLE_SESSION_WITH_COOKIE_NAME=
+# when OPEN_ID is configured, users are required to login after the welcome modal
 OPENID_CLIENT_ID=
 OPENID_CLIENT_SECRET=
 OPENID_SCOPES="openid profile inference-api"
 USE_USER_TOKEN=
-AUTOMATIC_LOGIN=
+AUTOMATIC_LOGIN=# if true authentication is required on all routes
 
 ### Local Storage ###
 MONGO_STORAGE_PATH= # where is the db folder stored
@@ -88,7 +88,6 @@ PUBLIC_LLM_ROUTER_ALIAS_ID=omni
 ### Authentication ###
 # Parameters to enable open id login
 OPENID_CONFIG=
-MESSAGES_BEFORE_LOGIN=# how many messages a user can send in a conversation before having to login. set to 0 to force login right away
 # if it's defined, only these emails will be allowed to use login
 ALLOWED_USER_EMAILS=[]
 # If it's defined, users with emails matching these domains will also be allowed to use login

chart/env/prod.yaml

@@ -50,7 +50,7 @@ envVars:
   COUPLE_SESSION_WITH_COOKIE_NAME: "token"
   OPENID_SCOPES: "openid profile inference-api"
   USE_USER_TOKEN: "true"
-  AUTOMATIC_LOGIN: "true"
+  AUTOMATIC_LOGIN: "false"
 
   ADDRESS_HEADER: "X-Forwarded-For"
   APP_BASE: "/chat"
@@ -62,7 +62,6 @@ envVars:
   LOG_LEVEL: "debug"
 
   OPENAI_BASE_URL: "https://router.huggingface.co/v1"
-  MESSAGES_BEFORE_LOGIN: "999"
   PUBLIC_APP_ASSETS: "huggingchat"
   PUBLIC_APP_NAME: "HuggingChat"
   PUBLIC_APP_DESCRIPTION: "Making the community's best AI chat models available to everyone"

src/hooks.server.ts

@@ -4,8 +4,8 @@ import { collections } from "$lib/server/database";
 import { base } from "$app/paths";
 import {
 	authenticateRequest,
+	loginEnabled,
 	refreshSessionCookie,
-	requiresUser,
 	triggerOauthFlow,
 } from "$lib/server/auth";
 import { ERROR_MESSAGES } from "$lib/stores/errors";
@@ -139,9 +139,9 @@ export const handle: Handle = async ({ event, resolve }) => {
 	event.locals.sessionId = auth.sessionId;
 
 	if (
+		loginEnabled &&
 		!auth.user &&
 		config.AUTOMATIC_LOGIN === "true" &&
-		!event.url.pathname.startsWith(`${base}/`) &&
 		!event.url.pathname.startsWith(`${base}/login`) &&
 		!event.url.pathname.startsWith(`${base}/healthcheck`)
 	) {
@@ -199,20 +199,14 @@ export const handle: Handle = async ({ event, resolve }) => {
 	}
 
 	if (
+		loginEnabled &&
+		!event.locals.user &&
 		!event.url.pathname.startsWith(`${base}/login`) &&
 		!event.url.pathname.startsWith(`${base}/admin`) &&
 		!event.url.pathname.startsWith(`${base}/settings`) &&
 		!["GET", "OPTIONS", "HEAD"].includes(event.request.method)
 	) {
-		if (
-			!event.locals.user &&
-			requiresUser &&
-			!((config.MESSAGES_BEFORE_LOGIN ? parseInt(config.MESSAGES_BEFORE_LOGIN) : 0) > 0)
-		) {
-			return errorResponse(401, ERROR_MESSAGES.authOnly);
-		}
-
-		// Ethics disclaimer gating removed
+		return errorResponse(401, ERROR_MESSAGES.authOnly);
 	}
 
 	let replaced = false;

src/lib/components/LoginModal.svelte

@@ -33,7 +33,6 @@
 
 	interface Props {
 		conversations: ConvSidebar[];
-		canLogin: boolean;
 		user: LayoutData["user"];
 		p?: number;
 		ondeleteConversation?: (id: string) => void;

src/lib/components/NavMenu.svelte

@@ -5,8 +5,6 @@
 
 	import HoverTooltip from "$lib/components/HoverTooltip.svelte";
 	import IconPaperclip from "$lib/components/icons/IconPaperclip.svelte";
-	import { page } from "$app/state";
-	import { loginModalOpen } from "$lib/stores/loginModal";
 
 	import { isVirtualKeyboard } from "$lib/utils/isVirtualKeyboard";
 	interface Props {
@@ -158,12 +156,6 @@
 		onkeydown={handleKeydown}
 		oncompositionstart={() => (isCompositionOn = true)}
 		oncompositionend={() => (isCompositionOn = false)}
-		onbeforeinput={(ev) => {
-			if (page.data.loginRequired) {
-				ev.preventDefault();
-				$loginModalOpen = true;
-			}
-		}}
 		{placeholder}
 		{disabled}
 		onfocus={handleFocus}

src/lib/components/chat/ChatInput.svelte

@@ -9,7 +9,6 @@
 	import ChatInput from "./ChatInput.svelte";
 	import StopGeneratingBtn from "../StopGeneratingBtn.svelte";
 	import type { Model } from "$lib/types/Model";
-	import { page } from "$app/state";
 	import FileDropzone from "./FileDropzone.svelte";
 	import RetryBtn from "../RetryBtn.svelte";
 	import file2base64 from "$lib/utils/file2base64";
@@ -31,7 +30,6 @@
 
 	import { fly } from "svelte/transition";
 	import { cubicInOut } from "svelte/easing";
-	import { loginModalOpen } from "$lib/stores/loginModal";
 
 	import { isVirtualKeyboard } from "$lib/utils/isVirtualKeyboard";
 
@@ -276,10 +274,6 @@
 
 	function triggerPrompt(prompt: string) {
 		if (loading) return;
-		if (page.data.loginRequired) {
-			$loginModalOpen = true;
-			return;
-		}
 		draft = prompt;
 		handleSubmit();
 	}
@@ -377,11 +371,7 @@
 				<ChatIntroduction
 					{currentModel}
 					onmessage={(content) => {
-						if (page.data.loginRequired) {
-							$loginModalOpen = true;
-						} else {
-							onmessage?.(content);
-						}
+						onmessage?.(content);
 					}}
 				/>
 			{/if}

src/lib/components/chat/ChatWindow.svelte

@@ -1,6 +1,6 @@
 import { Elysia } from "elysia";
 import { authPlugin } from "../../authPlugin";
-import { requiresUser } from "$lib/server/auth";
+import { loginEnabled } from "$lib/server/auth";
 import { collections } from "$lib/server/database";
 import { authCondition } from "$lib/server/auth";
 import { config } from "$lib/server/config";
@@ -12,51 +12,16 @@ import { logger } from "$lib/server/logger";
 export interface FeatureFlags {
 	enableAssistants: boolean;
 	loginEnabled: boolean;
-	loginRequired: boolean;
-	guestMode: boolean;
 	isAdmin: boolean;
 }
 
 export const misc = new Elysia()
 	.use(authPlugin)
 	.get("/public-config", async () => config.getPublicConfig())
 	.get("/feature-flags", async ({ locals }) => {
-		let loginRequired = false;
-		const messagesBeforeLogin = config.MESSAGES_BEFORE_LOGIN
-			? parseInt(config.MESSAGES_BEFORE_LOGIN)
-			: 0;
-		const nConversations = await collections.conversations.countDocuments(authCondition(locals));
-
-		if (requiresUser && !locals.user) {
-			if (messagesBeforeLogin === 0) {
-				loginRequired = true;
-			} else if (nConversations >= messagesBeforeLogin) {
-				loginRequired = true;
-			} else {
-				// get the number of messages where `from === "assistant"` across all conversations.
-				const totalMessages =
-					(
-						await collections.conversations
-							.aggregate([
-								{ $match: { ...authCondition(locals), "messages.from": "assistant" } },
-								{ $project: { messages: 1 } },
-								{ $limit: messagesBeforeLogin + 1 },
-								{ $unwind: "$messages" },
-								{ $match: { "messages.from": "assistant" } },
-								{ $count: "messages" },
-							])
-							.toArray()
-					)[0]?.messages ?? 0;
-
-				loginRequired = totalMessages >= messagesBeforeLogin;
-			}
-		}
-
 		return {
 			enableAssistants: config.ENABLE_ASSISTANTS === "true",
-			loginEnabled: requiresUser, // misnomer, this is actually whether the feature is available, not required
-			loginRequired,
-			guestMode: requiresUser && messagesBeforeLogin > 0,
+			loginEnabled, // login feature is on when OID is configured
 			isAdmin: locals.isAdmin,
 		} satisfies FeatureFlags;
 	})

src/lib/server/api/routes/groups/misc.ts

@@ -54,7 +54,7 @@ export const OIDConfig = z
 	})
 	.parse(JSON5.parse(config.OPENID_CONFIG || "{}"));
 
-export const requiresUser = !!OIDConfig.CLIENT_ID && !!OIDConfig.CLIENT_SECRET;
+export const loginEnabled = !!OIDConfig.CLIENT_ID && !!OIDConfig.CLIENT_SECRET;
 
 const sameSite = z
 	.enum(["lax", "none", "strict"])