Enchanced profile management (#68)

* Proof of concept of adding 3PIDs data to user profile
* Document reverse proxy apache config
* Support for Matrix Gateway project roles' endpoint
* Fix conflicting ThreePid object defined in SDK and mxisd projects
This commit is contained in:
Max Dor
2018-03-25 01:20:59 +01:00
committed by GitHub
parent 3fc86465f8
commit a9627121fa
31 changed files with 413 additions and 112 deletions

View File

@@ -20,7 +20,7 @@
package io.kamax.mxisd.threepid.session;
import io.kamax.mxisd.ThreePid;
import io.kamax.matrix.ThreePid;
import io.kamax.mxisd.exception.BadRequestException;
import io.kamax.mxisd.exception.InvalidCredentialsException;
import io.kamax.mxisd.storage.dao.IThreePidSessionDao;
@@ -76,7 +76,7 @@ public class ThreePidSession implements IThreePidSession {
public ThreePidSession(String id, String server, ThreePid tPid, String secret, int attempt, String nextLink, String token) {
this.id = id;
this.server = server;
this.tPid = new ThreePid(tPid);
this.tPid = new ThreePid(tPid.getMedium(), tPid.getAddress());
this.secret = secret;
this.attempt = attempt;
this.nextLink = nextLink;