[cli] Fix auth.ts file generation

packages/create-toolpad-app/src/generateProject.ts

@@ -12,7 +12,6 @@ import indexPage from './templates/indexPage';
 
 // App router specific files
 import rootLayout from './templates/nextjs-app/rootLayout';
-import NavigateButton from './templates/nextjs-app/navigateButton';
 import dashboardLayout from './templates/nextjs-app/dashboardLayout';
 
 // Pages router specific files
@@ -84,7 +83,6 @@ export default function generateProject(
       const nextJsAppRouterStarter = new Map([
         ['app/(dashboard)/layout.tsx', { content: dashboardLayout }],
         ['app/layout.tsx', { content: rootLayout(options) }],
-        ['app/NavigateButton.tsx', { content: NavigateButton }],
         ['app/(dashboard)/page.tsx', { content: indexPageContent }],
         ['app/(dashboard)/orders/page.tsx', { content: ordersPage }],
       ]);

packages/create-toolpad-app/src/templates/auth/auth.ts

@@ -20,23 +20,21 @@ const CredentialsProviderTemplate = `Credentials({
   },
 }),`;
 
-const oAuthProviderTemplate = (provider: SupportedAuthProvider) => `${kebabToPascal(provider)}({
-  clientId: process.env.${kebabToConstant(provider)}_CLIENT_ID,
-  clientSecret: process.env.${kebabToConstant(provider)}_CLIENT_SECRET,
-  ${requiresIssuer(provider) ? `issuer: process.env.${kebabToConstant(provider)}_ISSUER,\n` : ''}${requiresTenantId(provider) ? `tenantId: process.env.${kebabToConstant(provider)}_TENANT_ID,` : ''}
-  })`;
-
-const checkEnvironmentVariables = (providers: SupportedAuthProvider[] | undefined) => `
-
-const missingVars: string[] = [];
+const oAuthProviderTemplate = (provider: SupportedAuthProvider) => `
+  ${kebabToPascal(provider)}({
+    clientId: process.env.${kebabToConstant(provider)}_CLIENT_ID,
+    clientSecret: process.env.${kebabToConstant(provider)}_CLIENT_SECRET,${requiresIssuer(provider) ? `\nissuer: process.env.${kebabToConstant(provider)}_ISSUER,\n` : ''}${requiresTenantId(provider) ? `tenantId: process.env.${kebabToConstant(provider)}_TENANT_ID,` : ''}
+  }),`;
+const checkEnvironmentVariables = (
+  providers: SupportedAuthProvider[] | undefined,
+) => `const missingVars: string[] = [];
 
 const isMissing = (name: string, envVar: string | undefined) => {
   if (!envVar) {
     missingVars.push(name);
   }
 };
 
-
 ${providers
   ?.filter((p) => p !== 'credentials')
   .map(
@@ -58,24 +56,22 @@ if (missingVars.length > 0) {
 const auth: Template = (options) => {
   const providers = options.authProviders;
 
-  return `import NextAuth from 'next-auth';
-  ${providers
+  return `import NextAuth from 'next-auth';\nimport { AuthProvider, SupportedAuthProvider } from '@toolpad/core';\n${providers
     ?.map(
       (provider) =>
         `import ${kebabToPascal(provider)} from 'next-auth/providers/${provider.toLowerCase()}';`,
     )
     .join('\n')}
 import type { Provider } from 'next-auth/providers';
 
-const providers: Provider[] = [
-    ${providers
-      ?.map((provider) => {
-        if (provider === 'credentials') {
-          return CredentialsProviderTemplate;
-        }
-        return oAuthProviderTemplate(provider);
-      })
-      .join('\n')}
+const providers: Provider[] = [${providers
+    ?.map((provider) => {
+      if (provider === 'credentials') {
+        return CredentialsProviderTemplate;
+      }
+      return oAuthProviderTemplate(provider);
+    })
+    .join('\n')}
 ];
 
 ${checkEnvironmentVariables(providers)}