allow relinking old contextIds by the same user

BrightID · Aug 29, 2020 · b80ec55 · b80ec55
1 parent e9fca07
commit b80ec55
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/web_services/foxx/apply5.zip b/web_services/foxx/apply5.zip
diff --git a/web_services/foxx/brightid5.zip b/web_services/foxx/brightid5.zip
diff --git a/web_services/foxx/brightid5/db.js b/web_services/foxx/brightid5/db.js
@@ -568,14 +568,6 @@ function linkContextId(id, context, contextId, timestamp) {
     contextId = contextId.toLowerCase();
   }
 
-  // accept link if the contextId is the last linked contextId
-  if (getContextIdsByUser(coll, id)[0] === contextId) {
-    return;
-  }
-  if (getUserByContextId(coll, contextId)) {
-    throw 'contextId is duplicate';
-  }
-
   const links = coll.byExample({user: id}).toArray();
   const recentLinks = links.filter(
     link => timestamp - link.timestamp < 24*3600*1000
@@ -584,6 +576,20 @@ function linkContextId(id, context, contextId, timestamp) {
     throw 'only three contextIds can be linked every 24 hours';
   }
 
+  // accept link if the contextId is used by the same user before
+  links.forEach(link => {
+    if (link.contextId === contextId) {
+      if (timestamp > link.timestamp) {
+        coll.update(link, { timestamp });
+      }
+      return;
+    }
+  })
+
+  if (getUserByContextId(coll, contextId)) {
+    throw 'contextId is duplicate';
+  }
+
   coll.insert({
     user: id,
     contextId,