Blindly accept mappings so Riot is happy - Fix #23

src/main/groovy/io/kamax/mxisd/controller/v1/SessionController.groovy

@@ -20,48 +20,132 @@
 
 package io.kamax.mxisd.controller.v1
 
+import com.google.gson.Gson
+import com.google.gson.JsonObject
+import io.kamax.mxisd.controller.v1.io.SessionEmailTokenRequestJson
+import io.kamax.mxisd.controller.v1.io.SessionPhoneTokenRequestJson
+import io.kamax.mxisd.exception.BadRequestException
 import io.kamax.mxisd.exception.NotImplementedException
+import io.kamax.mxisd.lookup.ThreePid
+import io.kamax.mxisd.mapping.MappingManager
+import org.apache.commons.io.IOUtils
+import org.apache.commons.lang.StringUtils
+import org.apache.http.HttpStatus
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.web.bind.annotation.PathVariable
 import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.bind.annotation.RestController
 
 import javax.servlet.http.HttpServletRequest
-
-import static org.springframework.web.bind.annotation.RequestMethod.GET
-import static org.springframework.web.bind.annotation.RequestMethod.POST
+import javax.servlet.http.HttpServletResponse
+import java.nio.charset.StandardCharsets
 
 @RestController
 class SessionController {
 
+    @Autowired
+    private MappingManager mgr
+
+    private Gson gson = new Gson()
+
     private Logger log = LoggerFactory.getLogger(SessionController.class)
 
-    @RequestMapping(value = "/_matrix/identity/api/v1/validate/{medium}/requestToken", method = POST)
-    String init(HttpServletRequest request) {
-        log.error("{} was requested but not implemented", request.getRequestURL())
-
-        throw new NotImplementedException()
+    private <T> T fromJson(HttpServletRequest req, Class<T> obj) {
+        gson.fromJson(new InputStreamReader(req.getInputStream(), StandardCharsets.UTF_8), obj)
     }
 
-    @RequestMapping(value = "/_matrix/identity/api/v1/validate/{medium}/submitToken", method = [GET, POST])
+    @RequestMapping(value = "/_matrix/identity/api/v1/validate/{medium}/requestToken")
+    String init(HttpServletRequest request, HttpServletResponse response, @PathVariable String medium) {
+        log.info("Requested: {}", request.getRequestURL(), request.getQueryString())
+
+        if (StringUtils.equals("email", medium)) {
+            SessionEmailTokenRequestJson req = fromJson(request, SessionEmailTokenRequestJson.class)
+            return gson.toJson(new Sid(mgr.create(req)))
+        }
+
+        if (StringUtils.equals("msisdn", medium)) {
+            SessionPhoneTokenRequestJson req = fromJson(request, SessionPhoneTokenRequestJson.class)
+            return gson.toJson(new Sid(mgr.create(req)))
+        }
+
+        JsonObject obj = new JsonObject();
+        obj.addProperty("errcode", "M_INVALID_3PID_TYPE")
+        obj.addProperty("error", medium + " is not supported as a 3PID type")
+        response.setStatus(HttpStatus.SC_BAD_REQUEST)
+        return gson.toJson(obj)
+    }
+
+    @RequestMapping(value = "/_matrix/identity/api/v1/validate/{medium}/submitToken")
     String validate(HttpServletRequest request) {
-        log.error("{} was requested but not implemented", request.getRequestURL())
+        log.info("Requested: {}?{}", request.getRequestURL(), request.getQueryString())
 
         throw new NotImplementedException()
     }
 
-    @RequestMapping(value = "/_matrix/identity/api/v1/3pid/getValidated3pid", method = POST)
-    String check(HttpServletRequest request) {
-        log.error("{} was requested but not implemented", request.getRequestURL())
+    @RequestMapping(value = "/_matrix/identity/api/v1/3pid/getValidated3pid")
+    String check(HttpServletRequest request, HttpServletResponse response,
+                 @RequestParam String sid, @RequestParam("client_secret") String secret) {
+        log.info("Requested: {}?{}", request.getRequestURL(), request.getQueryString())
 
-        throw new NotImplementedException()
+        Optional<ThreePid> result = mgr.getValidated(sid, secret)
+        if (result.isPresent()) {
+            log.info("requested session was validated")
+            ThreePid pid = result.get()
+
+            JsonObject obj = new JsonObject()
+            obj.addProperty("medium", pid.getMedium())
+            obj.addProperty("address", pid.getAddress())
+            obj.addProperty("validated_at", pid.getValidation().toEpochMilli())
+
+            return gson.toJson(obj);
+        } else {
+            log.info("requested session was not validated")
+
+            JsonObject obj = new JsonObject()
+            obj.addProperty("errcode", "M_SESSION_NOT_VALIDATED")
+            obj.addProperty("error", "sid, secret or session not valid")
+            response.setStatus(HttpStatus.SC_BAD_REQUEST)
+            return gson.toJson(obj)
+        }
     }
 
-    @RequestMapping(value = "/_matrix/identity/api/v1/3pid/bind", method = POST)
-    String bind(HttpServletRequest request) {
-        log.error("{} was requested but not implemented", request.getRequestURL())
+    @RequestMapping(value = "/_matrix/identity/api/v1/3pid/bind")
+    String bind(HttpServletRequest request, HttpServletResponse response,
+                @RequestParam String sid, @RequestParam("client_secret") String secret, @RequestParam String mxid) {
+        String data = IOUtils.toString(request.getReader())
+        log.info("Requested: {}", request.getRequestURL(), request.getQueryString())
+        try {
+            mgr.bind(sid, secret, mxid)
+            return "{}"
+        } catch (BadRequestException e) {
+            log.info("requested session was not validated")
 
-        throw new NotImplementedException()
+            obj = new JsonObject()
+            obj.addProperty("errcode", "M_SESSION_NOT_VALIDATED")
+            obj.addProperty("error", e.getMessage())
+            response.setStatus(HttpStatus.SC_BAD_REQUEST)
+            return gson.toJson(obj)
+        }
+    }
+
+    private class Sid {
+
+        private String sid;
+
+        public Sid(String sid) {
+            setSid(sid);
+        }
+
+        String getSid() {
+            return sid
+        }
+
+        void setSid(String sid) {
+            this.sid = sid
+        }
     }
 
 }

src/main/groovy/io/kamax/mxisd/controller/v1/io/GenericTokenRequestJson.java

@@ -0,0 +1,23 @@
+package io.kamax.mxisd.controller.v1.io;
+
+import io.kamax.mxisd.mapping.MappingSession;
+
+public abstract class GenericTokenRequestJson implements MappingSession {
+
+    private String client_secret;
+    private int send_attempt;
+    private String id_server;
+
+    public String getSecret() {
+        return client_secret;
+    }
+
+    public int getAttempt() {
+        return send_attempt;
+    }
+
+    public String getServer() {
+        return id_server;
+    }
+
+}

src/main/groovy/io/kamax/mxisd/controller/v1/io/SessionEmailTokenRequestJson.java

@@ -0,0 +1,17 @@
+package io.kamax.mxisd.controller.v1.io;
+
+public class SessionEmailTokenRequestJson extends GenericTokenRequestJson {
+
+    private String email;
+
+    @Override
+    public String getMedium() {
+        return "email";
+    }
+
+    @Override
+    public String getValue() {
+        return email;
+    }
+
+}

src/main/groovy/io/kamax/mxisd/controller/v1/io/SessionPhoneTokenRequestJson.java

@@ -0,0 +1,22 @@
+package io.kamax.mxisd.controller.v1.io;
+
+public class SessionPhoneTokenRequestJson extends GenericTokenRequestJson {
+
+    private String country;
+    private String phone_number;
+
+    @Override
+    public String getMedium() {
+        return "email";
+    }
+
+    @Override
+    public String getValue() {
+        return phone_number;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+
+}