Update stuff

2026-06-21 23:22:05 -05:00
parent 112fd55ea7
commit b16cd9e2f7
9 changed files with 161 additions and 34 deletions
@@ -14,22 +14,37 @@ import { api } from './_generated/api';
 import { action, mutation, query } from './_generated/server';
 import { Password, validatePassword } from './custom/auth';

+const authProviders = [
+  ...(process.env.AUTH_AUTHENTIK_ID &&
+  process.env.AUTH_AUTHENTIK_SECRET &&
+  process.env.AUTH_AUTHENTIK_ISSUER
+    ? [
+        Authentik({
+          allowDangerousEmailAccountLinking: true,
+          clientId: process.env.AUTH_AUTHENTIK_ID,
+          clientSecret: process.env.AUTH_AUTHENTIK_SECRET,
+          issuer: process.env.AUTH_AUTHENTIK_ISSUER,
+        }),
+      ]
+    : []),
+  ...((process.env.AUTH_GITHUB_ID ?? process.env.GITHUB_APP_CLIENT_ID) &&
+  (process.env.AUTH_GITHUB_SECRET ?? process.env.GITHUB_APP_CLIENT_SECRET)
+    ? [
+        GitHub({
+          allowDangerousEmailAccountLinking: true,
+          clientId:
+            process.env.AUTH_GITHUB_ID ?? process.env.GITHUB_APP_CLIENT_ID,
+          clientSecret:
+            process.env.AUTH_GITHUB_SECRET ??
+            process.env.GITHUB_APP_CLIENT_SECRET,
+        }),
+      ]
+    : []),
+  Password,
+];
+
 export const { auth, signIn, signOut, store, isAuthenticated } = convexAuth({
-  providers: [
-    Authentik({
-      allowDangerousEmailAccountLinking: true,
-      clientId: process.env.AUTH_AUTHENTIK_ID,
-      clientSecret: process.env.AUTH_AUTHENTIK_SECRET,
-      issuer: process.env.AUTH_AUTHENTIK_ISSUER,
-    }),
-    GitHub({
-      allowDangerousEmailAccountLinking: true,
-      clientId: process.env.AUTH_GITHUB_ID ?? process.env.GITHUB_APP_CLIENT_ID,
-      clientSecret:
-        process.env.AUTH_GITHUB_SECRET ?? process.env.GITHUB_APP_CLIENT_SECRET,
-    }),
-    Password,
-  ],
+  providers: authProviders,
 });

 const getUserById = async (
@@ -0,0 +1,34 @@
+import { query } from './_generated/server';
+
+const hasEnv = (name: string) => Boolean(process.env[name]?.trim());
+
+export const envStatus = query({
+  args: {},
+  handler: () => ({
+    auth: {
+      authentikId: hasEnv('AUTH_AUTHENTIK_ID'),
+      authentikSecret: hasEnv('AUTH_AUTHENTIK_SECRET'),
+      authentikIssuer: hasEnv('AUTH_AUTHENTIK_ISSUER'),
+      githubId: hasEnv('AUTH_GITHUB_ID') || hasEnv('GITHUB_APP_CLIENT_ID'),
+      githubSecret:
+        hasEnv('AUTH_GITHUB_SECRET') || hasEnv('GITHUB_APP_CLIENT_SECRET'),
+      jwtPrivateKey: hasEnv('JWT_PRIVATE_KEY'),
+      jwks: hasEnv('JWKS'),
+      siteUrl: hasEnv('SITE_URL'),
+    },
+    githubApp: {
+      appId: hasEnv('GITHUB_APP_ID'),
+      privateKey: hasEnv('GITHUB_APP_PRIVATE_KEY'),
+      installationId: hasEnv('GITHUB_APP_INSTALLATION_ID'),
+    },
+    email: {
+      useSendApiKey: hasEnv('USESEND_API_KEY'),
+      useSendUrl: hasEnv('USESEND_URL'),
+      useSendFromEmail: hasEnv('USESEND_FROM_EMAIL'),
+    },
+    spoon: {
+      encryptionKey: hasEnv('SPOON_ENCRYPTION_KEY'),
+      workerToken: hasEnv('SPOON_WORKER_TOKEN'),
+    },
+  }),
+});