summary refs log tree commit diff
path: root/synapse/api/auth.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-07-06 14:33:14 +0100
committerGitHub <noreply@github.com>2017-07-06 14:33:14 +0100
commited9a7f5436e1a8e5a301e8d4f667f3a22d4b028f (patch)
tree7b741de4707c9da52abf654b525ebe8e44362c24 /synapse/api/auth.py
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
parentSerialize user ip command as json (diff)
downloadsynapse-ed9a7f5436e1a8e5a301e8d4f667f3a22d4b028f.tar.xz
Merge pull request #2309 from matrix-org/erikj/user_ip_repl
Fix up user_ip replication commands
Diffstat (limited to 'synapse/api/auth.py')
-rw-r--r--synapse/api/auth.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/api/auth.py b/synapse/api/auth.py
index f8266d1c81..e3da45b416 100644
--- a/synapse/api/auth.py
+++ b/synapse/api/auth.py
@@ -209,7 +209,7 @@ class Auth(object):
             )[0]
             if user and access_token and ip_addr:
                 self.store.insert_client_ip(
-                    user=user,
+                    user_id=user.to_string(),
                     access_token=access_token,
                     ip=ip_addr,
                     user_agent=user_agent,