Separate user profile from handball profile; move outside of handball app into new app

Author: MaKleSoft

api.py

@@ -1,20 +1,13 @@
-import sha
-import datetime
-from random import random
-import pytz
-from tastypie.resources import ModelResource, ALL, ALL_WITH_RELATIONS
+from tastypie.resources import ModelResource, ALL_WITH_RELATIONS
 from tastypie import fields
 from handball.models import *
-from handball.forms import SignUpForm
 from django.contrib.auth.models import User
 from tastypie.authorization import DjangoAuthorization, Authorization
 from tastypie.authentication import Authentication, ApiKeyAuthentication
-from django.contrib.auth import authenticate
-from django.core.mail import send_mail
-from django.http import HttpResponse, HttpResponseNotFound, HttpResponseBadRequest
+from django.http import HttpResponse, HttpResponseBadRequest
 from tastypie.serializers import Serializer
 from tastypie.utils.mime import determine_format
-from django.utils.translation import ugettext as _
+from auth.api import UserResource
 
 
 class UnionResource(ModelResource):
@@ -101,16 +94,8 @@ def dehydrate(self, bundle):
         return bundle
 
 
-class UserResource(ModelResource):
-    person = fields.OneToOneField('handball.api.PersonResource', 'person', full=True)
-
-    class Meta:
-        queryset = User.objects.all()
-        excludes = ['email', 'password']
-
-
 class PersonResource(ModelResource):
-    user = fields.ForeignKey(UserResource, 'user', blank=True, null=True)
+    user = fields.OneToOneField(UserResource, 'user', blank=True, null=True)
     clubs = fields.ManyToManyField(ClubResource, 'clubs')
     # teams = fields.ManyToManyField(TeamResource, 'teams')
 
@@ -192,145 +177,9 @@ class Meta:
 """
 
 
-def sign_up(request):
-    form = SignUpForm(request.POST)
-    serializer = Serializer()
-    format = determine_format(request, serializer, default_format='application/json')
-
-    if form.is_valid():
-        username = form.cleaned_data['username']
-        password = form.cleaned_data['password']
-        email = form.cleaned_data['email']
-        first_name = form.cleaned_data['first_name']
-        last_name = form.cleaned_data['last_name']
-        # gender = form.cleaned_data['gender']
-        # pass_number = form.cleaned_data['pass_number']
-        # address = form.cleaned_data['address']
-        # city = form.cleaned_data['city']
-        # zip_code = form.cleaned_data['zip_code']
-        # mobile_number = form.cleaned_data['mobile_number']
-
-        user = User.objects.create(username=username, password=password, first_name=first_name, last_name=last_name, email=email)
-
-        profile = form.cleaned_data['profile'] or Person.objects.create()
-        profile.first_name = first_name
-        profile.last_name = last_name
-        # profile.gender = gender
-        # profile.pass_number = pass_number
-        # profile.address = address
-        # profile.city = city
-        # profile.zip_code = zip_code
-        # profile.mobile_number = mobile_number
-        profile.user = user
-
-        # Build the activation key
-        salt = sha.new(str(random())).hexdigest()[:5]
-        activation_key = sha.new(salt + user.username).hexdigest()
-        key_expires = datetime.datetime.now(pytz.utc) + datetime.timedelta(2)
-
-        # User is unactive until visiting activation link
-        user.is_active = False
-        profile.activation_key = activation_key
-        profile.key_expires = key_expires
-        activation_link = 'http://127.0.0.1:8000/auth/activate/' + activation_key
-
-        user.save()
-        profile.save()
-
-        subject = _('Welcome to ScoreIt!')
-        message = _('To activate, please click the following link:\n' + activation_link)
-        sender = _('noreply@score-it.de')
-        recipients = [email]
-        send_mail(subject, message, sender, recipients)
-
-        user_resource = UserResource()
-        person_resource = PersonResource()
-
-        data = {
-            'user': user_resource.get_resource_uri(user),
-            'profile': person_resource.get_resource_uri(profile),
-            'activation_key': activation_key
-        }
-
-        return HttpResponse(serializer.serialize(data, format, {}))
-
-    else:
-        return HttpResponseBadRequest(serializer.serialize(form.errors, format, {}))
-
-
-def validate_user(request):
-    """
-    Checks a user's basic auth credentials and, if valid, returns the users data
-    """
-
-    # if not request.META.get('HTTP_AUTHORIZATION'):
-    #     return HttpResponseBadRequest('No HTTP_AUTHORIZATION header found')
-
-    # try:
-    #     (auth_type, data) = request.META['HTTP_AUTHORIZATION'].split()
-    #     if auth_type.lower() != 'basic':
-    #         return HttpResponseBadRequest('Wrong auth type. Use basic auth!')
-    #     user_pass = base64.b64decode(data)
-    # except:
-    #     return HttpResponseBadRequest('Could not decode auth credentials.')
-
-    # bits = user_pass.split(':', 1)
-
-    # if len(bits) != 2:
-    #     return HttpResponseBadRequest('Could not decode auth credentials.')
-
-    # user = authenticate(username=bits[0], password=bits[1])
-
-    username = request.POST['username']
-    password = request.POST['password']
-
-    if not username or not password:
-        return HttpResponseBadRequest()
-
-    user = authenticate(username=username, password=password)
-
-    if user is None or not user.is_active:
-        return HttpResponseNotFound('User does not exist or password incorrect.')
-
-    person = user.get_profile()
-
-    person_resource = PersonResource()
-    bundle = person_resource.build_bundle(obj=person, request=request)
-    person_resource.full_dehydrate(bundle)
-    bundle.data['api_key'] = user.api_key.key
-
-    return HttpResponse(person_resource.serialize(None, bundle, 'application/json'))
-
-
 def is_unique(request):
     data = {}
 
-    if 'user_name' in request.GET:
-        user_name = request.GET['user_name']
-
-        try:
-            User.objects.get(username=user_name)
-            unique = False
-        except User.DoesNotExist:
-            unique = True
-        except User.MultipleObjectsReturned:
-            unique = False
-
-        data['user_name'] = unique
-
-    if 'email' in request.GET:
-        email = request.GET['email']
-
-        try:
-            User.objects.get(email=email)
-            unique = False
-        except User.DoesNotExist:
-            unique = True
-        except User.MultipleObjectsReturned:
-            unique = False
-
-        data['email'] = unique
-
     if 'pass_number' in request.GET:
         pass_number = request.GET['pass_number']
 

forms.py

@@ -8,13 +8,9 @@
 
 
 class Person(models.Model):
-    user = models.OneToOneField(User, blank=True, null=True)
+    user = models.OneToOneField(User, blank=True, null=True, related_name='handball_profile')
     clubs = models.ManyToManyField('Club', related_name='members', blank=False)
 
-    # Fields used for user activation after signup
-    activation_key = models.CharField(max_length=40, blank=True)
-    key_expires = models.DateTimeField(null=True, blank=True)
-
     first_name = models.CharField(max_length=50)
     last_name = models.CharField(max_length=50)
     address = models.CharField(max_length=50, blank=True)
@@ -178,12 +174,6 @@ def __unicode__(self):
         return self.name
 
 
-def create_user_profile(sender, instance, created, **kwargs):
-    # Create user profile for user after creation
-    if created:
-        Person.objects.create(user=instance, first_name=instance.first_name, last_name=instance.last_name)
-
-
 def create_default_leagues(sender, instance, created, **kwargs):
     # Create defaults leagues for District after creation
     if created:
@@ -198,7 +188,6 @@ def set_union_by_district(sender, instance, **kwargs):
     if instance.district:
         instance.union = instance.district.union
 
-# post_save.connect(create_user_profile, sender=User)
 
 # Create API key for a new user
 post_save.connect(create_api_key, sender=User)

models.py

@@ -1,16 +1,8 @@
-"""
-This file demonstrates writing tests using the unittest module. These will pass
-when you run "manage.py test".
+from tastypie.test import ResourceTestCase
 
-Replace this with more appropriate tests for your application.
-"""
 
-from django.test import TestCase
+class UnionResourceTest(ResourceTestCase):
+    fixtures = ['testdump.json']
 
-
-class SimpleTest(TestCase):
-    def test_basic_addition(self):
-        """
-        Tests that 1 + 1 always equals 2.
-        """
-        self.assertEqual(1 + 1, 2)
+    def test_get_list_unauthorzied(self):
+        self.assertHttpUnauthorized(self.api_client.get('/api/v1/unions/', format='json'))

tests.py

@@ -7,24 +7,18 @@
 v1_api.register(UnionResource())
 v1_api.register(ClubResource())
 v1_api.register(TeamResource())
-v1_api.register(UserResource())
 v1_api.register(PersonResource())
 v1_api.register(GameResource())
 v1_api.register(LeagueResource())
 v1_api.register(DistrictResource())
 
 urlpatterns = patterns('handball.views',
-    (r'^$', 'index'),
-    (r'^auth/signup/$', 'sign_up'),
-    (r'^auth/activate/([abcdef0123456789]+)$', 'activate'),
-    (r'^thanks/$', 'thanks')
+    (r'^$', 'index')
 )
 
 urlpatterns += patterns('', (r'^api/', include(v1_api.urls)))
 
 # Non-resource api endpoints
 urlpatterns += patterns('handball.api',
-    (r'^api/v1/auth/validate/$', 'validate_user'),
-    (r'^api/v1/auth/unique/$', 'is_unique'),
-    (r'^api/v1/auth/signup/$', 'sign_up')
+    (r'^api/v1/unique/$', 'is_unique'),
 )