Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 37 additions & 23 deletions apps/cli/src/helpers/addons/evlog-setup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -853,16 +853,19 @@ export const { register, onRequestError } = createInstrumentation({
`;
}

const NITRO_V3_PLUGIN_IMPORT = 'import { definePlugin as defineNitroPlugin } from "nitro";\n';

function getNitroEvlogDrainFile(axiom = false, nitroV3 = false) {
const pluginImport = nitroV3 ? NITRO_V3_PLUGIN_IMPORT : "";
if (axiom)
return `${nitroV3 ? 'import { definePlugin as defineNitroPlugin } from "nitro";\n' : ""}import { createAxiomDrain } from "evlog/axiom";
return `${pluginImport}import { createAxiomDrain } from "evlog/axiom";

export default defineNitroPlugin((nitroApp) => {
nitroApp.hooks.hook("evlog:drain", createAxiomDrain());
});
`;

return `import { createFsDrain } from "evlog/fs";
return `${pluginImport}import { createFsDrain } from "evlog/fs";

export default defineNitroPlugin((nitroApp) => {
if (!import.meta.dev) return;
Expand Down Expand Up @@ -920,34 +923,37 @@ export async function identifyEvlogUser(request: Request) {
`;
}

function getNitroEvlogAuthPluginFile(config: ProjectConfig) {
// evlog documents createAuthMiddleware in a server middleware: it runs before the route
// handler, so requests that throw are still tagged with the user.
function getTanstackStartEvlogAuthMiddlewareFile(config: ProjectConfig) {
if (usesCreateAuthFactory(config)) {
return `${getAuthImportLine(config, "../../src/services")}
import { createAuthIdentifier, type BetterAuthInstance } from "evlog/better-auth";
import { createAuthMiddleware, type BetterAuthInstance } from "evlog/better-auth";
import { useLogger } from "evlog/nitro/v3";
import { defineHandler } from "nitro";

export default defineNitroPlugin((nitroApp) => {
nitroApp.hooks.hook("request", async (event) => {
const identify = createAuthIdentifier(${getAuthExpression(config)} as BetterAuthInstance, {
exclude: ["/api/auth/**"],
maskEmail: true,
});
await identify(event);
export default defineHandler(async (event) => {
const identifyUser = createAuthMiddleware(${getAuthExpression(config)} as BetterAuthInstance, {
exclude: ["/api/auth/**"],
maskEmail: true,
});
await identifyUser(useLogger(event), event.req.headers, event.url.pathname);
});
`;
}

return `${getAuthImportLine(config, "../../src/services")}
import { createAuthIdentifier, type BetterAuthInstance } from "evlog/better-auth";
import { createAuthMiddleware, type BetterAuthInstance } from "evlog/better-auth";
import { useLogger } from "evlog/nitro/v3";
import { defineHandler } from "nitro";

export default defineNitroPlugin((nitroApp) => {
nitroApp.hooks.hook(
"request",
createAuthIdentifier(${getAuthExpression(config)} as BetterAuthInstance, {
exclude: ["/api/auth/**"],
maskEmail: true,
}),
);
const identifyUser = createAuthMiddleware(${getAuthExpression(config)} as BetterAuthInstance, {
exclude: ["/api/auth/**"],
maskEmail: true,
});

export default defineHandler(async (event) => {
await identifyUser(useLogger(event), event.req.headers, event.url.pathname);
});
`;
}
Expand Down Expand Up @@ -1252,9 +1258,17 @@ async function setupTanstackStartEvlog(config: ProjectConfig, serviceName: strin
}

if (shouldIdentifyWebAuth(config)) {
const authPluginPath = path.join(webDir, "server/plugins/evlog-auth.ts");
if (!(await fs.pathExists(authPluginPath))) {
await writeFileIfChanged(authPluginPath, getNitroEvlogAuthPluginFile(config));
const oldAuthPluginPath = path.join(webDir, "server/plugins/evlog-auth.ts");
if (await fs.pathExists(oldAuthPluginPath)) {
const oldAuthPlugin = await fs.readFile(oldAuthPluginPath, "utf-8");
if (oldAuthPlugin.includes("evlog/better-auth")) {
await fs.remove(oldAuthPluginPath);
Comment thread
AmanVarshney01 marked this conversation as resolved.
Resolved
}
}

const authMiddlewarePath = path.join(webDir, "server/middleware/evlog-auth.ts");
if (!(await fs.pathExists(authMiddlewarePath))) {
await writeFileIfChanged(authMiddlewarePath, getTanstackStartEvlogAuthMiddlewareFile(config));
}
}

Expand Down
17 changes: 17 additions & 0 deletions apps/cli/test/generated-builds/samples.ts
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,23 @@ const buildSamples: BuildSample[] = [
webDeploy: "docker",
},
},
{
name: "tanstack-start-self-auth-evlog",
config: {
...baseConfig,
frontend: ["tanstack-start"],
backend: "self",
runtime: "none",
database: "sqlite",
orm: "drizzle",
api: "orpc",
auth: "better-auth",
payments: "none",
addons: ["evlog"],
examples: ["todo"],
webDeploy: "docker",
},
},
{
name: "tanstack-start-axiom-pnpm",
packageManagers: ["pnpm"],
Expand Down
Loading