Skip to content

Open source alternative to Semrush and Ahrefs

Hide Analytics section when GA4 OAuth app is pending (#475)

Ben Senescu72eaa09c3283
diff --git a/src/client/features/ga4/GoogleAnalyticsConnectionCard.tsx b/src/client/features/ga4/GoogleAnalyticsConnectionCard.tsx
index 8ba977fb..27520f48 100644
--- a/src/client/features/ga4/GoogleAnalyticsConnectionCard.tsx
+++ b/src/client/features/ga4/GoogleAnalyticsConnectionCard.tsx
@@ -28,10 +28,12 @@ export function GoogleAnalyticsConnectionCard({
projectId,
onDismiss,
dismissing = false,
+ heading,
}: {
projectId: string;
onDismiss?: () => void;
dismissing?: boolean;
+ heading?: React.ReactNode;
}) {
const hosted = isHostedClientAuthMode();
const queryClient = useQueryClient();
@@ -115,97 +117,100 @@ export function GoogleAnalyticsConnectionCard({
if (hiddenPendingApproval) return null;
return (
- <IntegrationConnectionCard
- title="Google Analytics"
- icon={<GoogleAnalyticsLogo className="size-5" />}
- status={
- connectionQuery.isLoading
- ? undefined
- : selfHostedNeedsSetup
- ? "setup_required"
- : connected
- ? "connected"
- : "disconnected"
- }
- >
- {connectionQuery.isLoading ? (
- <div className="flex items-center gap-2 text-sm text-base-content/50">
- <span className="loading loading-spinner loading-sm" />
- Checking…
- </div>
- ) : selfHostedNeedsSetup ? (
- <div className="space-y-3">
- <GoogleOAuthSetupWarning
- integrationName="Google Analytics"
- docsUrl={GA4_SELF_HOSTED_SETUP_DOCS_URL}
- />
- {onDismiss ? (
- <DismissButton onClick={onDismiss} disabled={dismissing} />
- ) : null}
- </div>
- ) : connected && !picking ? (
- <ConnectedState
- displayName={connection?.propertyDisplayName ?? ""}
- propertyId={connection?.propertyId ?? ""}
- timeZone={connection?.propertyTimeZone ?? ""}
- currencyCode={connection?.propertyCurrencyCode ?? ""}
- connectedByEmail={connection?.connectedByEmail ?? null}
- onChange={() => {
- setSelection(null);
- setPicking(true);
- }}
- onDisconnect={() => disconnectMutation.mutate()}
- disconnecting={disconnectMutation.isPending}
- />
- ) : showPicker ? (
- <Ga4PropertyPicker
- loading={propertiesQuery.isLoading}
- error={propertiesQuery.isError}
- accounts={accounts}
- selection={selection}
- onSelect={setSelection}
- onSave={() => selection && setPropertyMutation.mutate(selection)}
- saving={setPropertyMutation.isPending}
- onRetry={() => void propertiesQuery.refetch()}
- secondaryAction={
- connected
- ? { label: "Cancel", onClick: () => setPicking(false) }
- : onDismiss
- ? {
- label: "Dismiss",
- disabled: dismissing,
- onClick: onDismiss,
- }
- : {
- label: "Disconnect",
- destructive: true,
- disabled: disconnectMutation.isPending,
- onClick: () => disconnectMutation.mutate(),
- }
- }
- />
- ) : (
- <div className="space-y-4">
- <p className="text-sm text-base-content/70">
- Connect GA4 to understand what organic visitors do after they land
- on your site.
- </p>
- <div className="flex flex-wrap items-center gap-1">
- <button
- type="button"
- onClick={handleConnect}
- className="inline-flex items-center gap-2.5 rounded-lg border border-base-300 bg-base-100 px-4 py-2.5 text-sm font-semibold text-base-content shadow-sm transition hover:bg-base-200 hover:shadow focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary"
- >
- <GoogleGlyph className="size-[18px]" />
- Connect with Google
- </button>
+ <>
+ {heading}
+ <IntegrationConnectionCard
+ title="Google Analytics"
+ icon={<GoogleAnalyticsLogo className="size-5" />}
+ status={
+ connectionQuery.isLoading
+ ? undefined
+ : selfHostedNeedsSetup
+ ? "setup_required"
+ : connected
+ ? "connected"
+ : "disconnected"
+ }
+ >
+ {connectionQuery.isLoading ? (
+ <div className="flex items-center gap-2 text-sm text-base-content/50">
+ <span className="loading loading-spinner loading-sm" />
+ Checking…
+ </div>
+ ) : selfHostedNeedsSetup ? (
+ <div className="space-y-3">
+ <GoogleOAuthSetupWarning
+ integrationName="Google Analytics"
+ docsUrl={GA4_SELF_HOSTED_SETUP_DOCS_URL}
+ />
{onDismiss ? (
<DismissButton onClick={onDismiss} disabled={dismissing} />
) : null}
</div>
- </div>
- )}
- </IntegrationConnectionCard>
+ ) : connected && !picking ? (
+ <ConnectedState
+ displayName={connection?.propertyDisplayName ?? ""}
+ propertyId={connection?.propertyId ?? ""}
+ timeZone={connection?.propertyTimeZone ?? ""}
+ currencyCode={connection?.propertyCurrencyCode ?? ""}
+ connectedByEmail={connection?.connectedByEmail ?? null}
+ onChange={() => {
+ setSelection(null);
+ setPicking(true);
+ }}
+ onDisconnect={() => disconnectMutation.mutate()}
+ disconnecting={disconnectMutation.isPending}
+ />
+ ) : showPicker ? (
+ <Ga4PropertyPicker
+ loading={propertiesQuery.isLoading}
+ error={propertiesQuery.isError}
+ accounts={accounts}
+ selection={selection}
+ onSelect={setSelection}
+ onSave={() => selection && setPropertyMutation.mutate(selection)}
+ saving={setPropertyMutation.isPending}
+ onRetry={() => void propertiesQuery.refetch()}
+ secondaryAction={
+ connected
+ ? { label: "Cancel", onClick: () => setPicking(false) }
+ : onDismiss
+ ? {
+ label: "Dismiss",
+ disabled: dismissing,
+ onClick: onDismiss,
+ }
+ : {
+ label: "Disconnect",
+ destructive: true,
+ disabled: disconnectMutation.isPending,
+ onClick: () => disconnectMutation.mutate(),
+ }
+ }
+ />
+ ) : (
+ <div className="space-y-4">
+ <p className="text-sm text-base-content/70">
+ Connect GA4 to understand what organic visitors do after they land
+ on your site.
+ </p>
+ <div className="flex flex-wrap items-center gap-1">
+ <button
+ type="button"
+ onClick={handleConnect}
+ className="inline-flex items-center gap-2.5 rounded-lg border border-base-300 bg-base-100 px-4 py-2.5 text-sm font-semibold text-base-content shadow-sm transition hover:bg-base-200 hover:shadow focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary"
+ >
+ <GoogleGlyph className="size-[18px]" />
+ Connect with Google
+ </button>
+ {onDismiss ? (
+ <DismissButton onClick={onDismiss} disabled={dismissing} />
+ ) : null}
+ </div>
+ </div>
+ )}
+ </IntegrationConnectionCard>
+ </>
);
}
diff --git a/src/client/features/projects/ProjectSettings.tsx b/src/client/features/projects/ProjectSettings.tsx
index 49931422..43d80e4b 100644
--- a/src/client/features/projects/ProjectSettings.tsx
+++ b/src/client/features/projects/ProjectSettings.tsx
@@ -63,8 +63,14 @@ export function ProjectSettings({ projectId }: { projectId: string }) {
</section>
<section id="google-analytics" className="space-y-3 scroll-mt-6">
- <h2 className="text-sm font-medium text-base-content/50">Analytics</h2>
- <GoogleAnalyticsConnectionCard projectId={projectId} />
+ <GoogleAnalyticsConnectionCard
+ projectId={projectId}
+ heading={
+ <h2 className="text-sm font-medium text-base-content/50">
+ Analytics
+ </h2>
+ }
+ />
</section>
<DangerSection project={project} canArchive={projects.length > 1} />
diff --git a/src/server/mcp/server.test.ts b/src/server/mcp/server.test.ts
new file mode 100644
index 00000000..7071add3
--- /dev/null
+++ b/src/server/mcp/server.test.ts
@@ -0,0 +1,80 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { createOpenSeoMcpServer } from "./server";
+
+const mcpServerMocks = vi.hoisted(() => ({
+ registerTool: vi.fn<(name: string, ...args: unknown[]) => void>(),
+}));
+
+vi.mock("@modelcontextprotocol/server", () => ({
+ McpServer: class {
+ registerTool(name: string, ...args: unknown[]) {
+ mcpServerMocks.registerTool(name, ...args);
+ }
+ },
+}));
+
+vi.mock("cloudflare:workers", () => ({
+ DurableObject: vi.fn(),
+ env: {},
+ waitUntil: vi.fn(),
+}));
+
+vi.mock("@/server/mcp/instrumentation", () => ({
+ instrumentMcpToolHandler: (
+ _name: string,
+ _outputSchema: unknown,
+ handler: unknown,
+ ) => handler,
+}));
+
+describe("createOpenSeoMcpServer", () => {
+ beforeEach(() => {
+ mcpServerMocks.registerTool.mockClear();
+ });
+
+ it("does not expose GA4-backed tools while OAuth approval is pending", () => {
+ createOpenSeoMcpServer({
+ openSeoAuth: {
+ userId: "user-1",
+ userEmail: "[email protected]",
+ organizationId: "org-1",
+ baseUrl: "https://example.com",
+ },
+ });
+
+ const registeredToolNames = mcpServerMocks.registerTool.mock.calls.map(
+ ([name]) => name,
+ );
+
+ expect(registeredToolNames).toContain("whoami");
+ expect(registeredToolNames).toContain("get_search_console_performance");
+ expect(registeredToolNames).not.toContain(
+ "get_google_analytics_organic_landing_pages",
+ );
+ expect(registeredToolNames).not.toContain(
+ "get_google_analytics_page_performance",
+ );
+ expect(registeredToolNames).not.toContain(
+ "get_google_analytics_key_events",
+ );
+ expect(registeredToolNames).not.toContain("get_search_opportunities");
+ expect(registeredToolNames).not.toContain(
+ "get_google_analytics_organic_overview",
+ );
+ expect(registeredToolNames).not.toContain(
+ "get_google_analytics_traffic_acquisition",
+ );
+ expect(registeredToolNames).not.toContain(
+ "get_google_analytics_measurement_health",
+ );
+ expect(registeredToolNames).not.toContain(
+ "get_google_analytics_ecommerce_performance",
+ );
+ expect(registeredToolNames).not.toContain(
+ "get_google_analytics_site_search",
+ );
+ expect(registeredToolNames).not.toContain(
+ "get_google_analytics_audience_breakdown",
+ );
+ });
+});
diff --git a/src/server/mcp/server.ts b/src/server/mcp/server.ts
index 88da8ea8..956ede0c 100644
--- a/src/server/mcp/server.ts
+++ b/src/server/mcp/server.ts
@@ -51,6 +51,7 @@ import {
getSearchConsolePerformanceTool,
inspectUrlsTool,
} from "@/server/mcp/tools/search-console-tools";
+import { GA4_OAUTH_APP_PENDING } from "@/shared/ga4";
import {
getAuditIssuesTool,
getAuditPagesTool,
@@ -166,16 +167,18 @@ export function createOpenSeoMcpServer(authProps: McpProps) {
register(getKeywordMetricsTool);
register(getSearchConsolePerformanceTool);
register(inspectUrlsTool);
- register(getGoogleAnalyticsOrganicLandingPagesTool);
- register(getGoogleAnalyticsPagePerformanceTool);
- register(getGoogleAnalyticsKeyEventsTool);
- register(getSearchOpportunitiesTool);
- register(getGoogleAnalyticsOrganicOverviewTool);
- register(getGoogleAnalyticsTrafficAcquisitionTool);
- register(getGoogleAnalyticsMeasurementHealthTool);
- register(getGoogleAnalyticsEcommercePerformanceTool);
- register(getGoogleAnalyticsSiteSearchTool);
- register(getGoogleAnalyticsAudienceBreakdownTool);
+ if (!GA4_OAUTH_APP_PENDING) {
+ register(getGoogleAnalyticsOrganicLandingPagesTool);
+ register(getGoogleAnalyticsPagePerformanceTool);
+ register(getGoogleAnalyticsKeyEventsTool);
+ register(getSearchOpportunitiesTool);
+ register(getGoogleAnalyticsOrganicOverviewTool);
+ register(getGoogleAnalyticsTrafficAcquisitionTool);
+ register(getGoogleAnalyticsMeasurementHealthTool);
+ register(getGoogleAnalyticsEcommercePerformanceTool);
+ register(getGoogleAnalyticsSiteSearchTool);
+ register(getGoogleAnalyticsAudienceBreakdownTool);
+ }
register(runSiteAuditTool);
register(getAuditStatusTool);
register(getAuditIssuesTool);