From 212e000c6540589cd2360350fbac032c754999fb Mon Sep 17 00:00:00 2001
From: amercader <amercadero@gmail.com>
Date: Thu, 15 Aug 2013 18:24:43 +0100
Subject: [PATCH] [#1184] Update user checks in package create and update auth
 functions

The `auth_is_registered_user` function's name is misleading, as it only checks
if there is a user on the Pylons context object (ie if it is logged in).
It has been renamed to `auth_is_loggedin_user`, keeping the old as
deprecated. The function is not used anymore on the auth functions, as
the user should be always present in the context dict passed to the
functions (The controller sets context['user'] to c.user).

Conflicts:

	ckan/new_authz.py
---
 ckan/logic/auth/create.py |  4 ++--
 ckan/logic/auth/update.py |  2 +-
 ckan/new_authz.py         | 11 +++++++++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ckan/logic/auth/create.py b/ckan/logic/auth/create.py
index b7c8860c7a6..dd102083591 100644
--- a/ckan/logic/auth/create.py
+++ b/ckan/logic/auth/create.py
@@ -6,7 +6,7 @@
 
 def package_create(context, data_dict=None):
     user = context['user']
-    if not new_authz.auth_is_registered_user() and not user:
+    if not user:
         check1 = new_authz.check_config_permission('anon_create_dataset')
     else:
         check1 = new_authz.check_config_permission('create_dataset_if_not_in_organization') \
@@ -31,7 +31,7 @@ def package_create(context, data_dict=None):
 
 def file_upload(context, data_dict=None):
     user = context['user']
-    if not new_authz.auth_is_registered_user():
+    if not user:
         return {'success': False, 'msg': _('User %s not authorized to create packages') % user}
     return {'success': True}
 
diff --git a/ckan/logic/auth/update.py b/ckan/logic/auth/update.py
index 59ec935a52a..c5865549007 100644
--- a/ckan/logic/auth/update.py
+++ b/ckan/logic/auth/update.py
@@ -23,7 +23,7 @@ def package_update(context, data_dict):
         )
     else:
         # If dataset is not owned then we can edit if config permissions allow
-        if new_authz.auth_is_registered_user():
+        if user:
             check1 = new_authz.check_config_permission(
                 'create_dataset_if_not_in_organization')
         else:
diff --git a/ckan/new_authz.py b/ckan/new_authz.py
index 1d391c50900..d1ac6b1d4e4 100644
--- a/ckan/new_authz.py
+++ b/ckan/new_authz.py
@@ -9,6 +9,8 @@
 import ckan.model as model
 from ckan.common import OrderedDict, _, c
 
+import ckan.lib.maintain as maintain
+
 log = getLogger(__name__)
 
 # This is a private cache used by get_auth_function() and should never
@@ -297,9 +299,14 @@ def check_config_permission(permission):
         return CONFIG_PERMISSIONS[permission]
     return False
 
-
-
+@maintain.deprecated('Use auth_is_loggedin_user instead')
 def auth_is_registered_user():
+    '''
+    This function is deprecated, please use the auth_is_loggedin_user instead
+    '''
+    return auth_is_loggedin_user()
+
+def auth_is_loggedin_user():
     ''' Do we have a logged in user '''
     try:
         context_user = c.user