{{ characterConfig.peoples[data.progress.race.index].description }}
diff --git a/pages/character/index.client.vue b/pages/character/index.client.vue
index 4c12977..aacd111 100644
--- a/pages/character/index.client.vue
+++ b/pages/character/index.client.vue
@@ -1,29 +1,27 @@
+
+
+
+ d[any] - Liste des personnages
+
+
+
+
+
+
+
+
+
+ {{ character.name }}
+ Niveau {{ character.progress.level }}
+
+
+
+
+ Erreur de chargement
+ {{ error?.message }}
+
+
\ No newline at end of file
diff --git a/server/api/auth/register.post.ts b/server/api/auth/register.post.ts
index 69a328d..ec65bbd 100644
--- a/server/api/auth/register.post.ts
+++ b/server/api/auth/register.post.ts
@@ -61,7 +61,7 @@ export default defineEventHandler(async (e): Promise
=> {
else
{
const hash = await Bun.password.hash(body.data.password);
- db.insert(usersTable).values({ username: sql.placeholder('username'), email: sql.placeholder('email'), hash: sql.placeholder('hash'), state: sql.placeholder('state') }).prepare().run({ username: body.data.username, email: body.data.email, hash, state: 1 });
+ db.insert(usersTable).values({ username: sql.placeholder('username'), email: sql.placeholder('email'), hash: sql.placeholder('hash'), state: sql.placeholder('state') }).prepare().run({ username: body.data.username, email: body.data.email, hash, state: 0 });
const id = db.select({ id: usersTable.id }).from(usersTable).where(eq(usersTable.username, sql.placeholder('username'))).prepare().get({ username: body.data.username });
if(!id || !id.id)
@@ -72,7 +72,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: 1, signin: new Date(), permissions: [], lastTimestamp: new Date(), logCount: 1 } }) 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: [], lastTimestamp: new Date(), logCount: 1 } }) as UserSessionRequired);
const emailId = Bun.hash('register' + id.id + hash, Date.now());
const timestamp = Date.now() + 1000 * 60 * 60;
diff --git a/server/api/character.get.ts b/server/api/character.get.ts
index e0c49c1..aa55c01 100644
--- a/server/api/character.get.ts
+++ b/server/api/character.get.ts
@@ -1,27 +1,82 @@
import { and, eq, sql } from 'drizzle-orm';
import useDatabase from '~/composables/useDatabase';
-import { characterTable } from '~/db/schema';
+import { characterTable, userPermissionsTable } from '~/db/schema';
+import { hasPermissions } from '~/shared/auth.util';
import type { Character } from '~/types/character';
export default defineEventHandler(async (e) => {
- const session = await getUserSession(e);
+ let { visibility } = getQuery(e) as { visibility?: "public" | "own" | "admin" };
- if(!session.user)
+ if(!visibility)
{
- setResponseStatus(e, 401);
- return;
+ visibility = "own";
}
- const db = useDatabase();
- const character = db.select({
- id: characterTable.id,
- name: characterTable.name,
- progress: characterTable.progress,
- }).from(characterTable).where(eq(characterTable.owner, session.user.id)).all();
-
- if(character !== undefined)
+ if(visibility === "own")
{
- return character as Character[];
+ const session = await getUserSession(e);
+ if(!session.user)
+ {
+ setResponseStatus(e, 401);
+ return;
+ }
+
+ const db = useDatabase();
+ const characters = db.select({
+ id: characterTable.id,
+ name: characterTable.name,
+ progress: characterTable.progress,
+ visibility: characterTable.visibility,
+ }).from(characterTable).where(eq(characterTable.owner, session.user.id)).all();
+
+ if(characters !== undefined)
+ {
+ return characters as Character[];
+ }
+ }
+ else if(visibility === 'public')
+ {
+ const db = useDatabase();
+ const characters = db.select({
+ id: characterTable.id,
+ name: characterTable.name,
+ progress: characterTable.progress,
+ visibility: characterTable.visibility,
+ }).from(characterTable).where(eq(characterTable.visibility, "public")).all();
+
+ if(characters !== undefined)
+ {
+ return characters as Character[];
+ }
+ }
+ else if(visibility === 'admin')
+ {
+ const session = await getUserSession(e);
+ if(!session.user)
+ {
+ setResponseStatus(e, 401);
+ return;
+ }
+ const db = useDatabase();
+
+ const rights = db.select({ right: userPermissionsTable.permission }).from(userPermissionsTable).where(eq(userPermissionsTable.id, session.user.id)).all();
+ if(rights.length === 0 || !hasPermissions(rights.map(e => e.right), ['admin']))
+ {
+ setResponseStatus(e, 403);
+ return;
+ }
+
+ const characters = db.select({
+ id: characterTable.id,
+ name: characterTable.name,
+ progress: characterTable.progress,
+ visibility: characterTable.visibility,
+ }).from(characterTable).all();
+
+ if(characters !== undefined)
+ {
+ return characters as Character[];
+ }
}
setResponseStatus(e, 404);
diff --git a/server/api/character/[id].get.ts b/server/api/character/[id].get.ts
index 0b66f8a..2597b26 100644
--- a/server/api/character/[id].get.ts
+++ b/server/api/character/[id].get.ts
@@ -25,7 +25,8 @@ export default defineEventHandler(async (e) => {
id: characterTable.id,
name: characterTable.name,
progress: characterTable.progress,
- owner: characterTable.owner
+ owner: characterTable.owner,
+ visibility: characterTable.visibility,
}).from(characterTable).where(and(eq(characterTable.id, id), eq(characterTable.owner, session.user.id))).get();
if(character !== undefined)
diff --git a/types/character.ts b/types/character.ts
index e722681..78bf8a0 100644
--- a/types/character.ts
+++ b/types/character.ts
@@ -29,7 +29,7 @@ export const elementTexts: Record
light: { class: 'text-light-yellow dark:text-dark-yellow', text: 'Lumière' },
psyche: { class: 'text-light-purple dark:text-dark-purple', text: 'Psy' },
}
-export const spellTypeTexts: Record = { "instinct": "Instinct", "knowledge": "Savoir", "precision": "Précision" };
+export const spellTypeTexts: Record = { "instinct": "Instinct", "knowledge": "Savoir", "precision": "Précision", "arts": "Oeuvres" };
export type Progression = {
training: Record[]>;
@@ -50,6 +50,7 @@ export type Character = {
progress: Progression;
values: CharacterValues;
owner?: number;
+ visibility: "private" | "public";
};
export type CharacterValues = {
hp: number;