From 6fb18d5827f099d34627f257754faa967ddb74a0 Mon Sep 17 00:00:00 2001
From: Maxime Dor <max@kamax.io>
Date: Sat, 16 Sep 2017 01:34:31 +0200
Subject: [PATCH] Remove problematic handling of multiple validation requests
 for same 3PID

---
 .../io/kamax/mxisd/mapping/MappingManager.java    | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/main/groovy/io/kamax/mxisd/mapping/MappingManager.java b/src/main/groovy/io/kamax/mxisd/mapping/MappingManager.java
index 2e7d879..1f8c3ec 100644
--- a/src/main/groovy/io/kamax/mxisd/mapping/MappingManager.java
+++ b/src/main/groovy/io/kamax/mxisd/mapping/MappingManager.java
@@ -36,7 +36,6 @@ public class MappingManager {
 
     private Logger log = LoggerFactory.getLogger(MappingManager.class);
 
-    private Map<String, Session> threePidLookups = new WeakHashMap<>();
     private Map<String, Session> sessions = new HashMap<>();
     private Timer cleaner;
 
@@ -51,7 +50,6 @@ public class MappingManager {
                         log.info("Session {} is obsolete, removing", s.sid);
 
                         sessions.remove(s.sid);
-                        threePidLookups.remove(s.hash);
                     }
                 }
             }
@@ -65,16 +63,9 @@ public class MappingManager {
         } while (sessions.containsKey(sid));
 
         String threePidHash = data.getMedium() + data.getValue();
-        Session session = threePidLookups.get(threePidHash);
-        if (session != null) {
-            sid = session.sid;
-        } else {
-            // TODO perform some kind of validation
-
-            session = new Session(sid, threePidHash, data);
-            sessions.put(sid, session);
-            threePidLookups.put(threePidHash, session);
-        }
+        // TODO think how to handle different requests for the same e-mail
+        Session session = new Session(sid, threePidHash, data);
+        sessions.put(sid, session);
 
         log.info("Created new session {} to validate {} {}", sid, session.medium, session.address);
         return sid;