@ozdao/martyrs 0.2.538 → 0.2.539

package/src/modules/notifications/controllers/notifications.controller.js

@@ -129,27 +129,34 @@ const NotificationsController = (db, wss, notificationService) => {
         return res.status(400).json({ message: 'Either userId or anonymousId is required' });
       }
       
-      // First, try to find existing device by deviceToken
-      let existingDevice = await db.userDevice.findOne({ deviceToken });
+      // FIRST: Check by userId/anonymousId + deviceId (primary key)
+      let existingDevice;
+      if (userId) {
+        existingDevice = await db.userDevice.findOne({ userId, deviceId });
+      } else {
+        existingDevice = await db.userDevice.findOne({ anonymousId, deviceId });
+      }
       
       if (existingDevice) {
-        // Device with this token already exists, update it
-        console.log('[RegisterDevice] Found existing device by token, updating...');
+        // Device with this userId/anonymousId + deviceId exists, update it
+        console.log('[RegisterDevice] Found existing device by userId/anonymousId + deviceId, updating...');
         
-        if (userId) {
-          // Transfer device from anonymous to authenticated user
-          existingDevice.userId = userId;
-          existingDevice.anonymousId = undefined;
-          existingDevice.isAnonymous = false;
-        } else {
-          // Update anonymous device
-          existingDevice.anonymousId = anonymousId;
-          existingDevice.userId = undefined;
-          existingDevice.isAnonymous = true;
+        // Check if the new deviceToken is already used by another device
+        if (existingDevice.deviceToken !== deviceToken) {
+          const tokenConflict = await db.userDevice.findOne({ 
+            deviceToken,
+            _id: { $ne: existingDevice._id }
+          });
+          
+          if (tokenConflict) {
+            // Remove the conflicting device with this token
+            console.log('[RegisterDevice] Removing conflicting device with token:', tokenConflict._id);
+            await tokenConflict.deleteOne();
+          }
         }
         
-        // Update common fields
-        existingDevice.deviceId = deviceId;
+        // Update the existing device
+        existingDevice.deviceToken = deviceToken;
         existingDevice.deviceType = deviceType;
         existingDevice.lastActive = Date.now();
         existingDevice.isActive = true;
@@ -159,19 +166,17 @@ const NotificationsController = (db, wss, notificationService) => {
         return res.status(200).json(existingDevice);
       }
       
-      // No existing device with this token, proceed with original logic
-      // Build the filter based on whether user is authenticated or anonymous
-      let filter;
-      if (userId) {
-        // For authenticated users, use userId + deviceId as unique identifier
-        filter = { userId, deviceId };
-      } else {
-        // For anonymous users, use anonymousId + deviceId as unique identifier
-        filter = { anonymousId, deviceId };
+      // SECOND: Check if deviceToken is already used
+      const tokenDevice = await db.userDevice.findOne({ deviceToken });
+      
+      if (tokenDevice) {
+        // This token is already registered to another device
+        console.log('[RegisterDevice] Token already exists for different device, removing old device:', tokenDevice._id);
+        await tokenDevice.deleteOne();
       }
       
-      // Build update data
-      const updateData = {
+      // Create new device
+      const deviceData = {
         deviceId,
         deviceType,
         deviceToken,
@@ -181,25 +186,16 @@ const NotificationsController = (db, wss, notificationService) => {
       };
       
       if (userId) {
-        updateData.userId = userId;
-        // Remove anonymousId field when user is authenticated
-        updateData.$unset = { anonymousId: 1 };
+        deviceData.userId = userId;
       } else {
-        updateData.anonymousId = anonymousId;
-        // Remove userId field when user is anonymous
-        updateData.$unset = { userId: 1 };
+        deviceData.anonymousId = anonymousId;
       }
       
-      // Upsert the device
-      const device = await db.userDevice.findOneAndUpdate(
-        filter,
-        updateData,
-        { upsert: true, new: true, setDefaultsOnInsert: true }
-      );
+      const device = await db.userDevice.create(deviceData);
       
-      console.log('[RegisterDevice] Device registered/updated:', device._id);
+      console.log('[RegisterDevice] New device created:', device._id);
       
-      return res.status(200).json(device);
+      return res.status(201).json(device);
     } catch (err) {
       console.error('[RegisterDevice] Error:', err.message);
       return res.status(500).json({ message: err.message });

package/dist/martyrs/src/components/Dropdown/Dropdown.vue2.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"Dropdown.vue2.cjs","sources":["../../../../../src/components/Dropdown/Dropdown.vue"],"sourcesContent":["<template>\n  <div class=\"dropdown pos-relative\" v-click-outside=\"clickedOutside\" @click.stop=\"isOpen = !isOpen\">\n    <div v-if=\"isComponentLabel\" class=\"w-100 h-100 flex-center flex\">\n      <component :is=\"label.component\" v-bind=\"label.props\" :class=\"label.class\"></component>\n    </div>\n    <div v-else>\n      {{ label }}\n    </div>\n    <transition name=\"TransitionTranslateY\" mode=\"out-in\">\n      <div \n        v-show=\"isOpen\" \n        :style=\"{ left: align === 'left' ? '0' : 'auto', right: align === 'right' ? '0' : 'auto' }\" \n        class=\"dropdown-content radius-big\" \n      >\n        <slot></slot>\n      </div>\n    </transition>\n  </div>\n</template>\n\n<script setup>\nimport { ref, computed } from 'vue';\nimport clickOutside from '../FieldPhone/click-outside.js';\n\nlet vClickOutside = clickOutside\n\nconst props = defineProps({\n  label: {\n    type: [String, Object],\n    default: 'Open'\n  },\n  align: {\n    type: String,\n    default: 'left'\n  }\n})\n\nconst isOpen = ref(false);\nconst isComponentLabel = computed(() => typeof props.label === 'object');\n\nfunction clickedOutside () {\n  isOpen.value = false\n}\n</script>\n\n<style >\n.dropdown-content {\n  display: block;\n  position: absolute;\n  box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);\n  z-index: 1;\n}\n\n/*.dropdown:hover .dropdown-content {\n  display: block;\n}*/\n</style>\n"],"names":["clickOutside","ref","computed"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAwBA,QAAI,gBAAgBA,aAAAA;AAEpB,UAAM,QAAQ;AAWd,UAAM,SAASC,IAAAA,IAAI,KAAK;AACxB,UAAM,mBAAmBC,IAAAA,SAAS,MAAM,OAAO,MAAM,UAAU,QAAQ;AAEvE,aAAS,iBAAkB;AACzB,aAAO,QAAQ;AAAA,IACjB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/martyrs/src/components/Menu/Menu.vue2.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"Menu.vue2.cjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;"}

package/dist/martyrs/src/components/Menu/Menu.vue2.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Menu.vue2.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;"}