get rid of extra file

This commit is contained in:
Dax Raad
2026-01-12 22:33:57 -05:00
parent 66f9bdab32
commit eaa76dad0c
13 changed files with 55 additions and 29 deletions

View File

@@ -163,6 +163,7 @@ new sst.cloudflare.x.SolidStart("Console", {
AWS_SES_ACCESS_KEY_ID, AWS_SES_ACCESS_KEY_ID,
AWS_SES_SECRET_ACCESS_KEY, AWS_SES_SECRET_ACCESS_KEY,
ZEN_BLACK, ZEN_BLACK,
new sst.Secret("ZEN_SESSION_SECRET"),
...ZEN_MODELS, ...ZEN_MODELS,
...($dev ...($dev
? [ ? [

View File

@@ -1,24 +0,0 @@
import { useSession } from "@solidjs/start/http"
export interface AuthSession {
account?: Record<
string,
{
id: string
email: string
}
>
current?: string
}
export function useAuthSession() {
return useSession<AuthSession>({
password: "0".repeat(32),
name: "auth",
maxAge: 60 * 60 * 24 * 365,
cookie: {
secure: false,
httpOnly: true,
},
})
}

View File

@@ -5,13 +5,38 @@ import { redirect } from "@solidjs/router"
import { Actor } from "@opencode-ai/console-core/actor.js" import { Actor } from "@opencode-ai/console-core/actor.js"
import { createClient } from "@openauthjs/openauth/client" import { createClient } from "@openauthjs/openauth/client"
import { useAuthSession } from "./auth.session"
export const AuthClient = createClient({ export const AuthClient = createClient({
clientID: "app", clientID: "app",
issuer: import.meta.env.VITE_AUTH_URL, issuer: import.meta.env.VITE_AUTH_URL,
}) })
import { useSession } from "@solidjs/start/http"
import { Resource } from "@opencode-ai/console-resource"
export interface AuthSession {
account?: Record<
string,
{
id: string
email: string
}
>
current?: string
}
export function useAuthSession() {
return useSession<AuthSession>({
password: Resource.ZEN_SESSION_SECRET.value,
name: "auth",
maxAge: 60 * 60 * 24 * 365,
cookie: {
secure: false,
httpOnly: true,
},
})
}
export const getActor = async (workspace?: string): Promise<Actor.Info> => { export const getActor = async (workspace?: string): Promise<Actor.Info> => {
"use server" "use server"
const evt = getRequestEvent() const evt = getRequestEvent()

View File

@@ -1,7 +1,7 @@
import { redirect } from "@solidjs/router" import { redirect } from "@solidjs/router"
import type { APIEvent } from "@solidjs/start/server" import type { APIEvent } from "@solidjs/start/server"
import { AuthClient } from "~/context/auth" import { AuthClient } from "~/context/auth"
import { useAuthSession } from "~/context/auth.session" import { useAuthSession } from "~/context/auth"
export async function GET(input: APIEvent) { export async function GET(input: APIEvent) {
const url = new URL(input.request.url) const url = new URL(input.request.url)

View File

@@ -1,6 +1,6 @@
import { redirect } from "@solidjs/router" import { redirect } from "@solidjs/router"
import { APIEvent } from "@solidjs/start" import { APIEvent } from "@solidjs/start"
import { useAuthSession } from "~/context/auth.session" import { useAuthSession } from "~/context/auth"
export async function GET(event: APIEvent) { export async function GET(event: APIEvent) {
const auth = await useAuthSession() const auth = await useAuthSession()

View File

@@ -1,5 +1,5 @@
import { APIEvent } from "@solidjs/start" import { APIEvent } from "@solidjs/start"
import { useAuthSession } from "~/context/auth.session" import { useAuthSession } from "~/context/auth"
export async function GET(input: APIEvent) { export async function GET(input: APIEvent) {
const session = await useAuthSession() const session = await useAuthSession()

View File

@@ -1,6 +1,6 @@
import { action } from "@solidjs/router" import { action } from "@solidjs/router"
import { getRequestEvent } from "solid-js/web" import { getRequestEvent } from "solid-js/web"
import { useAuthSession } from "~/context/auth.session" import { useAuthSession } from "~/context/auth"
import { Dropdown } from "~/component/dropdown" import { Dropdown } from "~/component/dropdown"
import "./user-menu.css" import "./user-menu.css"

View File

@@ -130,6 +130,10 @@ declare module "sst" {
"type": "sst.sst.Secret" "type": "sst.sst.Secret"
"value": string "value": string
} }
"ZEN_SESSION_SECRET": {
"type": "sst.sst.Secret"
"value": string
}
} }
} }
// cloudflare // cloudflare

View File

@@ -130,6 +130,10 @@ declare module "sst" {
"type": "sst.sst.Secret" "type": "sst.sst.Secret"
"value": string "value": string
} }
"ZEN_SESSION_SECRET": {
"type": "sst.sst.Secret"
"value": string
}
} }
} }
// cloudflare // cloudflare

View File

@@ -130,6 +130,10 @@ declare module "sst" {
"type": "sst.sst.Secret" "type": "sst.sst.Secret"
"value": string "value": string
} }
"ZEN_SESSION_SECRET": {
"type": "sst.sst.Secret"
"value": string
}
} }
} }
// cloudflare // cloudflare

View File

@@ -130,6 +130,10 @@ declare module "sst" {
"type": "sst.sst.Secret" "type": "sst.sst.Secret"
"value": string "value": string
} }
"ZEN_SESSION_SECRET": {
"type": "sst.sst.Secret"
"value": string
}
} }
} }
// cloudflare // cloudflare

View File

@@ -130,6 +130,10 @@ declare module "sst" {
"type": "sst.sst.Secret" "type": "sst.sst.Secret"
"value": string "value": string
} }
"ZEN_SESSION_SECRET": {
"type": "sst.sst.Secret"
"value": string
}
} }
} }
// cloudflare // cloudflare

4
sst-env.d.ts vendored
View File

@@ -156,6 +156,10 @@ declare module "sst" {
"type": "sst.sst.Secret" "type": "sst.sst.Secret"
"value": string "value": string
} }
"ZEN_SESSION_SECRET": {
"type": "sst.sst.Secret"
"value": string
}
"ZenData": { "ZenData": {
"name": string "name": string
"type": "sst.cloudflare.Bucket" "type": "sst.cloudflare.Bucket"