Refactor: globally use process.env.BASE_ID

Refactors all URLs in the app to use `process.env.BASE_ID` instead of manually specifying the Airtable app ID, in-case it ever needs to change. In reality, this is just kind of a warm-up to the codebase.
hackclub · Jan 27, 2025 · e7a6b16 · e7a6b16
1 parent 0541bee
commit e7a6b16
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 16 deletions.
diff --git a/example.env b/example.env
@@ -2,6 +2,7 @@ AIRTABLE_API_KEY=REPLACE_ME
 AIRTABLE_ENDPOINT_URL="https://middleman.hackclub.com/airtable"
 AUTH_SECRET=REPLACE_ME
 BASE_ID="appTeNFYcUiYfGcR6"
+YSWS_BASE="app3A5kJwYqxMLOgh"
 CRON_SECRET=AUTOMATICALLY_ASSIGNED_IN_PROD
 EDGE_CONFIG=AUTOMATICALLY_ASSIGNED_IN_PROD
 GITHUB_CLIENT_ID=REPLACE_ME

diff --git a/src/app/api/cron/process-background-jobs.ts b/src/app/api/cron/process-background-jobs.ts
@@ -89,7 +89,7 @@ async function processPendingPersonInitJobs() {
   }
   console.log(JSON.stringify(upsertBody, null, 2))
   const result = await fetch(
-    'https://middleman.hackclub.com/airtable/v0/appTeNFYcUiYfGcR6/tblfTzYVqvDJlIYUB',
+    `https://middleman.hackclub.com/airtable/v0/${process.env.BASE_ID}/tblfTzYVqvDJlIYUB`,
     {
       cache: 'no-cache',
       method: 'PATCH',

diff --git a/src/app/api/cron/ysws-updates.ts b/src/app/api/cron/ysws-updates.ts
@@ -1,3 +1,4 @@
+import { orThrow } from '@/lib/utils'
 import { withLock } from '../../../../lib/redis-lock'
 import Airtable from 'airtable'
 
@@ -7,19 +8,19 @@ function and(...args: string[]) {
   return `AND(${args.join(',')})`
 }
 
-function uniq(arr) {
+function uniq<T>(arr: Array<T>) {
   return Array.from(new Set(arr))
 }
 
 const base = new Airtable({
   apiKey: process.env.AIRTABLE_API_KEY,
   endpointUrl: process.env.AIRTABLE_ENDPOINT_URL,
-}).base('appTeNFYcUiYfGcR6')
+}).base(process.env.BASE_ID ?? orThrow("No BASE_ID set in environment"))
 
 const yswsBase = new Airtable({
   apiKey: process.env.AIRTABLE_API_KEY,
   endpointUrl: process.env.AIRTABLE_ENDPOINT_URL,
-}).base('app3A5kJwYqxMLOgh')
+}).base(process.env.YSWS_BASE ?? orThrow("No YSWS_BASE set in environment"))
 
 async function createNewShipChains(): Promise<void> {
   await withLock('create-ship-chains', async () => {

diff --git a/src/app/harbor/battles/fraud-utils.ts b/src/app/harbor/battles/fraud-utils.ts
@@ -11,7 +11,7 @@ export async function sendFraudReport(
   const session = await getSession()
 
   const res = await fetch(
-    'https://middleman.hackclub.com/airtable/v0/appTeNFYcUiYfGcR6/flagged_projects',
+    `https://middleman.hackclub.com/airtable/v0/${process.env.BASE_ID}/flagged_projects`,
     {
       method: 'POST',
       headers: {

diff --git a/src/app/harbor/gallery/utils.ts b/src/app/harbor/gallery/utils.ts
@@ -19,7 +19,7 @@ export async function getShips(offset: string | undefined): Promise<{
   offset: string | undefined
 }> {
   const res = await fetch(
-    `https://middleman.hackclub.com/airtable/v0/appTeNFYcUiYfGcR6/ships?view=Grid%20view${offset ? `&offset=${offset}` : ''}`,
+    `https://middleman.hackclub.com/airtable/v0/${process.env.BASE_ID}/ships?view=Grid%20view${offset ? `&offset=${offset}` : ''}`,
     {
       headers: {
         Authorization: `Bearer ${process.env.AIRTABLE_API_KEY}`,

diff --git a/src/app/slack-error/report-error.ts b/src/app/slack-error/report-error.ts
@@ -1,13 +1,14 @@
 'use server'
 
+import { orThrow } from '@/lib/utils'
 import Airtable from 'airtable'
 
 export const reportError = async (e: string) => {
   console.log('reporting error')
   const base = new Airtable({
     apiKey: process.env.AIRTABLE_API_KEY,
     endpointUrl: process.env.AIRTABLE_ENDPOINT_URL,
-  }).base('appTeNFYcUiYfGcR6')
+  }).base(process.env.BASE_ID ?? orThrow("No BASE_ID set"))
 
   base('non_user_in_slack').create(
     [

diff --git a/src/app/utils/airtable.ts b/src/app/utils/airtable.ts
@@ -62,7 +62,7 @@ export async function reportTourStep(tourStepId: string) {
     throw err
   }
 
-  await fetch('https://api.airtable.com/v0/appTeNFYcUiYfGcR6/people', {
+  await fetch(`https://api.airtable.com/v0/${process.env.BASE_ID}/people`, {
     method: 'PATCH',
     headers: {
       Authorization: `Bearer ${process.env.AIRTABLE_API_KEY}`,
@@ -94,7 +94,7 @@ export async function reportLeaderboardParticipating(participating: boolean) {
 
   try {
     const response = await fetch(
-      'https://api.airtable.com/v0/appTeNFYcUiYfGcR6/people',
+      `https://api.airtable.com/v0/${process.env.BASE_ID}/people`,
       {
         method: 'PATCH',
         headers: {

diff --git a/src/app/utils/auth.ts b/src/app/utils/auth.ts
@@ -78,3 +78,5 @@ export async function impersonate(slackId: string) {
 
   await signAndSet(session)
 }
+
+export type { HsSession }
diff --git a/src/app/utils/data.ts b/src/app/utils/data.ts
@@ -87,7 +87,7 @@ export async function fetchShips(
     {ship_status} != 'deleted'
   )`
 
-  let url = `https://middleman.hackclub.com/airtable/v0/appTeNFYcUiYfGcR6/ships?filterByFormula=${encodeURIComponent(
+  let url = `https://middleman.hackclub.com/airtable/v0/${process.env.BASE_ID}/ships?filterByFormula=${encodeURIComponent(
     filterFormula,
   )}`
   if (maxRecords != null) url += `&maxRecords=${maxRecords}`
@@ -179,7 +179,7 @@ export async function getBestShips(): Promise<BestShip[]> {
   console.log('Best ships MISS')
 
   const recordPromise = await fetch(
-    'https://middleman.hackclub.com/airtable/v0/appTeNFYcUiYfGcR6/tblHeGZNG00d4GBBV?limit=3&view=viwHvRRLCwPMOmRhj',
+    `https://middleman.hackclub.com/airtable/v0/${process.env.BASE_ID}/tblHeGZNG00d4GBBV?limit=3&view=viwHvRRLCwPMOmRhj`,
     {
       headers: {
         Authorization: `Bearer ${process.env.AIRTABLE_API_KEY}`,

diff --git a/src/app/utils/server/auth.ts b/src/app/utils/server/auth.ts
@@ -121,7 +121,7 @@ export async function createSlackSession(slackOpenidToken: string) {
 
       // Let's create a Person record
       const result = await fetch(
-        'https://middleman.hackclub.com/airtable/v0/appTeNFYcUiYfGcR6/people',
+        `https://middleman.hackclub.com/airtable/v0/${process.env.BASE_ID}/people`,
         {
           method: 'POST',
           headers: {

diff --git a/src/app/utils/server/data.ts b/src/app/utils/server/data.ts
@@ -39,7 +39,7 @@ export async function person(): Promise<any> {
   console.log('Person cache MISS')
 
   const recordPromise = fetch(
-    `https://middleman.hackclub.com/airtable/v0/appTeNFYcUiYfGcR6/people/${session.personId}`,
+    `https://middleman.hackclub.com/airtable/v0/${process.env.BASE_ID}/people/${session.personId}`,
     {
       headers: {
         Authorization: `Bearer ${process.env.AIRTABLE_API_KEY}`,
@@ -134,7 +134,7 @@ export interface SignpostFeedItem {
 }
 export async function fetchSignpostFeed(): Promise<SignpostFeedItem[]> {
   const result = await fetch(
-    'https://middleman.hackclub.com/airtable/v0/appTeNFYcUiYfGcR6/signpost',
+    `https://middleman.hackclub.com/airtable/v0/${process.env.BASE_ID}/signpost`,
     {
       headers: {
         Authorization: `Bearer ${process.env.AIRTABLE_API_KEY}`,
@@ -189,7 +189,7 @@ export interface ShopItem {
 }
 export async function fetchShopItems(): Promise<ShopItem[]> {
   const result = await fetch(
-    'https://middleman.hackclub.com/airtable/v0/appTeNFYcUiYfGcR6/shop_items',
+    `https://middleman.hackclub.com/airtable/v0/${process.env.BASE_ID}/shop_items`,
     {
       headers: {
         Authorization: `Bearer ${process.env.AIRTABLE_API_KEY}`,

diff --git a/src/app/utils/waka.ts b/src/app/utils/waka.ts
@@ -63,7 +63,7 @@ export interface WakaInfo {
 
 //     // Add to person record
 //     const res = await fetch(
-//       `https://middleman.hackclub.com/airtable/v0/appTeNFYcUiYfGcR6/people`,
+//       `https://middleman.hackclub.com/airtable/v0/${process.env.BASE_ID}/people`,
 //       {
 //         method: "PATCH",
 //         headers: {

diff --git a/src/lib/utils.ts b/src/lib/utils.ts
@@ -4,3 +4,7 @@ import { twMerge } from 'tailwind-merge'
 export function cn(...inputs: ClassValue[]) {
   return twMerge(clsx(inputs))
 }
+
+export function orThrow(message?: string): never {
+  throw new Error(message ?? 'An error occurred.')
+}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -78,3 +78,5 @@ export async function impersonate(slackId: string) {

		await signAndSet(session)
		}

		export type { HsSession }