Better namespace env variables (#41)

silas · web-flow · commit 282fc4ef422b · 2024-11-29T21:36:37.000-05:00
diff --git a/examples/bun-api/main.ts b/examples/bun-api/main.ts
@@ -1,14 +1,14 @@
 import { AdminApi, UserApi } from "@userhub/sdk";
 
-const adminKey = process.env.ADMIN_KEY || "";
+const adminKey = process.env.USERHUB_ADMIN_KEY || "";
 if (!adminKey) {
-  console.error("ADMIN_KEY required");
+  console.error("USERHUB_ADMIN_KEY required");
   process.exit(1);
 }
 
-const userKey = process.env.USER_KEY || "";
+const userKey = process.env.USERHUB_USER_KEY || "";
 if (!userKey) {
-  console.error("USER_KEY required");
+  console.error("USERHUB_USER_KEY required");
   process.exit(1);
 }
 
diff --git a/examples/bun-webhook/main.ts b/examples/bun-webhook/main.ts
@@ -2,9 +2,9 @@ import { Webhook } from "@userhub/sdk";
 
 const port = process.env.PORT || "8000";
 
-const signingSecret = process.env.SIGNING_SECRET;
+const signingSecret = process.env.USERHUB_SIGNING_SECRET;
 if (!signingSecret) {
-  console.error("SIGNING_SECRET required");
+  console.error("USERHUB_SIGNING_SECRET required");
   process.exit(1);
 }
 
diff --git a/examples/deno-api/main.ts b/examples/deno-api/main.ts
@@ -1,14 +1,14 @@
 import { AdminApi, UserApi } from "https://deno.land/x/userhub_sdk/mod.ts";
 
-const adminKey = Deno.env.get("ADMIN_KEY") || "";
+const adminKey = Deno.env.get("USERHUB_ADMIN_KEY") || "";
 if (!adminKey) {
-  console.error("ADMIN_KEY required");
+  console.error("USERHUB_ADMIN_KEY required");
   Deno.exit(1);
 }
 
-const userKey = Deno.env.get("USER_KEY") || "";
+const userKey = Deno.env.get("USERHUB_USER_KEY") || "";
 if (!userKey) {
-  console.error("USER_KEY required");
+  console.error("USERHUB_USER_KEY required");
   Deno.exit(1);
 }
 
diff --git a/examples/deno-webhook/main.ts b/examples/deno-webhook/main.ts
@@ -2,9 +2,9 @@ import { Webhook } from "https://deno.land/x/userhub_sdk/mod.ts";
 
 const port = parseInt(Deno.env.get("PORT") || "8000", 10);
 
-const signingSecret = Deno.env.get("SIGNING_SECRET") || "";
+const signingSecret = Deno.env.get("USERHUB_SIGNING_SECRET") || "";
 if (!signingSecret) {
-  console.error("SIGNING_SECRET required");
+  console.error("USERHUB_SIGNING_SECRET required");
   Deno.exit(1);
 }
 
diff --git a/examples/express-webhook/main.mjs b/examples/express-webhook/main.mjs
@@ -3,9 +3,9 @@ import express from "express";
 
 const port = process.env.PORT || "8000";
 
-const signingSecret = process.env.SIGNING_SECRET;
+const signingSecret = process.env.USERHUB_SIGNING_SECRET;
 if (!signingSecret) {
-  console.error("SIGNING_SECRET required");
+  console.error("USERHUB_SIGNING_SECRET required");
   process.exit(1);
 }
 
diff --git a/examples/nextjs-app-webhook/app/webhook/route.js b/examples/nextjs-app-webhook/app/webhook/route.js
@@ -1,9 +1,9 @@
 import { Webhook, WebhookRequest } from "@userhub/sdk";
 
 export async function POST(req) {
-  const signingSecret = process.env.SIGNING_SECRET;
+  const signingSecret = process.env.USERHUB_SIGNING_SECRET;
   if (!signingSecret) {
-    throw new Error("SIGNING_SECRET required");
+    throw new Error("USERHUB_SIGNING_SECRET required");
   }
 
   const webhook = new Webhook(signingSecret);
diff --git a/examples/nextjs-pages-webhook/pages/api/webhook.js b/examples/nextjs-pages-webhook/pages/api/webhook.js
@@ -7,9 +7,9 @@ export const config = {
 };
 
 export default async function (req, res) {
-  const signingSecret = process.env.SIGNING_SECRET;
+  const signingSecret = process.env.USERHUB_SIGNING_SECRET;
   if (!signingSecret) {
-    throw new Error("SIGNING_SECRET required");
+    throw new Error("USERHUB_SIGNING_SECRET required");
   }
 
   const webhook = new Webhook(signingSecret);
diff --git a/examples/node-api/main.mjs b/examples/node-api/main.mjs
@@ -1,14 +1,14 @@
 import { AdminApi, UserApi } from "@userhub/sdk";
 
-const adminKey = process.env.ADMIN_KEY;
+const adminKey = process.env.USERHUB_ADMIN_KEY;
 if (!adminKey) {
-  console.error("ADMIN_KEY required");
+  console.error("USERHUB_ADMIN_KEY required");
   process.exit(1);
 }
 
-const userKey = process.env.USER_KEY;
+const userKey = process.env.USERHUB_USER_KEY;
 if (!userKey) {
-  console.error("USER_KEY required");
+  console.error("USERHUB_USER_KEY required");
   process.exit(1);
 }
 
diff --git a/examples/node-webhook/main.mjs b/examples/node-webhook/main.mjs
@@ -3,9 +3,9 @@ import { createServer } from "http";
 
 const port = process.env.PORT || "8000";
 
-const signingSecret = process.env.SIGNING_SECRET;
+const signingSecret = process.env.USERHUB_SIGNING_SECRET;
 if (!signingSecret) {
-  console.error("SIGNING_SECRET required");
+  console.error("USERHUB_SIGNING_SECRET required");
   process.exit(1);
 }
 
diff --git a/test/deno/basics_test.ts b/test/deno/basics_test.ts
@@ -1,6 +1,6 @@
 import { jsonReviser } from "../../src/internal/util.ts";
 import { AdminApi, UserApi, type adminv1 } from "../../src/mod.ts";
-import { ADMIN_KEY, USER_KEY } from "./util.ts";
+import { USERHUB_ADMIN_KEY, USERHUB_USER_KEY } from "./util.ts";
 import {
   assert,
   assertEquals,
@@ -10,25 +10,25 @@ import {
 Deno.test({
   name: "Admin API",
   fn: async () => {
-    const adminApi = new AdminApi(ADMIN_KEY);
+    const adminApi = new AdminApi(USERHUB_ADMIN_KEY);
 
     const res = await adminApi.users.list();
     assert(res);
     assertInstanceOf(res.users, Array);
   },
-  ignore: !ADMIN_KEY,
+  ignore: !USERHUB_ADMIN_KEY,
 });
 
 Deno.test({
   name: "User API",
   fn: async () => {
-    const userApi = new UserApi(USER_KEY);
+    const userApi = new UserApi(USERHUB_USER_KEY);
 
     const res = await userApi.session.get();
     assert(res);
     assertInstanceOf(res.scopes, Array);
   },
-  ignore: !USER_KEY,
+  ignore: !USERHUB_USER_KEY,
 });
 
 Deno.test("Model", () => {
diff --git a/test/deno/util.ts b/test/deno/util.ts
@@ -1,3 +1,3 @@
-export const ADMIN_KEY = Deno.env.get("TEST_ADMIN_KEY") || "";
-export const USER_KEY = Deno.env.get("TEST_USER_KEY") || "";
+export const USERHUB_ADMIN_KEY = Deno.env.get("TEST_USERHUB_ADMIN_KEY") || "";
+export const USERHUB_USER_KEY = Deno.env.get("TEST_USERHUB_USER_KEY") || "";
 export const CI = !!Deno.env.get("CI");
diff --git a/test/node/basics.test.ts b/test/node/basics.test.ts
@@ -3,19 +3,25 @@ import { jsonReviser } from "../../src/internal/util.ts";
 import type { adminv1 } from "../../src/mod.ts";
 import { AdminApi, Code, UserApi, UserHubError } from "../../src/mod.ts";
 import { createTestServer } from "./test-server.ts";
-import { ADMIN_KEY, USER_KEY, testAdmin, testSlow, testUser } from "./util.ts";
+import {
+  USERHUB_ADMIN_KEY,
+  USERHUB_USER_KEY,
+  testAdmin,
+  testSlow,
+  testUser,
+} from "./util.ts";
 import { expect, test } from "vitest";
 
 testAdmin("Admin API", async () => {
-  const adminApi = new AdminApi(ADMIN_KEY);
+  const adminApi = new AdminApi(USERHUB_ADMIN_KEY);
 
   const res = await adminApi.users.list();
   expect(res).toBeTruthy();
   expect(res.users).instanceof(Array);
 });
 
 testUser("User API", async () => {
-  const userApi = new UserApi(USER_KEY);
+  const userApi = new UserApi(USERHUB_USER_KEY);
 
   const res = await userApi.session.get();
   expect(res).toBeTruthy();
diff --git a/test/node/util.ts b/test/node/util.ts
@@ -1,9 +1,9 @@
 import { test } from "vitest";
 
-export const ADMIN_KEY = process.env.TEST_ADMIN_KEY || "";
-export const USER_KEY = process.env.TEST_USER_KEY || "";
+export const USERHUB_ADMIN_KEY = process.env.TEST_USERHUB_ADMIN_KEY || "";
+export const USERHUB_USER_KEY = process.env.TEST_USERHUB_USER_KEY || "";
 export const CI = !!process.env.CI;
 
-export const testAdmin = test.skipIf(!ADMIN_KEY);
-export const testUser = test.skipIf(!USER_KEY);
+export const testAdmin = test.skipIf(!USERHUB_ADMIN_KEY);
+export const testUser = test.skipIf(!USERHUB_USER_KEY);
 export const testSlow = test.skipIf(!CI);

Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@ import { Webhook } from "@userhub/sdk";`
`2`	`2`
`3`	`3`	`const port = process.env.PORT \|\| "8000";`
`4`	`4`
`5`		`-const signingSecret = process.env.SIGNING_SECRET;`
	`5`	`+const signingSecret = process.env.USERHUB_SIGNING_SECRET;`
`6`	`6`	`if (!signingSecret) {`
`7`		`- console.error("SIGNING_SECRET required");`
	`7`	`+ console.error("USERHUB_SIGNING_SECRET required");`
`8`	`8`	`process.exit(1);`
`9`	`9`	`}`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@ import { Webhook } from "https://deno.land/x/userhub_sdk/mod.ts";`
`2`	`2`
`3`	`3`	`const port = parseInt(Deno.env.get("PORT") \|\| "8000", 10);`
`4`	`4`
`5`		`-const signingSecret = Deno.env.get("SIGNING_SECRET") \|\| "";`
	`5`	`+const signingSecret = Deno.env.get("USERHUB_SIGNING_SECRET") \|\| "";`
`6`	`6`	`if (!signingSecret) {`
`7`		`- console.error("SIGNING_SECRET required");`
	`7`	`+ console.error("USERHUB_SIGNING_SECRET required");`
`8`	`8`	`Deno.exit(1);`
`9`	`9`	`}`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,9 @@ import express from "express";`
`3`	`3`
`4`	`4`	`const port = process.env.PORT \|\| "8000";`
`5`	`5`
`6`		`-const signingSecret = process.env.SIGNING_SECRET;`
	`6`	`+const signingSecret = process.env.USERHUB_SIGNING_SECRET;`
`7`	`7`	`if (!signingSecret) {`
`8`		`- console.error("SIGNING_SECRET required");`
	`8`	`+ console.error("USERHUB_SIGNING_SECRET required");`
`9`	`9`	`process.exit(1);`
`10`	`10`	`}`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,9 @@ import { createServer } from "http";`
`3`	`3`
`4`	`4`	`const port = process.env.PORT \|\| "8000";`
`5`	`5`
`6`		`-const signingSecret = process.env.SIGNING_SECRET;`
	`6`	`+const signingSecret = process.env.USERHUB_SIGNING_SECRET;`
`7`	`7`	`if (!signingSecret) {`
`8`		`- console.error("SIGNING_SECRET required");`
	`8`	`+ console.error("USERHUB_SIGNING_SECRET required");`
`9`	`9`	`process.exit(1);`
`10`	`10`	`}`
`11`	`11`