Merge lp:~cjwatson/turnip/turnipcake-auth-uid into lp:~canonical-launchpad-branches/turnip/turnipcake

[Colin Watson]

Return user.id as an additional dict entry from authenticateWithPassword; require user ID rather than name in translatePath.

Return user.id as an additional dict entry from authenticateWithPassword; require user ID rather than name in translatePath.

This is an incompatible API change, and goes together with https://code.launchpad.net/~cjwatson/turnip/auth-uid/+merge/248420.

[William Grant (wgrant)]

review: Approve

=== modified file 'turnipcake/views.py'
--- turnipcake/views.py	2014-12-11 07:47:21 +0000
+++ turnipcake/views.py	2015-02-03 17:13:13 +0000
@@ -108,7 +108,7 @@
 
 
 @xmlrpc_method(endpoint='githosting')
-def translatePath(request, path, permission, authenticated_user,
+def translatePath(request, path, permission, authenticated_uid,
                   can_authenticate):
     try:
         repo = DBSession.query(Repo).filter(
@@ -116,10 +116,10 @@
     except NoResultFound:
         raise xmlrpclib.Fault(1, "Repo does not exist")
 
-    writable = authenticated_user == repo.owner.name
+    writable = authenticated_uid == repo.owner_id
 
     if permission != b'read' and not writable:
-        if not can_authenticate or authenticated_user is not None:
+        if not can_authenticate or authenticated_uid is not None:
             raise xmlrpclib.Fault(2, "Repo is read-only")
         else:
             raise xmlrpclib.Fault(3, "Authorisation required")
@@ -135,4 +135,4 @@
         raise xmlrpclib.Fault(3, "Invalid username or password")
     if password != user.password:
         raise xmlrpclib.Fault(3, "Invalid username or password")
-    return {'user': username}
+    return {'user': username, 'uid': user.id}