calvin.erfmann/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-05-12 07:14:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

♻️ merge header auth & extended compability to one table

Browse Source
This commit is contained in:
Fred KISSIE
2026-03-03 03:27:02 +01:00
parent 590f2c29b3
commit 0a69131c38
2 changed files with 9 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
server/db/pg/schema/schema.ts
View File

@@ -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", { export const resourcePolicyPincode = pgTable("resourcePolicyPincode", {
pincodeId: serial("pincodeId").primaryKey(), pincodeId: serial("pincodeId").primaryKey(),
pincodeHash: varchar("pincodeHash").notNull(), pincodeHash: varchar("pincodeHash").notNull(),
@@ -567,6 +548,9 @@ export const resourcePolicyPassword = pgTable("resourcePolicyPassword", {
export const resourcePolicyHeaderAuth = pgTable("resourcePolicyHeaderAuth", { export const resourcePolicyHeaderAuth = pgTable("resourcePolicyHeaderAuth", {
headerAuthId: serial("headerAuthId").primaryKey(), headerAuthId: serial("headerAuthId").primaryKey(),
headerAuthHash: varchar("headerAuthHash").notNull(), headerAuthHash: varchar("headerAuthHash").notNull(),
extendedCompatibility: boolean("extendedCompatibility")
.notNull()
.default(true),
resourcePolicyId: integer("resourcePolicyId") resourcePolicyId: integer("resourcePolicyId")
.notNull() .notNull()
.references(() => resourcePolicies.resourcePolicyId, { .references(() => resourcePolicies.resourcePolicyId, {

31
server/routers/policy/setResourcePolicyHeaderAuth.ts
View File

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