diff --git a/src/main/groovy/io/kamax/mxisd/lookup/provider/DnsLookupProvider.groovy b/src/main/groovy/io/kamax/mxisd/lookup/provider/DnsLookupProvider.groovy index f373bc1..ea86b9b 100644 --- a/src/main/groovy/io/kamax/mxisd/lookup/provider/DnsLookupProvider.groovy +++ b/src/main/groovy/io/kamax/mxisd/lookup/provider/DnsLookupProvider.groovy @@ -123,7 +123,7 @@ class DnsLookupProvider extends RemoteIdentityServerProvider { Optional baseUrl = findIdentityServerForDomain(domain) if (baseUrl.isPresent()) { - return performLookup(baseUrl.get(), request.getType().toString(), request.getThreePid()) + return find(baseUrl.get(), request.getType().toString(), request.getThreePid()) } return Optional.empty() diff --git a/src/main/groovy/io/kamax/mxisd/lookup/provider/RemoteIdentityServerProvider.groovy b/src/main/groovy/io/kamax/mxisd/lookup/provider/RemoteIdentityServerProvider.groovy index 46da9b1..12b3ba5 100644 --- a/src/main/groovy/io/kamax/mxisd/lookup/provider/RemoteIdentityServerProvider.groovy +++ b/src/main/groovy/io/kamax/mxisd/lookup/provider/RemoteIdentityServerProvider.groovy @@ -73,26 +73,6 @@ abstract class RemoteIdentityServerProvider implements ThreePidProvider { } } - Optional performLookup(String remote, String medium, String address) throws IOException, JsonException { - HttpURLConnection rootSrvConn = (HttpURLConnection) new URL( - "${remote}/_matrix/identity/api/v1/lookup?medium=${medium}&address=${address}" - ).openConnection() - - def output = json.parseText(rootSrvConn.getInputStream().getText()) - if (output['address']) { - log.info("Found 3PID mapping: {}", output) - - ThreePidMapping mapping = new ThreePidMapping() - mapping.setMedium(output['medium'].toString()) - mapping.setValue(output['address'].toString()) - mapping.setMxid(output['mxid'].toString()) - return Optional.of(mapping) - } - - log.info("Empty 3PID mapping from {}", remote) - return Optional.empty() - } - Optional find(String remote, String type, String threePid) { log.info("Looking up {} 3PID {} using {}", type, threePid, remote)