create-better-t-stack 3.11.1 → 3.12.0

package/templates/auth/better-auth/server/base/src/index.ts.hbs

@@ -1,6 +1,7 @@
 {{#if (eq orm "prisma")}}
 import { betterAuth } from "better-auth";
 import { prismaAdapter } from "better-auth/adapters/prisma";
+import { env } from "@{{projectName}}/env/server";
 {{#if (eq payments "polar")}}
 import { polar, checkout, portal } from "@polar-sh/better-auth";
 import { polarClient } from "./lib/payments";
@@ -8,52 +9,52 @@ import { polarClient } from "./lib/payments";
 import prisma from "@{{projectName}}/db";
 
 export const auth = betterAuth({
-  database: prismaAdapter(prisma, {
-    {{#if (eq database "postgres")}}provider: "postgresql",{{/if}}
-    {{#if (eq database "sqlite")}}provider: "sqlite",{{/if}}
-    {{#if (eq database "mysql")}}provider: "mysql",{{/if}}
-    {{#if (eq database "mongodb")}}provider: "mongodb",{{/if}}
-  }),
-  trustedOrigins: [
-    process.env.CORS_ORIGIN || "",
-    {{#if (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles"))}}
-    "mybettertapp://", "exp://"
-    {{/if}}
-  ],
-  emailAndPassword: {
-    enabled: true,
-  },
-  {{#if (ne backend "self")}}
-  advanced: {
-    defaultCookieAttributes: {
-      sameSite: "none",
-      secure: true,
-      httpOnly: true,
-    },
-  },
-  {{/if}}
-  {{#if (eq payments "polar")}}
-  plugins: [
-    polar({
-      client: polarClient,
-      createCustomerOnSignUp: true,
-      enableCustomerPortal: true,
-      use: [
-        checkout({
-          products: [
-            {
-              productId: "your-product-id",
-              slug: "pro",
-            },
-          ],
-          successUrl: process.env.POLAR_SUCCESS_URL,
-          authenticatedUsersOnly: true,
-        }),
-        portal(),
-      ],
-    }),
-  ],
-  {{/if}}
+	database: prismaAdapter(prisma, {
+{{#if (eq database "postgres")}}provider: "postgresql",{{/if}}
+{{#if (eq database "sqlite")}}provider: "sqlite",{{/if}}
+{{#if (eq database "mysql")}}provider: "mysql",{{/if}}
+{{#if (eq database "mongodb")}}provider: "mongodb",{{/if}}
+	}),
+	trustedOrigins: [
+		env.CORS_ORIGIN,
+{{#if (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles"))}}
+		"mybettertapp://", "exp://"
+{{/if}}
+	],
+	emailAndPassword: {
+		enabled: true,
+	},
+{{#if (ne backend "self")}}
+	advanced: {
+		defaultCookieAttributes: {
+			sameSite: "none",
+			secure: true,
+			httpOnly: true,
+		},
+	},
+{{/if}}
+{{#if (eq payments "polar")}}
+	plugins: [
+		polar({
+			client: polarClient,
+			createCustomerOnSignUp: true,
+			enableCustomerPortal: true,
+			use: [
+				checkout({
+					products: [
+						{
+							productId: "your-product-id",
+							slug: "pro",
+						},
+					],
+					successUrl: env.POLAR_SUCCESS_URL,
+					authenticatedUsersOnly: true,
+				}),
+				portal(),
+			],
+		}),
+	],
+{{/if}}
 });
 {{/if}}
 
@@ -61,6 +62,7 @@ export const auth = betterAuth({
 {{#if (or (eq runtime "bun") (eq runtime "node") (eq runtime "none"))}}
 import { betterAuth } from "better-auth";
 import { drizzleAdapter } from "better-auth/adapters/drizzle";
+import { env } from "@{{projectName}}/env/server";
 {{#if (eq payments "polar")}}
 import { polar, checkout, portal } from "@polar-sh/better-auth";
 import { polarClient } from "./lib/payments";
@@ -69,133 +71,134 @@ import { db } from "@{{projectName}}/db";
 import * as schema from "@{{projectName}}/db/schema/auth";
 
 export const auth = betterAuth({
-  database: drizzleAdapter(db, {
-    {{#if (eq database "postgres")}}provider: "pg",{{/if}}
-    {{#if (eq database "sqlite")}}provider: "sqlite",{{/if}}
-    {{#if (eq database "mysql")}}provider: "mysql",{{/if}}
-    schema: schema,
-  }),
-  trustedOrigins: [
-    process.env.CORS_ORIGIN || "",
-    {{#if (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles"))}}
-    "mybettertapp://", "exp://"
-    {{/if}}
-  ],
-  emailAndPassword: {
-    enabled: true,
-  },
-  {{#if (ne backend "self")}}
-  advanced: {
-    defaultCookieAttributes: {
-      sameSite: "none",
-      secure: true,
-      httpOnly: true,
-    },
-  },
-  {{/if}}
-  {{#if (eq payments "polar")}}
-  plugins: [
-    polar({
-      client: polarClient,
-      createCustomerOnSignUp: true,
-      enableCustomerPortal: true,
-      use: [
-        checkout({
-          products: [
-            {
-              productId: "your-product-id",
-              slug: "pro",
-            },
-          ],
-          successUrl: process.env.POLAR_SUCCESS_URL,
-          authenticatedUsersOnly: true,
-        }),
-        portal(),
-      ],
-    }),
-  ],
-  {{/if}}
+	database: drizzleAdapter(db, {
+{{#if (eq database "postgres")}}provider: "pg",{{/if}}
+{{#if (eq database "sqlite")}}provider: "sqlite",{{/if}}
+{{#if (eq database "mysql")}}provider: "mysql",{{/if}}
+		schema: schema,
+	}),
+	trustedOrigins: [
+		env.CORS_ORIGIN,
+{{#if (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles"))}}
+		"mybettertapp://", "exp://"
+{{/if}}
+	],
+	emailAndPassword: {
+		enabled: true,
+	},
+{{#if (ne backend "self")}}
+	advanced: {
+		defaultCookieAttributes: {
+			sameSite: "none",
+			secure: true,
+			httpOnly: true,
+		},
+	},
+{{/if}}
+{{#if (eq payments "polar")}}
+	plugins: [
+		polar({
+			client: polarClient,
+			createCustomerOnSignUp: true,
+			enableCustomerPortal: true,
+			use: [
+				checkout({
+					products: [
+						{
+							productId: "your-product-id",
+							slug: "pro",
+						},
+					],
+					successUrl: env.POLAR_SUCCESS_URL,
+					authenticatedUsersOnly: true,
+				}),
+				portal(),
+			],
+		}),
+	],
+{{/if}}
 });
 {{/if}}
 
 {{#if (eq runtime "workers")}}
 import { betterAuth } from "better-auth";
 import { drizzleAdapter } from "better-auth/adapters/drizzle";
+import { env } from "@{{projectName}}/env/server";
 {{#if (eq payments "polar")}}
 import { polar, checkout, portal } from "@polar-sh/better-auth";
 import { polarClient } from "./lib/payments";
 {{/if}}
 import { db } from "@{{projectName}}/db";
 import * as schema from "@{{projectName}}/db/schema/auth";
-import { env } from "cloudflare:workers";
 
 export const auth = betterAuth({
-  database: drizzleAdapter(db, {
-    {{#if (eq database "postgres")}}provider: "pg",{{/if}}
-    {{#if (eq database "sqlite")}}provider: "sqlite",{{/if}}
-    {{#if (eq database "mysql")}}provider: "mysql",{{/if}}
-    schema: schema,
-  }),
-  trustedOrigins: [
-    env.CORS_ORIGIN,
-    {{#if (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles"))}}
-    "mybettertapp://", "exp://"
-    {{/if}}
-  ],
-  emailAndPassword: {
-    enabled: true,
-  },
-  // uncomment cookieCache setting when ready to deploy to Cloudflare using *.workers.dev domains
-  // session: {
-  //   cookieCache: {
-  //     enabled: true,
-  //     maxAge: 60,
-  //   },
-  // },
-  secret: env.BETTER_AUTH_SECRET,
-  baseURL: env.BETTER_AUTH_URL,
-  advanced: {
-    defaultCookieAttributes: {
-      sameSite: "none",
-      secure: true,
-      httpOnly: true,
-    },
-    // uncomment crossSubDomainCookies setting when ready to deploy and replace <your-workers-subdomain> with your actual workers subdomain
-    // https://developers.cloudflare.com/workers/wrangler/configuration/#workersdev
-    // crossSubDomainCookies: {
-    //   enabled: true,
-    //   domain: "<your-workers-subdomain>",
-    // },
-  },
-  {{#if (eq payments "polar")}}
-  plugins: [
-    polar({
-      client: polarClient,
-      createCustomerOnSignUp: true,
-      enableCustomerPortal: true,
-      use: [
-        checkout({
-          products: [
-            {
-              productId: "your-product-id",
-              slug: "pro",
-            },
-          ],
-          successUrl: env.POLAR_SUCCESS_URL,
-          authenticatedUsersOnly: true,
-        }),
-        portal(),
-      ],
-    }),
-  ],
-  {{/if}}
+	database: drizzleAdapter(db, {
+{{#if (eq database "postgres")}}provider: "pg",{{/if}}
+{{#if (eq database "sqlite")}}provider: "sqlite",{{/if}}
+{{#if (eq database "mysql")}}provider: "mysql",{{/if}}
+		schema: schema,
+	}),
+	trustedOrigins: [
+		env.CORS_ORIGIN,
+{{#if (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles"))}}
+		"mybettertapp://", "exp://"
+{{/if}}
+	],
+	emailAndPassword: {
+		enabled: true,
+	},
+	// uncomment cookieCache setting when ready to deploy to Cloudflare using *.workers.dev domains
+	// session: {
+	//   cookieCache: {
+	//     enabled: true,
+	//     maxAge: 60,
+	//   },
+	// },
+	secret: env.BETTER_AUTH_SECRET,
+	baseURL: env.BETTER_AUTH_URL,
+	advanced: {
+		defaultCookieAttributes: {
+			sameSite: "none",
+			secure: true,
+			httpOnly: true,
+		},
+		// uncomment crossSubDomainCookies setting when ready to deploy and replace <your-workers-subdomain> with your actual workers subdomain
+		// https://developers.cloudflare.com/workers/wrangler/configuration/#workersdev
+		// crossSubDomainCookies: {
+		//   enabled: true,
+		//   domain: "<your-workers-subdomain>",
+		// },
+	},
+{{#if (eq payments "polar")}}
+	plugins: [
+		polar({
+			client: polarClient,
+			createCustomerOnSignUp: true,
+			enableCustomerPortal: true,
+			use: [
+				checkout({
+					products: [
+						{
+							productId: "your-product-id",
+							slug: "pro",
+						},
+					],
+					successUrl: env.POLAR_SUCCESS_URL,
+					authenticatedUsersOnly: true,
+				}),
+				portal(),
+			],
+		}),
+	],
+{{/if}}
 });
-  {{/if}}
+{{/if}}
 {{/if}}
 
 {{#if (eq orm "mongoose")}}
 import { betterAuth } from "better-auth";
 import { mongodbAdapter } from "better-auth/adapters/mongodb";
+import { env } from "@{{projectName}}/env/server";
 {{#if (eq payments "polar")}}
 import { polar, checkout, portal } from "@polar-sh/better-auth";
 import { polarClient } from "./lib/payments";
@@ -203,98 +206,99 @@ import { polarClient } from "./lib/payments";
 import { client } from "@{{projectName}}/db";
 
 export const auth = betterAuth({
-  database: mongodbAdapter(client),
-  trustedOrigins: [
-    process.env.CORS_ORIGIN || "",
-    {{#if (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles"))}}
-    "mybettertapp://", "exp://"
-    {{/if}}
-  ],
-  emailAndPassword: {
-    enabled: true,
-  },
-  {{#if (ne backend "self")}}
-  advanced: {
-    defaultCookieAttributes: {
-      sameSite: "none",
-      secure: true,
-      httpOnly: true,
-    },
-  },
-  {{/if}}
-  {{#if (eq payments "polar")}}
-  plugins: [
-    polar({
-      client: polarClient,
-      createCustomerOnSignUp: true,
-      enableCustomerPortal: true,
-      use: [
-        checkout({
-          products: [
-            {
-              productId: "your-product-id",
-              slug: "pro",
-            },
-          ],
-          successUrl: process.env.POLAR_SUCCESS_URL,
-          authenticatedUsersOnly: true,
-        }),
-        portal(),
-      ],
-    }),
-  ],
-  {{/if}}
+	database: mongodbAdapter(client),
+	trustedOrigins: [
+		env.CORS_ORIGIN,
+{{#if (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles"))}}
+		"mybettertapp://", "exp://"
+{{/if}}
+	],
+	emailAndPassword: {
+		enabled: true,
+	},
+{{#if (ne backend "self")}}
+	advanced: {
+		defaultCookieAttributes: {
+			sameSite: "none",
+			secure: true,
+			httpOnly: true,
+		},
+	},
+{{/if}}
+{{#if (eq payments "polar")}}
+	plugins: [
+		polar({
+			client: polarClient,
+			createCustomerOnSignUp: true,
+			enableCustomerPortal: true,
+			use: [
+				checkout({
+					products: [
+						{
+							productId: "your-product-id",
+							slug: "pro",
+						},
+					],
+					successUrl: env.POLAR_SUCCESS_URL,
+					authenticatedUsersOnly: true,
+				}),
+				portal(),
+			],
+		}),
+	],
+{{/if}}
 });
 {{/if}}
 
 {{#if (eq orm "none")}}
 import { betterAuth } from "better-auth";
+import { env } from "@{{projectName}}/env/server";
 {{#if (eq payments "polar")}}
 import { polar, checkout, portal } from "@polar-sh/better-auth";
 import { polarClient } from "./lib/payments";
 {{/if}}
 
 export const auth = betterAuth({
-  database: "", // Invalid configuration
-  trustedOrigins: [
-    process.env.CORS_ORIGIN || "",
-    {{#if (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles"))}}
-    "mybettertapp://", "exp://"
-    {{/if}}
-  ],
-  emailAndPassword: {
-    enabled: true,
-  },
-  {{#if (ne backend "self")}}
-  advanced: {
-    defaultCookieAttributes: {
-      sameSite: "none",
-      secure: true,
-      httpOnly: true,
-    },
-  },
-  {{/if}}
-  {{#if (eq payments "polar")}}
-  plugins: [
-    polar({
-      client: polarClient,
-      createCustomerOnSignUp: true,
-      enableCustomerPortal: true,
-      use: [
-        checkout({
-          products: [
-            {
-              productId: "your-product-id",
-              slug: "pro",
-            },
-          ],
-          successUrl: process.env.POLAR_SUCCESS_URL,
-          authenticatedUsersOnly: true,
-        }),
-        portal(),
-      ],
-    }),
-  ],
-  {{/if}}
+	database: "", // Invalid configuration
+	trustedOrigins: [
+		env.CORS_ORIGIN,
+{{#if (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles"))}}
+		"mybettertapp://", "exp://"
+{{/if}}
+	],
+	emailAndPassword: {
+		enabled: true,
+	},
+{{#if (ne backend "self")}}
+	advanced: {
+		defaultCookieAttributes: {
+			sameSite: "none",
+			secure: true,
+			httpOnly: true,
+		},
+	},
+{{/if}}
+{{#if (eq payments "polar")}}
+	plugins: [
+		polar({
+			client: polarClient,
+			createCustomerOnSignUp: true,
+			enableCustomerPortal: true,
+			use: [
+				checkout({
+					products: [
+						{
+							productId: "your-product-id",
+							slug: "pro",
+						},
+					],
+					successUrl: env.POLAR_SUCCESS_URL,
+					authenticatedUsersOnly: true,
+				}),
+				portal(),
+			],
+		}),
+	],
+{{/if}}
 });
 {{/if}}

package/templates/auth/better-auth/web/nuxt/app/plugins/auth-client.ts.hbs

@@ -3,12 +3,11 @@ import { createAuthClient } from "better-auth/vue";
 import { polarClient } from "@polar-sh/better-auth";
 {{/if}}
 
-export default defineNuxtPlugin((nuxtApp) => {
+export default defineNuxtPlugin(() => {
   const config = useRuntimeConfig();
-  const serverUrl = config.public.serverURL;
 
   const authClient = createAuthClient({
-    baseURL: serverUrl,
+    baseURL: config.public.serverUrl,
     {{#if (eq payments "polar")}}
     plugins: [polarClient()],
     {{/if}}

package/templates/auth/better-auth/web/react/base/src/lib/auth-client.ts.hbs

@@ -2,17 +2,15 @@ import { createAuthClient } from "better-auth/react";
 {{#if (eq payments "polar")}}
 import { polarClient } from "@polar-sh/better-auth";
 {{/if}}
+{{#unless (eq backend "self")}}
+import { env } from "@{{projectName}}/env/web";
+{{/unless}}
 
 export const authClient = createAuthClient({
-  {{#unless (eq backend "self")}}
-  baseURL:
-    {{#if (includes frontend "next")}}
-      process.env.NEXT_PUBLIC_SERVER_URL,
-    {{else}}
-      import.meta.env.VITE_SERVER_URL,
-    {{/if}}
-  {{/unless}}
-  {{#if (eq payments "polar")}}
-   plugins: [polarClient()]
-  {{/if}}
+{{#unless (eq backend "self")}}
+	baseURL: env.{{#if (includes frontend "next")}}NEXT_PUBLIC_SERVER_URL{{else}}VITE_SERVER_URL{{/if}},
+{{/unless}}
+{{#if (eq payments "polar")}}
+	plugins: [polarClient()]
+{{/if}}
 });

package/templates/auth/better-auth/web/solid/src/lib/auth-client.ts.hbs

@@ -2,10 +2,11 @@ import { createAuthClient } from "better-auth/solid";
 {{#if (eq payments "polar")}}
 import { polarClient } from "@polar-sh/better-auth";
 {{/if}}
+import { env } from "@{{projectName}}/env/web";
 
 export const authClient = createAuthClient({
-  baseURL: import.meta.env.VITE_SERVER_URL,
+	baseURL: env.VITE_SERVER_URL,
 {{#if (eq payments "polar")}}
-  plugins: [polarClient()]
+	plugins: [polarClient()]
 {{/if}}
 });