Merge pull request #7 from pipedrive/AINATIVEM-44

AINATIVEM-44 OAuth callback, token repository, and pipedrive client generator

Author: youssef-saber-3

package.json

@@ -12,6 +12,7 @@
     "lint": "eslint src",
     "test": "vitest run",
     "typecheck": "tsc --noEmit",
+    "clean": "rm -rf apps/",
     "generate": "tsx src/cli.ts apps/test-app",
     "prepare": "husky"
   },

src/cli.test.ts

@@ -3,21 +3,13 @@ import { pathToFileURL } from 'node:url';
 import { isCliEntrypoint, nextStepLines } from './cli.js';
 
 describe('nextStepLines', () => {
-	it('prints backend-only next steps for apps without App Extensions', () => {
-		expect(nextStepLines({ nameOrPath: 'test-app', database: 'sqlite', installDeps: false, hasAppExtensions: false }).join('\n')).toBe(`
+	it('outputs the four next steps', () => {
+		expect(nextStepLines({ nameOrPath: 'test-app' }).join('\n')).toBe(`
 Next steps:
   cd test-app
   cp .env.example .env
-  npm install
-  npm run dev`);
-	});
-
-	it('prints the Compose Watch command when App Extensions are selected', () => {
-		expect(nextStepLines({ nameOrPath: 'test-app', database: 'postgres', installDeps: true, hasAppExtensions: true }).join('\n')).toBe(`
-Next steps:
-  cd test-app
-  cp .env.example .env
-  docker-compose up --watch`);
+  # fill in PIPEDRIVE_CLIENT_ID and PIPEDRIVE_CLIENT_SECRET
+  docker compose up`);
 	});
 });
 

src/cli.ts

@@ -1,35 +1,23 @@
 import * as clack from '@clack/prompts';
-import { spawn } from 'node:child_process';
 import { realpathSync } from 'node:fs';
 import { basename, resolve } from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import { promptAppExtensions } from './prompts/appExtensions.js';
 import { promptDatabase } from './prompts/database.js';
 import { promptProjectName } from './prompts/projectName.js';
-import { promptWebhooks } from './prompts/webhooks.js';
 import { nodeGenerator } from './generators/node/index.js';
-import type { Database } from './generators/interface.js';
 
 interface NextStepOptions {
 	nameOrPath: string;
-	database: Database;
-	installDeps: boolean;
-	hasAppExtensions: boolean;
 }
 
 export function nextStepLines(options: NextStepOptions): string[] {
-	const needsDocker = options.database === 'postgres' || options.database === 'mysql';
-	const runWithCompose = options.hasAppExtensions;
-
-	const steps = [`cd ${options.nameOrPath}`, 'cp .env.example .env'];
-
-	if (runWithCompose) {
-		steps.push('docker-compose up --watch');
-	} else {
-		if (needsDocker) steps.push('docker-compose up -d db');
-		if (!options.installDeps) steps.push('npm install');
-		steps.push('npm run dev');
-	}
+	const steps = [
+		`cd ${options.nameOrPath}`,
+		'cp .env.example .env',
+		'# fill in PIPEDRIVE_CLIENT_ID and PIPEDRIVE_CLIENT_SECRET',
+		'docker compose up',
+	];
 
 	return ['', 'Next steps:', ...steps.map((s) => `  ${s}`)];
 }
@@ -62,39 +50,20 @@ async function main(): Promise<void> {
 	const nameOrPath = await promptProjectName(process.argv[2]);
 	const database = await promptDatabase();
 	const appExtensions = await promptAppExtensions();
-	const webhooks = await promptWebhooks();
 
 	const outputDir = resolve(process.cwd(), nameOrPath);
 	const projectName = basename(outputDir);
 
 	try {
-		await nodeGenerator.generate(outputDir, { projectName, database, appExtensions, webhooks });
+		await nodeGenerator.generate(outputDir, { projectName, database, appExtensions });
 	} catch (error) {
 		clack.log.error(`Generation failed: ${error instanceof Error ? error.message : String(error)}`);
 		process.exit(1);
 	}
 
 	clack.outro(`✓ Created ${projectName}`);
 
-	const installDeps = await clack.confirm({ message: 'Install dependencies now?' });
-	if (clack.isCancel(installDeps)) process.exit(0);
-
-	if (installDeps) {
-		const spinner = clack.spinner();
-		spinner.start('Installing dependencies');
-		const ok = await new Promise<boolean>((resolve) => {
-			const child = spawn('npm', ['install'], { cwd: outputDir, stdio: 'ignore' });
-			child.on('close', (code) => resolve(code === 0));
-		});
-		spinner.stop(ok ? 'Dependencies installed' : 'npm install failed — run it manually');
-	}
-
-	printNextSteps({
-		nameOrPath,
-		database,
-		installDeps: Boolean(installDeps),
-		hasAppExtensions: appExtensions.length > 0,
-	});
+	printNextSteps({ nameOrPath });
 }
 
 if (isCliEntrypoint(import.meta.url, process.argv[1])) {

src/generators/interface.ts

@@ -4,7 +4,6 @@ export type AppExtensionType = 'custom-panel' | 'custom-modal';
 export interface GeneratorOptions {
 	projectName: string;
 	database: Database;
-	webhooks: boolean;
 	appExtensions: AppExtensionType[];
 }
 

src/generators/node/app.test.ts

@@ -21,40 +21,39 @@ describe('generateApp', () => {
 		const content = await getAppContent({
 			projectName: 'test-app',
 			database: 'postgres',
-			webhooks: false,
 			appExtensions: [],
 		});
 		expect(content).toContain("from 'express'");
 		expect(content).toContain("from './oauth/index.js'");
+		expect(content).toContain('createAuthRedirect');
 		expect(content).toContain("app.use('/oauth'");
 	});
 
-	it('includes webhooks import and mount when webhooks is true', async () => {
+	it('has root route that redirects to oauth when not installed', async () => {
 		const content = await getAppContent({
 			projectName: 'test-app',
 			database: 'postgres',
-			webhooks: true,
 			appExtensions: [],
 		});
-		expect(content).toContain("from './webhooks/index.js'");
-		expect(content).toContain("app.use('/webhooks'");
+		expect(content).toContain("app.get('/'");
+		expect(content).toContain('createAuthRedirect()');
+		expect(content).toContain('client.deals.getDeals()');
 	});
 
-	it('excludes webhooks when webhooks is false', async () => {
+	it('has global error handler', async () => {
 		const content = await getAppContent({
 			projectName: 'test-app',
 			database: 'postgres',
-			webhooks: false,
 			appExtensions: [],
 		});
-		expect(content).not.toContain('./webhooks/index.js');
+		expect(content).toContain('NextFunction');
+		expect(content).toContain('res.status(500)');
 	});
 
 	it('includes panel import and mount when custom-panel is selected', async () => {
 		const content = await getAppContent({
 			projectName: 'test-app',
 			database: 'postgres',
-			webhooks: false,
 			appExtensions: ['custom-panel'],
 		});
 		expect(content).toContain("from './app-extensions/panel/index.js'");
@@ -67,7 +66,6 @@ describe('generateApp', () => {
 		const content = await getAppContent({
 			projectName: 'test-app',
 			database: 'postgres',
-			webhooks: false,
 			appExtensions: ['custom-modal'],
 		});
 		expect(content).toContain("from './app-extensions/modal/index.js'");
@@ -78,7 +76,6 @@ describe('generateApp', () => {
 		const content = await getAppContent({
 			projectName: 'test-app',
 			database: 'sqlite',
-			webhooks: false,
 			appExtensions: [],
 		});
 		expect(content).not.toContain('./app-extensions');

src/generators/node/app.ts

@@ -1,3 +1,4 @@
+import dedent from 'dedent';
 import { join } from 'path';
 import { writeFile } from '../../utils/writeFile.js';
 import type { GeneratorOptions } from '../interface.js';
@@ -11,25 +12,55 @@ export async function generateApp(outputDir: string, options: GeneratorOptions):
 
 	const mounts = new RouterMountBuilder()
 		.add('/oauth', 'oauthRouter')
-		.addIf(options.webhooks, '/webhooks', 'webhooksRouter')
 		.addIf(hasPanel, '/extensions/panel', 'panelRouter')
 		.addIf(hasModal, '/extensions/modal', 'modalRouter')
 		.build();
 
+	const rootRoute = dedent`
+		app.get('/', async (_req, res, next) => {
+			try {
+				const rows = await db.select().from(pipedriveTokens).orderBy(desc(pipedriveTokens.updatedAt)).limit(1);
+				if (!rows[0]) {
+					res.redirect(createAuthRedirect());
+					return;
+				}
+				const client = await getClient(rows[0].pipedriveCompanyId);
+				const deals = await client.deals.getDeals();
+				res.json(deals);
+			} catch (err) {
+				next(err);
+			}
+		});
+	`;
+
+	const errorHandler = dedent`
+		app.use((err: Error, _req: Request, res: Response, _next: NextFunction) => {
+			console.error(err);
+			res.status(500).send(err.message);
+		});
+	`;
+
 	const content = new SourceFileBuilder()
 		.importDefault('express', 'express')
+		.import('express', ['NextFunction', 'Request', 'Response'])
 		.importIf(hasAppExtensions, 'node:path', ['join'])
 		.importDefault('./oauth/index.js', 'oauthRouter')
-		.importDefaultIf(options.webhooks, './webhooks/index.js', 'webhooksRouter')
+		.import('./oauth/index.js', ['createAuthRedirect'])
+		.import('./pipedrive/client.js', ['getClient'])
+		.import('./database/index.js', ['db'])
+		.import('./database/schema.js', ['pipedriveTokens'])
+		.import('drizzle-orm', ['desc'])
 		.importDefaultIf(hasPanel, './app-extensions/panel/index.js', 'panelRouter')
 		.importDefaultIf(hasModal, './app-extensions/modal/index.js', 'modalRouter')
 		.addBlock('const app = express();')
+		.addBlock(rootRoute)
 		.addBlockIf(
 			hasAppExtensions,
 			"const appExtensionAssetsPath = join(process.cwd(), 'frontend/app-extension-ui/dist/assets');",
 		)
 		.addBlockIf(hasAppExtensions, "app.use('/extensions/assets', express.static(appExtensionAssetsPath));")
 		.addBlock(mounts)
+		.addBlock(errorHandler)
 		.exportDefault('app')
 		.build();
 

src/generators/node/appExtensions.test.ts

@@ -21,7 +21,6 @@ describe('generateAppExtensions', () => {
 		const options: GeneratorOptions = {
 			projectName: 'test-app',
 			database: 'postgres',
-			webhooks: false,
 			appExtensions: ['custom-panel'],
 		};
 		await generateAppExtensions(tmpDir, options);
@@ -40,7 +39,6 @@ describe('generateAppExtensions', () => {
 		const options: GeneratorOptions = {
 			projectName: 'test-app',
 			database: 'postgres',
-			webhooks: false,
 			appExtensions: ['custom-modal'],
 		};
 		await generateAppExtensions(tmpDir, options);
@@ -58,7 +56,6 @@ describe('generateAppExtensions', () => {
 		const options: GeneratorOptions = {
 			projectName: 'test-app',
 			database: 'postgres',
-			webhooks: false,
 			appExtensions: ['custom-panel', 'custom-modal'],
 		};
 		await generateAppExtensions(tmpDir, options);