fix better auth
Gitea Actions Demo / Deploy (push) Successful in 18s

This commit is contained in:
vadim committed 2026-09-24 16:21:16 +03:00
1 parent e9a61ac684
commit 9f36b7cedc
9 files changed
+83 -135

No files matched your search

@@ -1,10 +0,0 @@
-- CreateTable
CREATE TABLE "test" (
"id" SERIAL NOT NULL,
"title" TEXT NOT NULL,
"content" TEXT,
"published" BOOLEAN DEFAULT false,
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
CONSTRAINT "test_pkey" PRIMARY KEY ("id")
);
@@ -1,24 +0,0 @@
-- CreateTable
CREATE TABLE "issue" (
"id" SERIAL NOT NULL,
"key" TEXT NOT NULL,
"title" TEXT NOT NULL,
"content" TEXT,
"status" TEXT NOT NULL,
"priority" INTEGER NOT NULL DEFAULT 0,
"assigneeId" TEXT,
"reporterId" TEXT NOT NULL,
"createdAt" TIMESTAMPTZ(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
"updatedAt" TIMESTAMPTZ(3) NOT NULL,
CONSTRAINT "issue_pkey" PRIMARY KEY ("id")
);
-- CreateIndex
CREATE INDEX "issue_status_assigneeId_reporterId_idx" ON "issue"("status", "assigneeId", "reporterId");
-- AddForeignKey
ALTER TABLE "issue" ADD CONSTRAINT "issue_assigneeId_fkey" FOREIGN KEY ("assigneeId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "issue" ADD CONSTRAINT "issue_reporterId_fkey" FOREIGN KEY ("reporterId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE CASCADE;
@@ -1,43 +0,0 @@
/*
Warnings:
- Added the required column `projectId` to the `issue` table without a default value. This is not possible if the table is not empty.
*/
-- DropIndex
DROP INDEX "issue_status_assigneeId_reporterId_idx";
-- AlterTable
ALTER TABLE "issue" ADD COLUMN "projectId" TEXT NOT NULL;
-- CreateTable
CREATE TABLE "project" (
"id" TEXT NOT NULL,
"name" TEXT NOT NULL,
"key" TEXT NOT NULL,
"createdAt" TIMESTAMPTZ(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
"updatedAt" TIMESTAMPTZ(3) NOT NULL,
CONSTRAINT "project_pkey" PRIMARY KEY ("id")
);
-- CreateIndex
CREATE INDEX "project_createdAt_idx" ON "project"("createdAt");
-- CreateIndex
CREATE UNIQUE INDEX "project_key_key" ON "project"("key");
-- CreateIndex
CREATE INDEX "issue_status_idx" ON "issue"("status");
-- CreateIndex
CREATE INDEX "issue_assigneeId_idx" ON "issue"("assigneeId");
-- CreateIndex
CREATE INDEX "issue_reporterId_idx" ON "issue"("reporterId");
-- CreateIndex
CREATE INDEX "issue_projectId_idx" ON "issue"("projectId");
-- AddForeignKey
ALTER TABLE "issue" ADD CONSTRAINT "issue_projectId_fkey" FOREIGN KEY ("projectId") REFERENCES "project"("id") ON DELETE CASCADE ON UPDATE CASCADE;
@@ -1,14 +0,0 @@
/*
Warnings:
- Added the required column `ownerId` to the `project` table without a default value. This is not possible if the table is not empty.
*/
-- AlterTable
ALTER TABLE "project" ADD COLUMN "ownerId" TEXT NOT NULL;
-- CreateIndex
CREATE INDEX "project_ownerId_idx" ON "project"("ownerId");
-- AddForeignKey
ALTER TABLE "project" ADD CONSTRAINT "project_ownerId_fkey" FOREIGN KEY ("ownerId") REFERENCES "user"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
@@ -1,21 +0,0 @@
-- CreateTable
CREATE TABLE "project_member" (
"id" TEXT NOT NULL,
"projectId" TEXT NOT NULL,
"userId" TEXT NOT NULL,
"createdAt" TIMESTAMPTZ(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
CONSTRAINT "project_member_pkey" PRIMARY KEY ("id")
);
-- CreateIndex
CREATE INDEX "project_member_userId_idx" ON "project_member"("userId");
-- CreateIndex
CREATE UNIQUE INDEX "project_member_projectId_userId_key" ON "project_member"("projectId", "userId");
-- AddForeignKey
ALTER TABLE "project_member" ADD CONSTRAINT "project_member_projectId_fkey" FOREIGN KEY ("projectId") REFERENCES "project"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "project_member" ADD CONSTRAINT "project_member_userId_fkey" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE CASCADE;
@@ -28,7 +28,6 @@ CREATE TABLE "session" (
-- CreateTable -- CreateTable
CREATE TABLE "account" ( CREATE TABLE "account" (
"id" TEXT NOT NULL, "id" TEXT NOT NULL,
"issuer" TEXT NOT NULL,
"accountId" TEXT NOT NULL, "accountId" TEXT NOT NULL,
"providerId" TEXT NOT NULL, "providerId" TEXT NOT NULL,
"userId" TEXT NOT NULL, "userId" TEXT NOT NULL,
@@ -69,9 +68,6 @@ CREATE UNIQUE INDEX "session_token_key" ON "session"("token");
-- CreateIndex -- CreateIndex
CREATE INDEX "account_userId_idx" ON "account"("userId"); CREATE INDEX "account_userId_idx" ON "account"("userId");
-- CreateIndex
CREATE UNIQUE INDEX "account_issuer_accountId_uidx" ON "account"("issuer", "accountId");
-- CreateIndex -- CreateIndex
CREATE INDEX "verification_identifier_idx" ON "verification"("identifier"); CREATE INDEX "verification_identifier_idx" ON "verification"("identifier");
@@ -0,0 +1,83 @@
-- CreateTable
CREATE TABLE "issue" (
"id" SERIAL NOT NULL,
"key" TEXT NOT NULL,
"title" TEXT NOT NULL,
"content" TEXT,
"status" TEXT NOT NULL,
"priority" INTEGER NOT NULL DEFAULT 0,
"assigneeId" TEXT,
"reporterId" TEXT NOT NULL,
"projectId" TEXT NOT NULL,
"createdAt" TIMESTAMPTZ(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
"updatedAt" TIMESTAMPTZ(3) NOT NULL,
CONSTRAINT "issue_pkey" PRIMARY KEY ("id")
);
-- CreateTable
CREATE TABLE "project" (
"id" TEXT NOT NULL,
"name" TEXT NOT NULL,
"key" TEXT NOT NULL,
"createdAt" TIMESTAMPTZ(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
"updatedAt" TIMESTAMPTZ(3) NOT NULL,
"ownerId" TEXT NOT NULL,
CONSTRAINT "project_pkey" PRIMARY KEY ("id")
);
-- CreateTable
CREATE TABLE "project_member" (
"id" TEXT NOT NULL,
"projectId" TEXT NOT NULL,
"userId" TEXT NOT NULL,
"createdAt" TIMESTAMPTZ(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
CONSTRAINT "project_member_pkey" PRIMARY KEY ("id")
);
-- CreateIndex
CREATE INDEX "issue_status_idx" ON "issue"("status");
-- CreateIndex
CREATE INDEX "issue_assigneeId_idx" ON "issue"("assigneeId");
-- CreateIndex
CREATE INDEX "issue_reporterId_idx" ON "issue"("reporterId");
-- CreateIndex
CREATE INDEX "issue_projectId_idx" ON "issue"("projectId");
-- CreateIndex
CREATE INDEX "project_createdAt_idx" ON "project"("createdAt");
-- CreateIndex
CREATE INDEX "project_ownerId_idx" ON "project"("ownerId");
-- CreateIndex
CREATE UNIQUE INDEX "project_key_key" ON "project"("key");
-- CreateIndex
CREATE INDEX "project_member_userId_idx" ON "project_member"("userId");
-- CreateIndex
CREATE UNIQUE INDEX "project_member_projectId_userId_key" ON "project_member"("projectId", "userId");
-- AddForeignKey
ALTER TABLE "issue" ADD CONSTRAINT "issue_assigneeId_fkey" FOREIGN KEY ("assigneeId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "issue" ADD CONSTRAINT "issue_reporterId_fkey" FOREIGN KEY ("reporterId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "issue" ADD CONSTRAINT "issue_projectId_fkey" FOREIGN KEY ("projectId") REFERENCES "project"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "project" ADD CONSTRAINT "project_ownerId_fkey" FOREIGN KEY ("ownerId") REFERENCES "user"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "project_member" ADD CONSTRAINT "project_member_projectId_fkey" FOREIGN KEY ("projectId") REFERENCES "project"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "project_member" ADD CONSTRAINT "project_member_userId_fkey" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-17
View File
@@ -7,16 +7,6 @@ datasource db {
provider = "postgresql" provider = "postgresql"
} }
model Test {
id Int @id @default(autoincrement())
title String
content String?
published Boolean? @default(false)
createdAt DateTime @default(now())
@@map("test")
}
model User { model User {
id String @id id String @id
name String name String
@@ -54,7 +44,6 @@ model Session {
model Account { model Account {
id String @id id String @id
issuer String
accountId String accountId String
providerId String providerId String
userId String userId String
@@ -69,7 +58,6 @@ model Account {
createdAt DateTime @default(now()) createdAt DateTime @default(now())
updatedAt DateTime @updatedAt updatedAt DateTime @updatedAt
@@unique([issuer, accountId], map: "account_issuer_accountId_uidx")
@@index([userId]) @@index([userId])
@@map("account") @@map("account")
} }
@@ -126,11 +114,6 @@ model Project {
@@map("project") @@map("project")
} }
/**
* Участники проекта. Владелец видит и редактирует проект всегда
* (см. Project.ownerId); участник — только видит проект и его задачи.
* Запись создаётся автоматически при назначении пользователя на задачу проекта.
*/
model ProjectMember { model ProjectMember {
id String @id @default(uuid(7)) id String @id @default(uuid(7))
projectId String projectId String
-2
View File
@@ -2,7 +2,6 @@ import { betterAuth } from 'better-auth';
import { prismaAdapter } from '@better-auth/prisma-adapter'; import { prismaAdapter } from '@better-auth/prisma-adapter';
import prisma from './prisma.js'; import prisma from './prisma.js';
import EmailSender from './email-sender.js'; import EmailSender from './email-sender.js';
import { authTransformResponse } from './auth-plugins/auth-response.js';
export const auth = betterAuth({ export const auth = betterAuth({
appName: process.env.APP_NAME ?? 'app', appName: process.env.APP_NAME ?? 'app',
@@ -20,7 +19,6 @@ export const auth = betterAuth({
joins: true, joins: true,
}, },
}, },
hooks: {},
secret: process.env.BETTER_AUTH_SECRET, secret: process.env.BETTER_AUTH_SECRET,
baseURL: process.env.BETTER_AUTH_URL ?? 'http://localhost:3000', baseURL: process.env.BETTER_AUTH_URL ?? 'http://localhost:3000',
emailAndPassword: { emailAndPassword: {