cleanup: squash migrations, indentation, custom_domain_logger env var

Author: Soxasora

.env.development

@@ -195,5 +195,5 @@ NEXT_TELEMETRY_DISABLED=1
 # DNS resolver for custom domain verification
 DNS_RESOLVER=1.1.1.1
 
-# domain debug
-DOMAIN_DEBUG=true
+# domain debug logger
+CUSTOM_DOMAIN_LOGGER=false

components/territory-domains.js

@@ -36,8 +36,12 @@ export const DomainProvider = ({ customDomain: ssrCustomDomain, children }) => {
   // temporary auth sync
   useEffect(() => {
     if (router.query.type === 'sync') {
-      console.log('signing in with sync')
-      signIn('sync', { token: router.query.token, callbackUrl: router.query.callbackUrl, multiAuth: router.query.multiAuth, redirect: false })
+      console.log('signing in with sync', router.query)
+      signIn('sync', {
+        token: router.query.token,
+        multiAuth: router.query.multiAuth,
+        redirect: false
+      })
       router.push(router.query.callbackUrl) // next auth redirect only supports the main domain
     }
   }, [router.query.type])

lib/domains.js

@@ -1,7 +1,7 @@
 import { cachedFetcher } from '@/lib/fetch'
 
 export const domainLogger = () => {
-  if (process.env.DOMAIN_DEBUG === 'true') {
+  if (process.env.CUSTOM_DOMAIN_LOGGER === 'true') {
     return {
       log: (message, ...args) => {
         console.log(message, ...args)
@@ -10,6 +10,11 @@ export const domainLogger = () => {
         console.error(message, ...args)
       }
     }
+  } else {
+    return {
+      log: () => {},
+      error: () => {}
+    }
   }
 }
 

pages/api/auth/sync.js

@@ -14,6 +14,7 @@ export default async function handler (req, res) {
   let customDomain
   try {
     customDomain = new URL(decodedRedirectUrl)
+    // not cached because we're handling sensitive data
     const domain = await models.customDomain.findUnique({ where: { domain: customDomain.host, status: 'ACTIVE' } })
     if (!domain) {
       return res.status(400).json({ status: 'ERROR', reason: 'custom domain not found' })

pages/login.js

@@ -70,10 +70,8 @@ export async function getServerSideProps ({ req, res, query: { callbackUrl, mult
 }
 
 function LoginFooter ({ callbackUrl, multiAuth }) {
-  const query = {
-    callbackUrl
-  }
-  if (multiAuth) { // multiAuth can be optional
+  const query = { callbackUrl }
+  if (multiAuth) {
     query.multiAuth = multiAuth
   }
   return (

prisma/migrations/20250304121322_custom_domains/migration.sql

@@ -1,4 +1,4 @@
--- CreateTable
+-- Custom Domain
 CREATE TABLE "CustomDomain" (
     "id" SERIAL NOT NULL,
     "created_at" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
@@ -42,3 +42,27 @@ CREATE INDEX "CustomDomain_created_at_idx" ON "CustomDomain"("created_at");
 
 -- AddForeignKey
 ALTER TABLE "CustomDomain" ADD CONSTRAINT "CustomDomain_subName_fkey" FOREIGN KEY ("subName") REFERENCES "Sub"("name") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- Custom Branding
+CREATE TABLE "CustomBranding" (
+    "id" SERIAL NOT NULL,
+    "title" TEXT,
+    "colors" JSONB DEFAULT '{}',
+    "logoId" INTEGER,
+    "faviconId" INTEGER,
+    "subName" CITEXT NOT NULL,
+
+    CONSTRAINT "CustomBranding_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "CustomBranding_subName_key" ON "CustomBranding"("subName");
+
+-- AddForeignKey
+ALTER TABLE "CustomBranding" ADD CONSTRAINT "CustomBranding_logoId_fkey" FOREIGN KEY ("logoId") REFERENCES "Upload"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "CustomBranding" ADD CONSTRAINT "CustomBranding_faviconId_fkey" FOREIGN KEY ("faviconId") REFERENCES "Upload"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "CustomBranding" ADD CONSTRAINT "CustomBranding_subName_fkey" FOREIGN KEY ("subName") REFERENCES "Sub"("name") ON DELETE CASCADE ON UPDATE CASCADE;