pangolin_mirror/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-03-09 20:26:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

🗃️ use clientId and fix bad column name for decision and add userId

Browse Source
This commit is contained in:
Fred KISSIE
2026-01-09 01:17:05 +01:00
parent 2d0dd067b8
commit 7a4aff8e4b
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/db/pg/schema/privateSchema.ts
View File

@@ -17,7 +17,7 @@ import {
users, users,
exitNodes, exitNodes,
sessions, sessions,
olms clients
} from "./schema"; } from "./schema";
export const certificates = pgTable("certificates", { export const certificates = pgTable("certificates", {
@@ -305,14 +305,14 @@ export const approvals = pgTable("approvals", {
onDelete: "cascade" onDelete: "cascade"
}) })
.notNull(), .notNull(),
olmId: varchar("olmId").references(() => olms.olmId, { clientId: integer("clientId").references(() => clients.clientId, {
onDelete: "cascade" onDelete: "cascade"
}), // olms reference user devices clients (in this case) }), // clients reference user devices (in this case)
userId: varchar("userId").references(() => users.userId, { userId: varchar("userId").references(() => users.userId, {
// optionally tied to a user and in this case delete when the user deletes // optionally tied to a user and in this case delete when the user deletes
onDelete: "cascade" onDelete: "cascade"
}), }),
decision: varchar("type") decision: varchar("decision")
.$type<"approved" | "denied" | "pending">() .$type<"approved" | "denied" | "pending">()
.default("pending") .default("pending")
.notNull(), .notNull(),

10
server/db/sqlite/schema/privateSchema.ts
View File

@@ -6,7 +6,7 @@ import {
sqliteTable, sqliteTable,
text text
} from "drizzle-orm/sqlite-core"; } from "drizzle-orm/sqlite-core";
import { domains, exitNodes, olms, orgs, sessions, users } from "./schema"; import { clients, domains, exitNodes, orgs, sessions, users } from "./schema";
export const certificates = sqliteTable("certificates", { export const certificates = sqliteTable("certificates", {
certId: integer("certId").primaryKey({ autoIncrement: true }), certId: integer("certId").primaryKey({ autoIncrement: true }),
@@ -297,10 +297,14 @@ export const approvals = sqliteTable("approvals", {
onDelete: "cascade" onDelete: "cascade"
}) })
.notNull(), .notNull(),
olmId: text("olmId").references(() => olms.olmId, { clientId: integer("clientId").references(() => clients.clientId, {
onDelete: "cascade" onDelete: "cascade"
}), // olms reference user devices clients }), // olms reference user devices clients
decision: text("type") userId: text("userId").references(() => users.userId, {
// optionally tied to a user and in this case delete when the user deletes
onDelete: "cascade"
}),
decision: text("decision")
.$type<"approved" | "denied" | "pending">() .$type<"approved" | "denied" | "pending">()
.default("pending") .default("pending")
.notNull(), .notNull(),