♻️ merge header auth & extended compability to one table

server/db/pg/schema/schema.ts

@@ -524,25 +524,6 @@ export const resourceHeaderAuthExtendedCompatibility = pgTable(
     }
 );
 
-export const resourcePolicyHeaderAuthExtendedCompatibility = pgTable(
-    "resourcePolicyHeaderAuthExtendedCompatibility",
-    {
-        headerAuthExtendedCompatibilityId: serial(
-            "headerAuthExtendedCompatibilityId"
-        ).primaryKey(),
-        resourcePolicyId: integer("resourcePolicyId")
-            .notNull()
-            .references(() => resourcePolicies.resourcePolicyId, {
-                onDelete: "cascade"
-            }),
-        extendedCompatibilityIsActivated: boolean(
-            "extendedCompatibilityIsActivated"
-        )
-            .notNull()
-            .default(true)
-    }
-);
-
 export const resourcePolicyPincode = pgTable("resourcePolicyPincode", {
     pincodeId: serial("pincodeId").primaryKey(),
     pincodeHash: varchar("pincodeHash").notNull(),
@@ -567,6 +548,9 @@ export const resourcePolicyPassword = pgTable("resourcePolicyPassword", {
 export const resourcePolicyHeaderAuth = pgTable("resourcePolicyHeaderAuth", {
     headerAuthId: serial("headerAuthId").primaryKey(),
     headerAuthHash: varchar("headerAuthHash").notNull(),
+    extendedCompatibility: boolean("extendedCompatibility")
+        .notNull()
+        .default(true),
     resourcePolicyId: integer("resourcePolicyId")
         .notNull()
         .references(() => resourcePolicies.resourcePolicyId, {

server/routers/policy/setResourcePolicyHeaderAuth.ts

@@ -1,10 +1,6 @@
 import { Request, Response, NextFunction } from "express";
 import { z } from "zod";
-import {
-    db,
-    resourcePolicyHeaderAuth,
-    resourcePolicyHeaderAuthExtendedCompatibility
-} from "@server/db";
+import { db, resourcePolicyHeaderAuth } from "@server/db";
 import { eq } from "drizzle-orm";
 import HttpCode from "@server/types/HttpCode";
 import createHttpError from "http-errors";
@@ -85,32 +81,17 @@ export async function setResourcePolicyHeaderAuth(
                         resourcePolicyId
                     )
                 );
-            await trx
-                .delete(resourcePolicyHeaderAuthExtendedCompatibility)
-                .where(
-                    eq(
-                        resourcePolicyHeaderAuthExtendedCompatibility.resourcePolicyId,
-                        resourcePolicyId
-                    )
-                );
 
             if (user && password && extendedCompatibility !== null) {
                 const headerAuthHash = await hashPassword(
                     Buffer.from(`${user}:${password}`).toString("base64")
                 );
 
-                await Promise.all([
-                    trx
-                        .insert(resourcePolicyHeaderAuth)
-                        .values({ resourcePolicyId, headerAuthHash }),
-                    trx
-                        .insert(resourcePolicyHeaderAuthExtendedCompatibility)
-                        .values({
-                            resourcePolicyId,
-                            extendedCompatibilityIsActivated:
-                                extendedCompatibility
-                        })
-                ]);
+                await trx.insert(resourcePolicyHeaderAuth).values({
+                    resourcePolicyId,
+                    headerAuthHash,
+                    extendedCompatibility: extendedCompatibility
+                });
             }
         });