Skip to content

ユーザーがログインしていないときエラーを出さない #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
na-trium-144 merged 2 commits into from
Nov 9, 2025
Merged

ユーザーがログインしていないときエラーを出さない #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f734a5d
observability有効化
na-trium-144 Nov 9, 2025
d2fb7a7
ユーザーがログインしていないときエラーを出さない
na-trium-144 Nov 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions app/lib/chatHistory.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const CACHE_KEY_BASE = "https://my-code.utcode.net/chatHistory";
interface Context {
drizzle: Awaited<ReturnType<typeof getDrizzle>>;
auth: Auth;
userId: string;
userId?: string;
}
/**
* drizzleが初期化されてなければ初期化し、
Expand All @@ -40,10 +40,9 @@ async function initAll(ctx?: Partial<Context>): Promise<Context> {
const session = await ctx.auth.api.getSession({
headers: await headers(),
});
if (!session) {
throw new Error("Not authenticated");
if (session) {
ctx.userId = session.user.id;
}
ctx.userId = session.user.id;
}
return ctx as Context;
}
Expand All @@ -64,7 +63,9 @@ export async function addChat(
context?: Partial<Context>
) {
const { drizzle, userId } = await initAll(context);

if (!userId) {
throw new Error("Not authenticated");
}
const [newChat] = await drizzle
.insert(chat)
.values({
Expand Down Expand Up @@ -106,6 +107,9 @@ export async function getChat(
context?: Partial<Context>
): Promise<ChatWithMessages[]> {
const { drizzle, userId } = await initAll(context);
if (!userId) {
return [];
}

const chats = await drizzle.query.chat.findMany({
where: and(eq(chat.userId, userId), eq(chat.docsId, docsId)),
Expand All @@ -131,6 +135,9 @@ export async function getChatFromCache(
context?: Partial<Context>
) {
const { drizzle, auth, userId } = await initAll(context);
if (!userId) {
return [];
}

const cache = await getCache();
const cachedResponse = await cache.match(
Expand Down
15 changes: 10 additions & 5 deletions wrangler.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,18 @@
"main": ".open-next/worker.js",
"name": "my-code",
"compatibility_date": "2025-03-25",
"compatibility_flags": [
"nodejs_compat",
"global_fetch_strictly_public",
],
"compatibility_flags": ["nodejs_compat", "global_fetch_strictly_public"],
"observability": {
"logs": {
"enabled": true,
"head_sampling_rate": 1,
"invocation_logs": true,
"persist": true,
},
},
"assets": {
"directory": ".open-next/assets",
"binding": "ASSETS"
"binding": "ASSETS",
},
"services": [
{
Expand Down