watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-09 23:27:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'dev' into feat/um-285-report-schema

Browse source
This commit is contained in:
Brian Cao 2023-05-16 14:12:39 -07:00
commit 748ad84a52
7 changed files with 33 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pages/api/auth/login.ts
View file

@ -50,7 +50,7 @@ export default async (
return ok(res, {
token,
user: { id: user.id, username: user.username, createdAt: user.createdAt },
user: { id: user.id, username: user.username, role: user.role, createdAt: user.createdAt },
});
}

1
pages/api/send.ts
View file

@ -28,6 +28,7 @@ export interface NextApiRequestCollect extends NextApiRequest {
session: {
id: string;
websiteId: string;
ownerId: string;
hostname: string;
browser: string;
os: string;