1 files changed, 12 insertions, 2 deletions
diff --git a/src/db/dbAccess/user.js b/src/db/dbAccess/user.js
index a461f3e..7357b59 100644
--- a/src/db/dbAccess/user.js
+++ b/src/db/dbAccess/user.js
@@ -3,6 +3,7 @@ import { DbUser, deviceSchema } from '#db/schemas/index.js';
 import { AuthDto, RegisterDto } from '#dto/index.js';
 import { SafeNSoundError } from '#util/error.js';
 import { WhoAmIDto } from '#dto/auth/WhoAmIDto.js';
+import { generateJwtToken } from '#util/jwtUtils.js';
 
 async function whoAmI(token) {}
 
@@ -63,7 +64,7 @@ export async function registerUser(data) {
 export async function deleteUser(data) {
     var user = await getUserByAuth(data);
 
-    await DbUser.findByIdAndDelete(data._id);
+    await DbUser.findByIdAndDelete(user._id);
 }
 
 /**
@@ -80,9 +81,18 @@ export async function loginUser(data, deviceName) {
     user.devices.push(device);
     await user.save();
 
-    return WhoAmIDto.create({
+    const whoAmI = await WhoAmIDto.create({
         userId: user._id,
         username: user.username,
         deviceId: device._id
     });
+
+    whoAmI.access_token = await generateJwtToken({
+        type: user.type,
+        sub: user._id.toString(),
+        deviceId: device._id.toString(),
+        iat: Math.floor(Date.now() / 1000)
+    });
+
+    return whoAmI;
 }