feat: Make DATABASE_ID no longer necessary as env var

Author: LubomirGeorgiev

.env.example

@@ -1,6 +1,5 @@
 ## Github Actions Secrets - NOT NECESSARY FOR LOCAL DEV ENVIRONMENT
 CLOUDFLARE_ACCOUNT_ID=
-DATABASE_ID=
 CLOUDFLARE_API_TOKEN=
 NEXT_PUBLIC_TURNSTILE_SITE_KEY=
 

.github/workflows/deploy.yml

@@ -40,10 +40,16 @@ jobs:
       - name: Install dependencies
         run: pnpm install
 
+      - name: Set D1 environment variables
+        id: set-d1-vars
+        run: |
+          echo "D1_DATABASE_NAME=$(node scripts/get-db-name.js)" >> $GITHUB_ENV
+          echo "D1_DATABASE_ID=$(node scripts/get-db-id.js)" >> $GITHUB_ENV
+
       - name: Deploy
         run: pnpm run deploy
         env:
-          DATABASE_ID: ${{ vars.DATABASE_ID }}
+          DATABASE_ID: ${{ env.D1_DATABASE_ID }}
           CLOUDFLARE_ACCOUNT_ID: ${{ vars.CLOUDFLARE_ACCOUNT_ID }}
           CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
           # Here you can add env variables that will be available in Next.js
@@ -56,7 +62,7 @@ jobs:
         with:
           apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
           accountId: ${{ vars.CLOUDFLARE_ACCOUNT_ID }}
-          command: d1 migrations apply ${{ vars.DATABASE_ID }} --remote
+          command: d1 migrations apply ${{ env.D1_DATABASE_NAME }} --remote
 
       - name: Purge Cloudflare CDN cache
         if: ${{ vars.CLOUDFLARE_ZONE_ID != '' }}

README.md

@@ -137,8 +137,7 @@ After making a change to wrangler.jsonc, you need to run `pnpm cf-typegen` to ge
 7. Add the API token to the Github repository secrets as `CLOUDFLARE_API_TOKEN`
 8. Add the Cloudflare account id to the Github repository variables as `CLOUDFLARE_ACCOUNT_ID`
 9. Optional: If you want clear the CDN cache on deploy, add `CLOUDFLARE_ZONE_ID` to the Github repository variables for the zone id of your domain. This is the zone id of your domain, not the account id.
-10. Add the database name to the Github repository variables as `DATABASE_ID`. This should match the database name in the `wrangler.jsonc` file.
-11. Push to the main branch
+10. Push to the main branch
 
 ## Email templates
 If you want to preview and edit the email templates you can:

package.json

@@ -14,7 +14,7 @@
     "preview": "pnpm run opennext:build && wrangler dev",
     "cf-typegen": "wrangler types --env-interface CloudflareEnv cloudflare-env.d.ts",
     "db:generate": "drizzle-kit generate --name",
-    "db:migrate:dev": "wrangler d1 migrations apply cloudflare-workers-nextjs-saas --local",
+    "db:migrate:dev": "wrangler d1 migrations apply $(node scripts/get-db-name.mjs) --local",
     "email:dev": "email dev -d src/react-email -p 3001"
   },
   "dependencies": {

scripts/get-db-id.js

@@ -0,0 +1,16 @@
+import { parseWranglerConfig } from './utils/parse-wrangler.js';
+
+try {
+  const config = parseWranglerConfig();
+  const dbId = config.d1_databases?.[0]?.database_id;
+
+  if (!dbId) {
+    console.error('Database ID not found in wrangler.jsonc');
+    process.exit(1);
+  }
+
+  console.log(dbId);
+} catch (error) {
+  console.error(error.message);
+  process.exit(1);
+}

scripts/get-db-name.mjs

@@ -0,0 +1,16 @@
+import { parseWranglerConfig } from './utils/parse-wrangler.js';
+
+try {
+  const config = parseWranglerConfig();
+  const dbName = config.d1_databases?.[0]?.database_name;
+
+  if (!dbName) {
+    console.error('Database name not found in wrangler.jsonc');
+    process.exit(1);
+  }
+
+  console.log(dbName);
+} catch (error) {
+  console.error(error.message);
+  process.exit(1);
+}

scripts/package.json

@@ -0,0 +1,4 @@
+{
+    "name": "scripts",
+    "type": "module"
+}

scripts/utils/parse-wrangler.js

@@ -0,0 +1,42 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
+/**
+ * Parses the wrangler.jsonc file and returns the configuration object
+ * @returns {object} The parsed wrangler configuration
+ * @throws {Error} If the file cannot be read or parsed
+ */
+export function parseWranglerConfig() {
+  const wranglerPath = path.join(__dirname, '..', '..', 'wrangler.jsonc');
+  const wranglerContent = fs.readFileSync(wranglerPath, 'utf8');
+
+  // Remove comments from the JSONC content
+  const jsonContent = wranglerContent.replace(/\/\*[\s\S]*?\*\/|\/\/.*/g, '');
+
+  try {
+    return JSON.parse(jsonContent);
+  } catch (error) {
+    throw new Error(`Failed to parse wrangler.jsonc: ${error.message}`);
+  }
+}
+
+/**
+ * Gets the D1 database configuration from wrangler.jsonc
+ * @returns {{ name: string, id: string } | null} The database configuration or null if not found
+ */
+export function getD1Database() {
+  const config = parseWranglerConfig();
+  const d1Config = config.d1_databases?.[0];
+
+  if (!d1Config) {
+    return null;
+  }
+
+  return {
+    name: d1Config.database_name,
+    id: d1Config.database_id
+  };
+}

src/utils/webauthn.ts

@@ -132,7 +132,7 @@ export async function verifyPasskeyAuthentication(
   await db
     .update(passKeyCredentialTable)
     .set({ counter: verification.authenticationInfo.newCounter })
-    .where(eq(passKeyCredentialTable.id, credential.id));
+    .where(eq(passKeyCredentialTable.credentialId, credential.credentialId));
 
   return {
     verification,