Merge pull request #63 from washort/custom-user-model

Switch to custom user model (bug 558514)
mozilla · May 5, 2014 · 3df883d · 3df883d
2 parents 54d58b9 + 791b698
commit 3df883d
Show file tree

Hide file tree

Showing 68 changed files with 263 additions and 1,204 deletions.
diff --git a/apps/access/acl.py b/apps/access/acl.py
@@ -98,7 +98,7 @@ def check_addon_ownership(request, addon, viewer=False, dev=False,
     # Support can do support.
     elif support:
         roles += (amo.AUTHOR_ROLE_SUPPORT,)
-    return addon.authors.filter(user=request.amo_user,
+    return addon.authors.filter(pk=request.amo_user.pk,
                                 addonuser__role__in=roles).exists()
 
 

diff --git a/apps/access/middleware.py b/apps/access/middleware.py
@@ -21,19 +21,9 @@ def process_request(self, request):
 
         # figure out our list of groups...
         if request.user.is_authenticated():
-            try:
-                amo_user = RequestUser.objects.get(pk=request.user.pk)
-            except RequestUser.DoesNotExist:
-                log.info('No RequestUser found for: %s' % request.user.pk)
-                request.amo_user = None
-                return
-
-            amo.set_user(amo_user)
-            request.user._profile_cache = request.amo_user = amo_user
-            request.groups = request.amo_user.groups.all()
-
-            if acl.action_allowed(request, 'Admin', '%'):
-                request.user.is_staff = True
+            amo.set_user(request.user)
+            request.groups = request.user.groups.all()
+            request.amo_user = request.user
         else:
             request.amo_user = None
 

diff --git a/apps/access/models.py b/apps/access/models.py
@@ -40,11 +40,6 @@ def groupuser_post_save(sender, instance, **kw):
         return
 
     amo.log(amo.LOG.GROUP_USER_ADDED, instance.group, instance.user)
-
-    if (instance.user.user and
-        instance.user.groups.filter(rules='*:*').exists()):
-        instance.user.user.is_superuser = instance.user.user.is_staff = True
-        instance.user.user.save()
     log.info('Added %s to %s' % (instance.user, instance.group))
 
 
@@ -55,9 +50,4 @@ def groupuser_post_delete(sender, instance, **kw):
         return
 
     amo.log(amo.LOG.GROUP_USER_REMOVED, instance.group, instance.user)
-
-    if (instance.user.user and
-        not instance.user.groups.filter(rules='*:*').exists()):
-        instance.user.user.is_superuser = instance.user.user.is_staff = False
-        instance.user.user.save()
     log.info('Removed %s from %s' % (instance.user, instance.group))
diff --git a/apps/access/tests.py b/apps/access/tests.py
@@ -1,4 +1,3 @@
-from django.contrib.auth.models import User
 from django.http import HttpRequest
 
 import mock
@@ -202,8 +201,6 @@ class TestCheckReviewer(TestCase):
 
     def setUp(self):
         self.user = UserProfile.objects.get()
-        self.user.user = User.objects.get()
-        self.user.save()
 
     def test_no_perm(self):
         req = req_factory_factory('noop', user=self.user)

diff --git a/apps/addons/fixtures/addons/addon_228106_info+dev+bio.json b/apps/addons/fixtures/addons/addon_228106_info+dev+bio.json
@@ -162,24 +162,6 @@
             "created": "2010-10-02 07:22:41"
         }
     },
-    {
-        "pk": 5468632,
-        "model": "auth.user",
-        "fields": {
-            "username": "the-author@nowehere.com",
-            "first_name": "",
-            "last_name": "",
-            "is_active": true,
-            "is_superuser": false,
-            "is_staff": false,
-            "last_login": "2010-09-12 21:57:18",
-            "groups": [],
-            "user_permissions": [],
-            "password": "nope",
-            "email": "the-author@nowehere.com",
-            "date_joined": "2010-09-12 07:19:31"
-        }
-    },
     {
         "pk": 1399510,
         "model": "translations.translation",
@@ -222,7 +204,7 @@
             "modified": "2010-09-12 07:34:47",
             "last_login_ip": "",
             "notifyevents": false,
-            "user": 5468632
+            "last_login": "2010-09-12 07:34:47"
         }
     },
     {

diff --git a/apps/addons/fixtures/addons/addon_228107_multiple-devs.json b/apps/addons/fixtures/addons/addon_228107_multiple-devs.json
@@ -174,42 +174,6 @@
             "created": "2010-10-02 07:22:41"
         }
     },
-    {
-        "pk": 54686910,
-        "model": "auth.user",
-        "fields": {
-            "username": "the-author1@nowehere.com",
-            "first_name": "",
-            "last_name": "",
-            "is_active": true,
-            "is_superuser": false,
-            "is_staff": false,
-            "last_login": "2010-09-12 21:57:18",
-            "groups": [],
-            "user_permissions": [],
-            "password": "nope",
-            "email": "the-author1@nowehere.com",
-            "date_joined": "2010-09-12 07:19:31"
-        }
-    },
-    {
-        "pk": 54686911,
-        "model": "auth.user",
-        "fields": {
-            "username": "the-author2@nowehere.com",
-            "first_name": "",
-            "last_name": "",
-            "is_active": true,
-            "is_superuser": false,
-            "is_staff": false,
-            "last_login": "2010-09-12 21:57:18",
-            "groups": [],
-            "user_permissions": [],
-            "password": "nope",
-            "email": "the-author2@nowehere.com",
-            "date_joined": "2010-09-12 07:19:31"
-        }
-    },
     {
         "pk": 1399511,
         "model": "translations.translation",
@@ -264,7 +228,7 @@
             "modified": "2010-09-12 07:34:47",
             "last_login_ip": "",
             "notifyevents": false,
-            "user": 54686910
+            "last_login": "2010-09-12 07:34:47"
         }
     },
     {
@@ -297,7 +261,7 @@
             "modified": "2010-09-12 07:34:47",
             "last_login_ip": "",
             "notifyevents": false,
-            "user": 54686911
+            "last_login": "2010-09-12 07:34:47"
         }
     },
     {

diff --git a/apps/addons/templates/addons/impala/review_add_box.html b/apps/addons/templates/addons/impala/review_add_box.html
@@ -1,6 +1,6 @@
 <div id="review-add-box" class="modal">
 {# TODO(jbalogh): make this a global fix: bug 551748 #}
-{% set amo_user = user.get_profile() if user.is_authenticated() else None %}
+{% set amo_user = user if user.is_authenticated() else None %}
 {% if addon.can_review(amo_user) %}
   <a class="close" href="#">{{ _('close') }}</a>
   <h2>{{ _('What do you think?') }}</h2>

diff --git a/apps/addons/templates/addons/review_add_box.html b/apps/addons/templates/addons/review_add_box.html
@@ -1,5 +1,5 @@
 {# TODO(jbalogh): make this a global fix: bug 551748 #}
-{% set amo_user = user.get_profile() if user.is_authenticated() else None %}
+{% set amo_user = user if user.is_authenticated() else None %}
 {% if not addon.has_author(amo_user) %}
   <h3>{{ _('What do you think?') }}</h3>
   <div id="review-box" class="highlight">

diff --git a/apps/addons/tests/test_commands.py b/apps/addons/tests/test_commands.py
diff --git a/apps/amo/context_processors.py b/apps/amo/context_processors.py
@@ -55,9 +55,9 @@ def global_settings(request):
     tools_title = _('Tools')
     is_reviewer = False
 
-    if request.user.is_authenticated() and hasattr(request, 'amo_user'):
+    if request.user.is_authenticated():
         amo_user = request.amo_user
-        profile = request.user.get_profile()
+        profile = request.user
         is_reviewer = acl.check_reviewer(request)
 
         account_links.append({'text': _('My Profile'),

diff --git a/apps/amo/fixtures/base/addon_10423_youtubesearch.json b/apps/amo/fixtures/base/addon_10423_youtubesearch.json
@@ -194,7 +194,7 @@
             "modified": "2009-01-19 15:19:53",
             "last_login_ip": "",
             "notifyevents": true,
-            "user": null
+            "last_login": "2009-01-19 15:19:53"
         }
     },
     {

diff --git a/apps/amo/fixtures/base/addon_1833_yoono.json b/apps/amo/fixtures/base/addon_1833_yoono.json
@@ -106,24 +106,6 @@
             "datestatuschanged": "2010-03-26 08:22:39"
         }
     },
-    {
-        "pk": 9250,
-        "model": "auth.user",
-        "fields": {
-            "username": "laurent.querel@yoono.com",
-            "first_name": "Yoono",
-            "last_name": "",
-            "is_active": true,
-            "is_superuser": false,
-            "is_staff": false,
-            "last_login": "2010-05-21 05:09:18",
-            "groups": [],
-            "user_permissions": [],
-            "password": "sha512$308d46cdaf22e72f733811461a8ec6f99b6f5ff61f000096f4183009923fecd8$0b7d13e659492aca20eaada963bd2f77152ab83da9bbee750dee1f5b8789059e97a0db57e7ec13840e275932614fad8f805e76cc8411d6c847bcdb6a9e142fb8",
-            "email": "laurent.querel@yoono.com",
-            "date_joined": "2007-03-05 13:09:37"
-        }
-    },
     {
         "pk": 9250,
         "model": "users.userprofile",
@@ -154,7 +136,7 @@
             "modified": "2010-05-12 16:10:49",
             "last_login_ip": "",
             "notifyevents": true,
-            "user": 9250
+            "last_login": "2010-05-12 16:10:49"
         }
     },
     {

diff --git a/apps/amo/fixtures/base/addon_3615.json b/apps/amo/fixtures/base/addon_3615.json
@@ -257,24 +257,6 @@
             "datestatuschanged": "2009-10-21 09:58:40"
         }
     },
-    {
-        "pk": 55021,
-        "model": "auth.user",
-        "fields": {
-            "username": "bookmonkey@yahoo-inc.com",
-            "first_name": "Yahoo!",
-            "last_name": "Inc.",
-            "is_active": true,
-            "is_superuser": false,
-            "is_staff": false,
-            "last_login": "2010-05-20 13:00:37",
-            "groups": [],
-            "user_permissions": [],
-            "password": "",
-            "email": "bookmonkey@yahoo-inc.com",
-            "date_joined": "2007-03-05 13:09:56"
-        }
-    },
     {
         "pk": 55021,
         "model": "users.userprofile",
@@ -292,7 +274,6 @@
             "bio": null,
             "deleted": false,
             "emailhidden": true,
-            "user": 55021,
             "password": "sha512$7b5436061f8c0902088c292c057be69fdb17312e2f71607c9c51641f5d876522$08d1d370d89e2ae92755fd03464a7276ca607c431d04a52d659f7a184f3f9918073637d82fc88981c7099c7c46a1137b9fdeb675304eb98801038905a9ee0600",
             "username": "55021",
             "display_name": "55021 \u0627\u0644\u062a\u0637\u0628",
@@ -302,7 +283,8 @@
             "notes": null,
             "modified": "2010-05-19 16:41:22",
             "notifyevents": true,
-            "read_dev_agreement": "2012-08-20 00:00:00"
+            "read_dev_agreement": "2012-08-20 00:00:00",
+            "last_login": "2010-05-20 13:00:37"
         }
     },
     {

diff --git a/apps/amo/fixtures/base/addon_3723_listed.json b/apps/amo/fixtures/base/addon_3723_listed.json
@@ -74,24 +74,6 @@
             "addon": 3723
         }
     },
-    {
-        "pk": 8735,
-        "model": "auth.user",
-        "fields": {
-            "username": "orangefaced@gmail.com",
-            "first_name": "kozakura",
-            "last_name": "",
-            "is_active": true,
-            "is_superuser": false,
-            "is_staff": false,
-            "last_login": "2010-05-23 00:37:12",
-            "groups": [],
-            "user_permissions": [],
-            "password": "",
-            "email": "orangefaced@gmail.com",
-            "date_joined": "2007-03-05 13:09:37"
-        }
-    },
     {
         "pk": 8735,
         "model": "users.userprofile",
@@ -109,7 +91,6 @@
             "bio": null,
             "deleted": false,
             "emailhidden": true,
-            "user": 8735,
             "password": "",
             "username": "8735",
             "display_name": "8735 \u0627\u0644\u062a\u0637\u0628",
@@ -118,6 +99,7 @@
             "created": "2007-03-05 13:09:37",
             "notes": null,
             "modified": "2010-05-11 00:11:05",
+            "last_login": "2010-05-11 00:11:05",
             "notifyevents": false
         }
     },