Merge pull request ubiquity-os#115 from 0x4007/chore/rename-webhook-s…

…ecret
gentlementlegen · Sep 26, 2024 · e8249ed · e8249ed
2 parents d2c75cd + 73a5d69
commit e8249ed
Show file tree

Hide file tree

Showing 9 changed files with 202 additions and 10 deletions.
diff --git a/.dev.vars.example b/.dev.vars.example
@@ -1,3 +1,3 @@
 WEBHOOK_PROXY_URL=https://smee.io/new
-WEBHOOK_SECRET=xxxxxx
+APP_WEBHOOK_SECRET=xxxxxx
 APP_ID=123456
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -52,9 +52,9 @@ jobs:
           secrets: |
             APP_ID
             APP_PRIVATE_KEY
-            WEBHOOK_SECRET
+            APP_WEBHOOK_SECRET
         env:
-          WEBHOOK_SECRET: ${{ secrets.WEBHOOK_SECRET }}
+          APP_WEBHOOK_SECRET: ${{ secrets.APP_WEBHOOK_SECRET }}
           APP_ID: ${{ secrets.APP_ID }}
           APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
 

diff --git a/.github/workflows/bun-testing.yml b/.github/workflows/bun-testing.yml
@@ -6,7 +6,7 @@ on:
 
 env:
   NODE_ENV: "test"
-  WEBHOOK_SECRET: ${{ secrets.WEBHOOK_SECRET }}
+  APP_WEBHOOK_SECRET: ${{ secrets.APP_WEBHOOK_SECRET }}
   APP_ID: ${{ secrets.APP_ID }}
   APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ The kernel is designed to:
 
   **Note:** Replace `YOUR_APP_PRIVATE_KEY.PEM` with the path to your actual PEM file when running the command.
 
-- **`WEBHOOK_SECRET`**
+- **`APP_WEBHOOK_SECRET`**
   Set this value in both your GitHub App settings and here.
 
 - **`APP_ID`**

diff --git a/bun.lockb b/bun.lockb
diff --git a/src/github/types/env.ts b/src/github/types/env.ts
@@ -1,7 +1,7 @@
 import { Type as T, type Static } from "@sinclair/typebox";
 
 export const envSchema = T.Object({
-  WEBHOOK_SECRET: T.String({ minLength: 1 }),
+  APP_WEBHOOK_SECRET: T.String({ minLength: 1 }),
   APP_ID: T.String({ minLength: 1 }),
   APP_PRIVATE_KEY: T.String({ minLength: 1 }),
 });
@@ -15,7 +15,7 @@ declare global {
   namespace NodeJS {
     interface ProcessEnv {
       APP_ID: string;
-      WEBHOOK_SECRET: string;
+      APP_WEBHOOK_SECRET: string;
       APP_PRIVATE_KEY: string;
     }
   }

diff --git a/src/worker.ts b/src/worker.ts
@@ -14,7 +14,7 @@ export default {
       const signatureSha256 = getSignature(request);
       const id = getId(request);
       const eventHandler = new GitHubEventHandler({
-        webhookSecret: env.WEBHOOK_SECRET,
+        webhookSecret: env.APP_WEBHOOK_SECRET,
         appId: env.APP_ID,
         privateKey: env.APP_PRIVATE_KEY,
         pluginChainState: new CloudflareKv(env.PLUGIN_CHAIN_STATE),

diff --git a/tests/main.test.ts b/tests/main.test.ts
@@ -58,7 +58,7 @@ describe("Worker tests", () => {
     const req = new Request("http://localhost:8080");
     const consoleSpy = jest.spyOn(console, "error").mockImplementation(() => jest.fn());
     const res = await worker.fetch(req, {
-      WEBHOOK_SECRET: "",
+      APP_WEBHOOK_SECRET: "",
       APP_ID: "",
       APP_PRIVATE_KEY: "",
       PLUGIN_CHAIN_STATE: {} as KVNamespace,
@@ -76,7 +76,7 @@ describe("Worker tests", () => {
       },
     });
     const res = await worker.fetch(req, {
-      WEBHOOK_SECRET: "webhook-secret",
+      APP_WEBHOOK_SECRET: "webhook-secret",
       APP_ID: "app-id",
       APP_PRIVATE_KEY: "private-key",
       PLUGIN_CHAIN_STATE: {} as KVNamespace,