Finish implementing signup api backend

Author: MaKleSoft

Diff for: api.py

@@ -1,14 +1,20 @@
+import sha
+import datetime
+from random import random
+import pytz
 from tastypie.resources import ModelResource, ALL, 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 BasicAuthentication, Authentication, ApiKeyAuthentication
-from handball.authorization import ManagerAuthorization
+from tastypie.authentication import Authentication, ApiKeyAuthentication
 from django.contrib.auth import authenticate
-from django.http import HttpResponse, HttpResponseRedirect, HttpResponseNotFound, HttpResponseBadRequest
+from django.core.mail import send_mail
+from django.http import HttpResponse, HttpResponseNotFound, HttpResponseBadRequest
 from tastypie.serializers import Serializer
 from tastypie.utils.mime import determine_format
+from django.utils.translation import ugettext as _
 
 
 class UnionResource(ModelResource):
@@ -162,6 +168,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']
@@ -175,7 +184,7 @@ def sign_up(request):
         zip_code = form.cleaned_data['zip_code']
         mobile_number = form.cleaned_data['mobile_number']
 
-        user = User.objects.create(username=username, password=password, email=email)
+        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(user=user)
         profile.first_name = first_name
@@ -186,7 +195,6 @@ def sign_up(request):
         profile.city = city
         profile.zip_code = zip_code
         profile.mobile_number = mobile_number
-        profile.save()
 
         # Build the activation key
         salt = sha.new(str(random())).hexdigest()[:5]
@@ -195,21 +203,32 @@ def sign_up(request):
 
         # User is unactive until visiting activation link
         user.is_active = False
-        user_profile.activation_key = activation_key
-        user_profile.key_expires = key_expires
-        activation_link = 'http://127.0.0.1/activate/' + activation_key
+        profile.activation_key = activation_key
+        profile.key_expires = key_expires
+        activation_link = 'http://127.0.0.1:8000/auth/activate/' + activation_key
 
         user.save()
-        user_profile.save()
+        profile.save()
 
-        from django.core.mail import send_mail
         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)
 
-    return HttpResponse()
+        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):

Diff for: forms.py

@@ -9,17 +9,17 @@ class SignUpForm(forms.Form):
     email = forms.EmailField(label=_('Email'), required=True)
     password = forms.CharField(widget=forms.PasswordInput,
         label=_('Password'), required=True)
-    password_repeat = forms.CharField(widget=forms.PasswordInput,
-        label=_('Repeat Password'), required=True)
+    # password_repeat = forms.CharField(widget=forms.PasswordInput,
+    #     label=_('Repeat Password'), required=True)
 
     gender = forms.ChoiceField(choices=(('male', _('male')), ('female', _('female'))))
     first_name = forms.CharField(label=_('First Name'), required=True)
     last_name = forms.CharField(label=_('Last Name'), required=True)
-    pass_number = forms.CharField(label=_('Pass Number'))
-    address = forms.CharField(label=_('Address'))
-    city = forms.CharField(label=_('City'))
-    zip_code = forms.CharField(label=_('Zip Code'))
-    mobile_number = forms.CharField(label=_('Mobile Number'))
+    pass_number = forms.IntegerField(label=_('Pass Number'), required=False)
+    address = forms.CharField(label=_('Address'), required=False)
+    city = forms.CharField(label=_('City'), required=False)
+    zip_code = forms.IntegerField(label=_('Zip Code'), required=False)
+    mobile_number = forms.CharField(label=_('Mobile Number'), required=False)
 
     profile = forms.ModelChoiceField(required=False,
         queryset=Person.objects.filter(first_name=first_name).filter(last_name=last_name).filter(user__isnull=True))
@@ -50,18 +50,18 @@ def clean_pass_number(self):
         raise forms.ValidationError(
             _('A player with this pass number is already registered.'))
 
-    def clean(self):
-        cleaned_data = super(SignUpForm, self).clean()
-        password = cleaned_data.get('password')
-        password_repeat = cleaned_data.get('password_repeat')
+    # def clean(self):
+    #     cleaned_data = super(SignUpForm, self).clean()
+    #     password = cleaned_data.get('password')
+    #     password_repeat = cleaned_data.get('password_repeat')
 
-        # check if passwords match
-        if password and password_repeat and password != password_repeat:
-            msg = _('The passwords do not match!')
-            self._errors['password'] = self.error_class([msg])
-            self._errors['password_repeat'] = self.error_class([msg])
+    #     # check if passwords match
+    #     if password and password_repeat and password != password_repeat:
+    #         msg = _('The passwords do not match!')
+    #         self._errors['password'] = self.error_class([msg])
+    #         self._errors['password_repeat'] = self.error_class([msg])
 
-            del cleaned_data['password']
-            del cleaned_data['password_repeat']
+    #         del cleaned_data['password']
+    #         del cleaned_data['password_repeat']
 
-        return cleaned_data
+    #     return cleaned_data

Diff for: urls.py

@@ -24,6 +24,6 @@
 # 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/auth/unique/$', 'is_unique'),
+    (r'^api/v1/auth/signup/$', 'sign_up')
 )

Diff for: views.py

@@ -1,5 +1,4 @@
 import sha
-import base64
 import datetime
 import pytz
 from random import random