+
{{ user.username }}
@@ -24,5 +24,19 @@ let { user, clear } = useUserSession();
+
+
+
+
+ Permission
+
+
+
+
+ {{ permission }}
+
+
+
+
\ No newline at end of file
diff --git a/server/api/auth/login.post.ts b/server/api/auth/login.post.ts
index 4961a18..29a63d2 100644
--- a/server/api/auth/login.post.ts
+++ b/server/api/auth/login.post.ts
@@ -73,6 +73,7 @@ export default defineEventHandler(async (e): Promise
=> {
},
with: {
data: true,
+ permission: true,
},
where: (table) => eq(table.id, sql.placeholder('id'))
}).prepare().get({ id: id.id });
@@ -89,6 +90,7 @@ export default defineEventHandler(async (e): Promise => {
email: user.email,
username: user.username,
state: user.state,
+ permissions: user.permission.map(e => e.permission),
}
}) as UserSessionRequired);
diff --git a/server/api/auth/register.post.ts b/server/api/auth/register.post.ts
index f082710..e029c21 100644
--- a/server/api/auth/register.post.ts
+++ b/server/api/auth/register.post.ts
@@ -71,7 +71,7 @@ export default defineEventHandler(async (e): Promise => {
db.insert(usersDataTable).values({ id: sql.placeholder('id') }).prepare().run({ id: id.id });
- logSession(e, await setUserSession(e, { user: { id: id.id, username: body.data.username, email: body.data.email, state: 0, signin: new Date() } }) as UserSessionRequired);
+ logSession(e, await setUserSession(e, { user: { id: id.id, username: body.data.username, email: body.data.email, state: 0, signin: new Date(), permissions: [] } }) as UserSessionRequired);
setResponseStatus(e, 201);
return { success: true, session };
diff --git a/server/plugins/session.ts b/server/plugins/session.ts
index 7ca88f2..4fc12a8 100644
--- a/server/plugins/session.ts
+++ b/server/plugins/session.ts
@@ -1,6 +1,7 @@
import useDatabase from "~/composables/useDatabase";
import { userSessionsTable } from "~/db/schema";
import { eq, and, sql } from "drizzle-orm";
+import { refreshSessionFromDB } from "../utils/user";
const monthAsMs = 60 * 60 * 24 * 30 * 1000;
@@ -25,6 +26,7 @@ export default defineNitroPlugin(() => {
await db.update(userSessionsTable).set({
timestamp: new Date(),
}).where(and(eq(userSessionsTable.id, sql.placeholder('id')), eq(userSessionsTable.user_id, sql.placeholder('user_id')))).prepare().run({ id: session.id, user_id: session.user.id });
+ await refreshSessionFromDB(event, session.id);
}
});
sessionHooks.hook('clear', async (session, event) => {
diff --git a/server/utils/user.ts b/server/utils/user.ts
index 8d4ff01..156550d 100644
--- a/server/utils/user.ts
+++ b/server/utils/user.ts
@@ -29,7 +29,43 @@ export function logSession(e: H3Event, session: UserSession
{
const db = useDatabase();
- console.log("Logging session %s", session.id)
db.insert(userSessionsTable).values({ id: sql.placeholder('id'), user_id: sql.placeholder('user_id'), timestamp: sql.placeholder('timestamp') }).prepare().run({ id: session.id, user_id: session.user.id, timestamp: new Date() });
return session;
+}
+export async function refreshSessionFromDB(e: H3Event, sessionId: string): Promise
+{
+ const db = useDatabase();
+
+ const user = db.query.userSessionsTable.findFirst({
+ columns: {
+ id: false,
+ },
+ with: {
+ users: {
+ with: {
+ permission: true,
+ data: true,
+ }
+ }
+ },
+ where: (table) => eq(table.id, sql.placeholder('id'))
+ }).prepare().get({ id: sessionId });
+
+ if(user)
+ {
+ await replaceUserSession(e, {
+ id: sessionId,
+ user: {
+ ...user.users.data,
+ email: user.users.email,
+ username: user.users.username,
+ state: user.users.state,
+ permissions: user.users.permission.map(e => e.permission),
+ }
+ });
+ }
+ else
+ {
+ throw createError({ statusCode: 401, message: 'Invalid session' });
+ }
}
\ No newline at end of file
diff --git a/types/auth.d.ts b/types/auth.d.ts
index 8361487..8fd86d0 100644
--- a/types/auth.d.ts
+++ b/types/auth.d.ts
@@ -8,6 +8,8 @@ declare module 'vue-router'
requiresAuth?: boolean;
guestsGoesTo?: string;
usersGoesTo?: string;
+ rights?: string[];
+ validState?: boolean;
}
}
@@ -31,7 +33,9 @@ export interface UserExtendedData {
signin: Date;
}
-export type User = UserRawData & UserExtendedData;
+export type Permissions = { permissions: string[] };
+
+export type User = UserRawData & UserExtendedData & Permissions;
export interface UserSession {
user?: User;