From c702a34aab146ea81b22a24025f352b7f00c140b Mon Sep 17 00:00:00 2001 From: Maxime Dor Date: Sun, 1 Oct 2017 16:10:05 +0200 Subject: [PATCH] Fix regression due to bad replace --- src/main/java/io/kamax/mxisd/UserIdType.java | 2 +- .../identity/v1/io/SessionEmailTokenRequestJson.java | 4 +++- .../io/kamax/mxisd/lookup/provider/DnsLookupProvider.java | 5 +++-- src/main/java/io/kamax/mxisd/matrix/IdentityServerUtils.java | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/io/kamax/mxisd/UserIdType.java b/src/main/java/io/kamax/mxisd/UserIdType.java index 5b94ec26..e0625bf1 100644 --- a/src/main/java/io/kamax/mxisd/UserIdType.java +++ b/src/main/java/io/kamax/mxisd/UserIdType.java @@ -28,7 +28,7 @@ public enum UserIdType { Localpart("localpart"), MatrixID("mxid"), EmailLocalpart("email_localpart"), - Email("threepids/email"); + Email("email"); private String id; diff --git a/src/main/java/io/kamax/mxisd/controller/identity/v1/io/SessionEmailTokenRequestJson.java b/src/main/java/io/kamax/mxisd/controller/identity/v1/io/SessionEmailTokenRequestJson.java index 49b1f761..58c527c2 100644 --- a/src/main/java/io/kamax/mxisd/controller/identity/v1/io/SessionEmailTokenRequestJson.java +++ b/src/main/java/io/kamax/mxisd/controller/identity/v1/io/SessionEmailTokenRequestJson.java @@ -20,12 +20,14 @@ package io.kamax.mxisd.controller.identity.v1.io; +import io.kamax.matrix.ThreePidMedium; + public class SessionEmailTokenRequestJson extends GenericTokenRequestJson { private String email; public String getMedium() { - return "threepids/email"; + return ThreePidMedium.Email.getId(); } public String getValue() { diff --git a/src/main/java/io/kamax/mxisd/lookup/provider/DnsLookupProvider.java b/src/main/java/io/kamax/mxisd/lookup/provider/DnsLookupProvider.java index 5564e54f..5230f5cf 100644 --- a/src/main/java/io/kamax/mxisd/lookup/provider/DnsLookupProvider.java +++ b/src/main/java/io/kamax/mxisd/lookup/provider/DnsLookupProvider.java @@ -20,6 +20,7 @@ package io.kamax.mxisd.lookup.provider; +import io.kamax.matrix.ThreePidMedium; import io.kamax.mxisd.config.MatrixConfig; import io.kamax.mxisd.lookup.SingleLookupReply; import io.kamax.mxisd.lookup.SingleLookupRequest; @@ -83,7 +84,7 @@ private Optional findIdentityServerForDomain(String domain) { @Override public Optional find(SingleLookupRequest request) { - if (!StringUtils.equals("threepids/email", request.getType())) { // TODO use enum + if (!ThreePidMedium.Email.is(request.getType())) { // TODO use enum log.info("Skipping unsupported type {} for {}", request.getType(), request.getThreePid()); return Optional.empty(); } @@ -106,7 +107,7 @@ public List populate(List mappings) { Map> domains = new HashMap<>(); for (ThreePidMapping mapping : mappings) { - if (!StringUtils.equals("threepids/email", mapping.getMedium())) { + if (!ThreePidMedium.Email.is(mapping.getMedium())) { log.info("Skipping unsupported type {} for {}", mapping.getMedium(), mapping.getValue()); continue; } diff --git a/src/main/java/io/kamax/mxisd/matrix/IdentityServerUtils.java b/src/main/java/io/kamax/mxisd/matrix/IdentityServerUtils.java index 5441a3fc..34b1a6a2 100644 --- a/src/main/java/io/kamax/mxisd/matrix/IdentityServerUtils.java +++ b/src/main/java/io/kamax/mxisd/matrix/IdentityServerUtils.java @@ -21,7 +21,7 @@ // FIXME placeholder, this must go in matrix-java-sdk for 1.0 public class IdentityServerUtils { - public static final String THREEPID_TEST_MEDIUM = "threepids/email"; + public static final String THREEPID_TEST_MEDIUM = "email"; public static final String THREEPID_TEST_ADDRESS = "mxisd-email-forever-unknown@forever-invalid.kamax.io"; private static Logger log = LoggerFactory.getLogger(IdentityServerUtils.class);