kopia lustrzana https://github.com/transitive-bullshit/chatgpt-api
pull/715/head
rodzic
11b6eedcce
commit
8cd0c99d9f
|
@ -40,7 +40,6 @@
|
|||
"eventid": "^2.0.1",
|
||||
"exit-hook": "catalog:",
|
||||
"hono": "^4.7.9",
|
||||
"jsonwebtoken": "^9.0.2",
|
||||
"octokit": "^5.0.2",
|
||||
"p-all": "^5.0.0",
|
||||
"parse-json": "^8.3.0",
|
||||
|
@ -52,7 +51,6 @@
|
|||
"zod-validation-error": "^3.4.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/jsonwebtoken": "^9.0.9",
|
||||
"@types/semver": "^7.7.0",
|
||||
"drizzle-kit": "^0.31.1",
|
||||
"drizzle-orm": "^0.43.1",
|
||||
|
|
|
@ -3,7 +3,6 @@ import { createRoute, type OpenAPIHono } from '@hono/zod-openapi'
|
|||
|
||||
import type { AuthenticatedEnv } from '@/lib/types'
|
||||
import { db, schema } from '@/db'
|
||||
import { createProviderToken } from '@/lib/auth/create-provider-token'
|
||||
import { ensureAuthUser } from '@/lib/ensure-auth-user'
|
||||
import {
|
||||
openapiAuthenticatedSecuritySchemas,
|
||||
|
@ -62,8 +61,7 @@ export function registerV1ProjectsCreateProject(
|
|||
identifier,
|
||||
teamId: teamMember?.teamId,
|
||||
userId: user.id,
|
||||
_secret: sha256(),
|
||||
_providerToken: createProviderToken({ identifier })
|
||||
_secret: sha256()
|
||||
})
|
||||
.returning()
|
||||
assert(project, 500, `Failed to create project "${body.name}"`)
|
||||
|
|
|
@ -87,7 +87,7 @@ export const projects = pgTable(
|
|||
_secret: text().notNull(),
|
||||
|
||||
// Auth token used to access the platform API on behalf of this project
|
||||
_providerToken: text().notNull(),
|
||||
// _providerToken: text().notNull(),
|
||||
|
||||
// TODO: Full-text search
|
||||
// _text: text().default('').notNull(),
|
||||
|
|
|
@ -1,9 +0,0 @@
|
|||
import jwt from 'jsonwebtoken'
|
||||
|
||||
import { env } from '@/lib/env'
|
||||
|
||||
export function createProviderToken(project: { identifier: string }) {
|
||||
// TODO: Possibly in the future store stripe account ID as well and require
|
||||
// provider tokens to refresh after account changes?
|
||||
return jwt.sign({ projectIdentifier: project.identifier }, env.JWT_SECRET)
|
||||
}
|
|
@ -1,29 +1,12 @@
|
|||
import { assert } from '@agentic/platform-core'
|
||||
// import { auth } from '@/lib/auth'
|
||||
import { createMiddleware } from 'hono/factory'
|
||||
|
||||
// import * as jwt from 'hono/jwt'
|
||||
import type { AuthenticatedEnv } from '@/lib/types'
|
||||
import { authClient } from '@/lib/auth/client'
|
||||
import { subjects } from '@/lib/auth/subjects'
|
||||
|
||||
export const authenticate = createMiddleware<AuthenticatedEnv>(
|
||||
async function authenticateMiddleware(ctx, next) {
|
||||
// TODO
|
||||
// const session = await auth.api.getSession({
|
||||
// // TODO: investigate this type issue
|
||||
// headers: ctx.req.raw.headers as any
|
||||
// })
|
||||
// assert(session, 401, 'Unauthorized')
|
||||
// assert(session.user?.id, 401, 'Unauthorized')
|
||||
// assert(session.session, 401, 'Unauthorized')
|
||||
|
||||
// ctx.set('userId', session.user.id)
|
||||
// ctx.set('user', session.user as any) // TODO: resolve AuthUser and RawUser types
|
||||
// ctx.set('session', session.session)
|
||||
|
||||
// await next()
|
||||
|
||||
const credentials = ctx.req.raw.headers.get('Authorization')
|
||||
assert(credentials, 401, 'Unauthorized')
|
||||
|
||||
|
@ -44,22 +27,6 @@ export const authenticate = createMiddleware<AuthenticatedEnv>(
|
|||
assert(userId, 401, 'Unauthorized')
|
||||
ctx.set('userId', userId)
|
||||
|
||||
// const payload = await jwt.verify(token, env.JWT_SECRET)
|
||||
// assert(payload, 401, 'Unauthorized')
|
||||
// assert(payload.type === 'user', 401, 'Unauthorized')
|
||||
// assert(
|
||||
// payload.userId && typeof payload.userId === 'string',
|
||||
// 401,
|
||||
// 'Unauthorized'
|
||||
// )
|
||||
// ctx.set('userId', payload.userId)
|
||||
|
||||
// const user = await db.query.users.findFirst({
|
||||
// where: eq(schema.users.id, payload.userId)
|
||||
// })
|
||||
// assert(user, 401, 'Unauthorized')
|
||||
// ctx.set('user', user as any)
|
||||
|
||||
await next()
|
||||
}
|
||||
)
|
||||
|
|
|
@ -26,7 +26,7 @@ async function main() {
|
|||
}
|
||||
})
|
||||
|
||||
// Try to initialize the existing auth session if one exists
|
||||
// Initialize the existing auth session if one exists
|
||||
const authSession = AuthStore.tryGetAuth()
|
||||
if (authSession) {
|
||||
try {
|
||||
|
|
Ładowanie…
Reference in New Issue