Skip to content

Commit 0592355

Browse files
committed
fix: fix a bug which website event throw error if can not create session together
1 parent afa4391 commit 0592355

1 file changed

Lines changed: 20 additions & 1 deletion

File tree

src/server/model/website/index.ts

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,26 @@ export async function findSession(req: Request): Promise<
134134
}
135135
}
136136

137-
const res: any = { ...session!, workspaceId: website.workspaceId };
137+
const res: WebsiteSession & { workspaceId: string } = {
138+
id: sessionId,
139+
websiteId: session?.websiteId ?? websiteId,
140+
hostname: session?.hostname ?? hostname,
141+
browser: session?.browser ?? browser,
142+
os: session?.os ?? os,
143+
device: session?.device ?? device ?? null,
144+
screen: session?.screen ?? screen ?? null,
145+
language: session?.language ?? language ?? null,
146+
ip: session?.ip ?? ip,
147+
country: session?.country ?? country ?? null,
148+
subdivision1: session?.subdivision1 ?? subdivision1 ?? null,
149+
subdivision2: session?.subdivision2 ?? subdivision2 ?? null,
150+
city: session?.city ?? city ?? null,
151+
longitude: session?.longitude ?? longitude ?? null,
152+
latitude: session?.latitude ?? latitude ?? null,
153+
accuracyRadius: session?.accuracyRadius ?? accuracyRadius ?? null,
154+
createdAt: session?.createdAt ?? new Date(),
155+
workspaceId: website.workspaceId,
156+
};
138157

139158
return res;
140159
}

0 commit comments

Comments
 (0)