Add /account/3pid/delete endpoint #1714

Merged
merged 1 commit into from Dec 21, 2016

Projects

None yet

3 participants

@dbkr
Member
dbkr commented Dec 20, 2016

Also fix a typo in a comment

@dbkr dbkr Add /account/3pid/delete endpoint
Also fix a typo in a comment
0c88ab1
@NegativeMjark NegativeMjark was assigned by dbkr Dec 20, 2016
@@ -617,6 +617,17 @@ def add_threepid(self, user_id, medium, address, validated_at):
self.hs.get_clock().time_msec()
)
+ @defer.inlineCallbacks
@ara4n
ara4n Dec 20, 2016 Member

might be nice to fix the s/presenc e/presence/ typo on line 610

@dbkr
dbkr Dec 21, 2016 Member

Fixed, although accidentally on develop.

@@ -617,6 +617,17 @@ def add_threepid(self, user_id, medium, address, validated_at):
self.hs.get_clock().time_msec()
)
+ @defer.inlineCallbacks
+ def delete_threepid(self, user_id, medium, address):
+ # 'Canonicalise' email addresses as per above
@ara4n
ara4n Dec 20, 2016 Member

you're going to hate me for asking this, but: should we be canonicalising MSISDNs here? or are we assuming the client has already determined normal form? (If so, a comment would be useful)

@dbkr
dbkr Dec 21, 2016 Member

In this case, the msisdn canonicalisation will have been done by the ID server (or the thing doing the verification). In fact, with us now having decided to have a separate thing to do the actual validation of 3pids, the email canonicalisation would go there too (it's a bit tricky for email given that squelching the localpart down to lowercase is not technically valid).

@ara4n ara4n assigned ara4n and unassigned NegativeMjark Dec 20, 2016
@ara4n
Member
ara4n commented Dec 20, 2016

lgtm other than 2 comments

@ara4n ara4n assigned dbkr and unassigned ara4n Dec 20, 2016
@dbkr dbkr merged commit bea15fb into develop Dec 21, 2016

6 of 8 checks passed

Sytest Dendron (Commit) Build #1269 origin/dbkr/delete_threepid failed in 1 min 14 sec
Details
Sytest Dendron (Merged PR) Build finished.
Details
Sytest Postgres (Commit) Build #2112 origin/dbkr/delete_threepid succeeded in 8 min 24 sec
Details
Sytest Postgres (Merged PR) Build finished.
Details
Sytest SQLite (Commit) Build #2154 origin/dbkr/delete_threepid succeeded in 7 min 2 sec
Details
Sytest SQLite (Merged PR) Build finished.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
@dbkr dbkr added a commit to matrix-org/matrix-js-sdk that referenced this pull request Dec 21, 2016
@dbkr dbkr Add API to delete threepid 582576b
@dbkr dbkr referenced this pull request in matrix-org/matrix-js-sdk Dec 21, 2016
Merged

Add API to delete threepid #312

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment