Working prototype

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

@@ -22,6 +22,7 @@ package io.kamax.mxisd.controller.v1
 
 import com.google.gson.Gson
 import io.kamax.matrix.MatrixID
+import io.kamax.mxisd.config.ServerConfig
 import io.kamax.mxisd.controller.v1.io.ThreePidInviteReplyIO
 import io.kamax.mxisd.invitation.IThreePidInvite
 import io.kamax.mxisd.invitation.IThreePidInviteReply
@@ -50,6 +51,9 @@ class InvitationController {
     @Autowired
     private KeyManager keyMgr
 
+    @Autowired
+    private ServerConfig srvCfg
+
     private Gson gson = new Gson()
 
     @RequestMapping(value = "/_matrix/identity/api/v1/store-invite", method = POST)
@@ -62,7 +66,7 @@ class InvitationController {
         IThreePidInvite invite = new ThreePidInvite(new MatrixID(sender), medium, address, roomId)
         IThreePidInviteReply reply = mgr.storeInvite(invite)
 
-        return gson.toJson(new ThreePidInviteReplyIO(reply, keyMgr.getPublicKeyBase64(keyMgr.getCurrentIndex())))
+        return gson.toJson(new ThreePidInviteReplyIO(reply, keyMgr.getPublicKeyBase64(keyMgr.getCurrentIndex()), srvCfg.getPublicUrl()))
     }
 
 }

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

@@ -24,11 +24,13 @@ import groovy.json.JsonOutput
 import io.kamax.mxisd.exception.BadRequestException
 import io.kamax.mxisd.exception.NotImplementedException
 import io.kamax.mxisd.key.KeyManager
+import org.apache.commons.lang.StringUtils
 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
@@ -49,6 +51,7 @@ class KeyController {
             throw new BadRequestException("Invalid algorithm: " + keyType)
         }
 
+        log.info("Key {}:{} was requested", keyType, keyId)
         return JsonOutput.toJson([
                 public_key: keyMgr.getPublicKeyBase64(keyId)
         ])
@@ -62,10 +65,14 @@ class KeyController {
     }
 
     @RequestMapping(value = "/_matrix/identity/api/v1/pubkey/isvalid", method = GET)
-    String checkKeyValidity(HttpServletRequest request) {
-        log.error("{} was requested but not implemented", request.getRequestURL())
+    String checkKeyValidity(HttpServletRequest request, @RequestParam("public_key") String pubKey) {
+        log.info("Validating public key {}", pubKey)
 
-        throw new NotImplementedException()
+        // TODO do in manager
+        boolean valid = StringUtils.equals(pubKey, keyMgr.getPublicKeyBase64(keyMgr.getCurrentIndex()))
+        return JsonOutput.toJson(
+                valid: valid
+        )
     }
 
 }

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

@@ -2,8 +2,7 @@ package io.kamax.mxisd.controller.v1.io;
 
 import io.kamax.mxisd.invitation.IThreePidInviteReply;
 
-import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 public class ThreePidInviteReplyIO {
@@ -12,20 +11,40 @@ public class ThreePidInviteReplyIO {
     private List<Key> public_keys;
     private String display_name;
 
-    public ThreePidInviteReplyIO(IThreePidInviteReply reply, String pubKey) {
+    public ThreePidInviteReplyIO(IThreePidInviteReply reply, String pubKey, String publicUrl) {
         this.token = reply.getToken();
-        this.public_keys = new ArrayList<>(Arrays.asList(new Key(pubKey)));
+        this.public_keys = Collections.singletonList(new Key(pubKey, publicUrl));
         this.display_name = reply.getDisplayName();
     }
 
+    public String getToken() {
+        return token;
+    }
+
+    public List<Key> getPublic_keys() {
+        return public_keys;
+    }
+
+    public String getDisplay_name() {
+        return display_name;
+    }
+
     public class Key {
         private String key_validity_url;
         private String public_key;
 
-        public Key(String key) {
-            this.key_validity_url = "https://example.org/_matrix/fixme"; // FIXME have a proper URL even if synapse does not check
+        public Key(String key, String publicUrl) {
+            this.key_validity_url = publicUrl + "/_matrix/identity/api/v1/pubkey/isvalid";
             this.public_key = key;
         }
+
+        public String getKey_validity_url() {
+            return key_validity_url;
+        }
+
+        public String getPublic_key() {
+            return public_key;
+        }
     }
 
 }