Fix regression due to bad replace

kamax-matrix · Oct 1, 2017 · c702a34 · c702a34
1 parent 786e4a8
commit c702a34
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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<String> findIdentityServerForDomain(String domain) {
 
     @Override
     public Optional<SingleLookupReply> 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<ThreePidMapping> populate(List<ThreePidMapping> mappings) {
         Map<String, List<ThreePidMapping>> 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
@@ -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);