Merge pull request #1296 from akvo/1289_tastypie_auth

1289 tastypie auth

akvo/api/authentication.py

@@ -5,13 +5,9 @@
 # For additional details on the GNU license please see < http://www.gnu.org/licenses/agpl.html >.
 
 from django.contrib.auth import get_user_model
-from django.contrib.contenttypes.models import ContentType
 
 from tastypie.authentication import ApiKeyAuthentication
-from tastypie.http import HttpUnauthorized
 
-#from models import AkvoApiKey
-from akvo.rsr.models import Organisation
 
 class ConditionalApiKeyAuthentication(ApiKeyAuthentication):
     """ Allows for requiring API key authentication only for selected request methods

akvo/api/resources/user.py

@@ -45,7 +45,10 @@ def dehydrate(self, bundle):
         """
         bundle = super(UserResource, self).dehydrate(bundle)
         if self._meta.authentication.is_authenticated(bundle.request):
-            organisations = bundle.request.user.organisations.all()
+            try:
+                organisations = bundle.request.user.organisations.all()
+            except:
+                organisations = []
 
             # find out if the user has a profile that's associated with the API key owner org
             profile = get_user_model().objects.filter(organisations__in=organisations, id=bundle.obj.id)