fix members

dashboard/server/api/project/members/kick.post.ts

@@ -16,6 +16,7 @@ export default defineEventHandler(async event => {
     if (!user) return setResponseStatus(event, 400, 'Email not found');
 
     await TeamMemberModel.deleteOne({ project_id, user_id: user.id });
+    await TeamMemberModel.deleteOne({ project_id, email: email });
 
     return { ok: true }
 

dashboard/server/api/project/members/list.ts

@@ -42,8 +42,15 @@ export default defineEventHandler(async event => {
     })
 
     for (const member of members) {
-        const userMember = member.user_id ? await UserModel.findById(member.user_id) : await UserModel.findOne({ email: member.email });
-        if (!userMember) continue;
+
+        let userMember;
+
+        if (member.user_id) {
+            userMember = await UserModel.findById(member.user_id);
+        } else {
+            userMember = await UserModel.findOne({ email: member.email });
+        }
+
 
         const permission: TPermission = {
             webAnalytics: member.permission?.webAnalytics || false,
@@ -54,11 +61,11 @@ export default defineEventHandler(async event => {
 
         result.push({
             id: member.id,
-            email: userMember.email,
-            name: userMember.name,
+            email: userMember?.email || member.email || 'NO_EMAIL',
+            name: userMember?.name || 'NO_NAME',
             role: member.role,
             pending: member.pending,
-            me: user.id === userMember.id,
+            me: user.id === (userMember?.id || member.user_id || 'NO_ID'),
             permission
         })
     }

dashboard/server/api/project/members/me.ts

@@ -19,13 +19,18 @@ export default defineEventHandler(async event => {
         webAnalytics: true
     }
 
-    const member = await TeamMemberModel.findOne({ project_id, user_id: user.id });
+    const member = await TeamMemberModel.findOne({
+        project_id,
+        $or: [
+            { user_id: user.id }, { email: user.user.email }
+        ]
+    });
 
     if (!member) return {
-        ai: true,
-        domains: ['All domains'],
-        events: true,
-        webAnalytics: true
+        ai: false,
+        domains: [],
+        events: false,
+        webAnalytics: false
     }
 
     return {