Merge branch 'main' into msukkari/optimize-web-build

Author: msukkari

CHANGELOG.md

@@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - Hide version upgrade toast for askgithub deployment (`EXPERIMENT_ASK_GH_ENABLED`). [#931](https://github.com/sourcebot-dev/sourcebot/pull/931)
 - Optimized web package and Docker builds: restructured Docker layers to separate dependency installation from source copying for better cache reuse, consolidated yarn installs, added BuildKit cache mount for Next.js compilation cache, enabled `experimental.optimizePackageImports` for barrel-export packages, and made Sentry build-time features conditional. [#944](https://github.com/sourcebot-dev/sourcebot/pull/944)
+- Hide security notice on login and signup pages when `EXPERIMENT_ASK_GH_ENABLED` is enabled. [#943](https://github.com/sourcebot-dev/sourcebot/pull/943)
 
 ### Fixed
 - Fixed text inside angle brackets (e.g., `<id>`) being hidden in chat prompt display due to HTML parsing. [#929](https://github.com/sourcebot-dev/sourcebot/pull/929) [#932](https://github.com/sourcebot-dev/sourcebot/pull/932)

packages/web/src/app/login/components/loginForm.tsx

@@ -14,9 +14,10 @@ interface LoginFormProps {
     providers: IdentityProviderMetadata[];
     context: "login" | "signup";
     isAnonymousAccessEnabled?: boolean;
+    hideSecurityNotice?: boolean;
 }
 
-export const LoginForm = ({ callbackUrl, error, providers, context, isAnonymousAccessEnabled = false }: LoginFormProps) => {
+export const LoginForm = ({ callbackUrl, error, providers, context, isAnonymousAccessEnabled = false, hideSecurityNotice = false }: LoginFormProps) => {
     const captureEvent = useCaptureEvent();
 
     const safeCallbackUrl = useMemo(() => {
@@ -89,6 +90,7 @@ export const LoginForm = ({ callbackUrl, error, providers, context, isAnonymousA
                     context={context}
                     onProviderClick={handleProviderClick}
                     securityNoticeClosable={true}
+                    hideSecurityNotice={hideSecurityNotice}
                 />
                 <p className="text-sm text-muted-foreground mt-8">
                     {context === "login" ?

packages/web/src/app/login/page.tsx

@@ -7,6 +7,7 @@ import { getOrgFromDomain } from "@/data/org";
 import { SINGLE_TENANT_ORG_DOMAIN } from "@/lib/constants";
 import { getAnonymousAccessStatus } from "@/actions";
 import { isServiceError } from "@/lib/utils";
+import { env } from "@sourcebot/shared";
 
 interface LoginProps {
     searchParams: Promise<{
@@ -40,6 +41,7 @@ export default async function Login(props: LoginProps) {
                     providers={providers}
                     context="login"
                     isAnonymousAccessEnabled={isAnonymousAccessEnabled}
+                    hideSecurityNotice={env.EXPERIMENT_ASK_GH_ENABLED === 'true'}
                 />
             </div>
             <Footer />

packages/web/src/app/signup/page.tsx

@@ -3,7 +3,7 @@ import { LoginForm } from "../login/components/loginForm";
 import { redirect } from "next/navigation";
 import { Footer } from "@/app/components/footer";
 import { getIdentityProviderMetadata } from "@/lib/identityProviders";
-import { createLogger } from "@sourcebot/shared";
+import { createLogger, env } from "@sourcebot/shared";
 import { getOrgFromDomain } from "@/data/org";
 import { SINGLE_TENANT_ORG_DOMAIN } from "@/lib/constants";
 import { getAnonymousAccessStatus } from "@/actions";
@@ -44,6 +44,7 @@ export default async function Signup(props: LoginProps) {
                     providers={providers}
                     context="signup"
                     isAnonymousAccessEnabled={isAnonymousAccessEnabled}
+                    hideSecurityNotice={env.EXPERIMENT_ASK_GH_ENABLED === 'true'}
                 />
             </div>
             <Footer />