Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
38 changes: 22 additions & 16 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 @@ -922,32 +925,35 @@ export async function identifyEvlogUser(request: Request) {

function getNitroEvlogAuthPluginFile(config: ProjectConfig) {
if (usesCreateAuthFactory(config)) {
return `${getAuthImportLine(config, "../../src/services")}
import { createAuthIdentifier, type BetterAuthInstance } from "evlog/better-auth";
return `${NITRO_V3_PLUGIN_IMPORT}${getAuthImportLine(config, "../../src/services")}
import { createAuthMiddleware, type BetterAuthInstance } from "evlog/better-auth";
import { useLogger } from "evlog/nitro/v3";

export default defineNitroPlugin((nitroApp) => {
nitroApp.hooks.hook("request", async (event) => {
const identify = createAuthIdentifier(${getAuthExpression(config)} as BetterAuthInstance, {
nitroApp.hooks.hook("response", async (_response, event) => {
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
const identifyUser = createAuthMiddleware(${getAuthExpression(config)} as BetterAuthInstance, {
exclude: ["/api/auth/**"],
maskEmail: true,
});
await identify(event);
await identifyUser(useLogger(event), event.req.headers, new URL(event.req.url).pathname);
});
});
`;
}

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

const identifyUser = createAuthMiddleware(${getAuthExpression(config)} as BetterAuthInstance, {
exclude: ["/api/auth/**"],
maskEmail: true,
});

export default defineNitroPlugin((nitroApp) => {
nitroApp.hooks.hook(
"request",
createAuthIdentifier(${getAuthExpression(config)} as BetterAuthInstance, {
exclude: ["/api/auth/**"],
maskEmail: true,
}),
);
nitroApp.hooks.hook("response", async (_response, event) => {
await identifyUser(useLogger(event), event.req.headers, new URL(event.req.url).pathname);
});
});
`;
}
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