Added more stuff and multiple api keys

This commit is contained in:
Raynaldo Rivera
2014-10-06 02:31:23 -07:00
parent 7521d9fc4d
commit eacb3d03b8
15 changed files with 176 additions and 147 deletions

View File

@@ -3,6 +3,6 @@ from django import forms
class RegistrationForm(forms.Form):
username = forms.CharField(max_length=16, required = True)
password = forms.CharField(widget=forms.PasswordInput())
email = forms.CharField(max_length=254, required = True)
api_id = forms.CharField(max_length=254, required = True)
email = forms.CharField(max_length=254, required = True)
api_id = forms.CharField(max_length=254, required = True)
api_key = forms.CharField(max_length=254, required = True)

View File

@@ -2,7 +2,7 @@ from django.http import Http404,HttpResponseRedirect
from django.shortcuts import render_to_response, render
from django.template import RequestContext
from authentication.models import AllianceUserManager
from evespecific.managers import EveCharacterManager
from evespecific.managers import EveManager
from services.eveapi_manager import EveApiManager
from forms import RegistrationForm
@@ -10,7 +10,7 @@ from forms import RegistrationForm
def register(request):
api = EveApiManager()
charmanager = EveCharacterManager()
evemanager = EveManager()
if request.method == 'POST':
form = RegistrationForm(request.POST)
@@ -18,18 +18,18 @@ def register(request):
if form.is_valid():
usermanager = AllianceUserManager()
if not usermanager.check_if_user_exist_by_name(form.cleaned_data['username']):
user = usermanager.create_user_withapi(
user = usermanager.create_user(
form.cleaned_data['username'],
form.cleaned_data['email'],
form.cleaned_data['password'],
form.cleaned_data['api_id'],
form.cleaned_data['api_key']
form.cleaned_data['password']
)
# Populate character data
# Create api key object
evemanager.create_api_keypair(form.cleaned_data['api_id'], form.cleaned_data['api_key'], user)
# Populate character data
characters = api.get_characters_from_api(form.cleaned_data['api_id'], form.cleaned_data['api_key'])
charmanager.create_characters_from_list(characters, user)
evemanager.create_characters_from_list(characters, user, form.cleaned_data['api_id'])
return HttpResponseRedirect("/dashboard")
else: