Skip to content

Commit

Permalink
check len username < 30
Browse files Browse the repository at this point in the history
  • Loading branch information
TheElmo committed Jul 3, 2018
1 parent be3df08 commit b0df9d8
Show file tree
Hide file tree
Showing 3 changed files with 77 additions and 53 deletions.
98 changes: 51 additions & 47 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions api/migrations/0018_auto_20180702_2001.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 2.0.5 on 2018-07-02 18:01

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('api', '0017_language_short_name'),
]

operations = [
migrations.AlterField(
model_name='subscription',
name='last_accessed',
field=models.DateTimeField(auto_now=True),
),
]
14 changes: 8 additions & 6 deletions api/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,8 @@ def create_user(request):
return JsonResponse({'error': 'E-mail is already in user'})
except ObjectDoesNotExist:
try:
if len(data['name']) > 30:
return JsonResponse({'error': 'Username is too long'})
salt = bcrypt.gensalt(14)
user = User(email=data['email'],
name=data['name'],
Expand Down Expand Up @@ -175,7 +177,7 @@ def get_popular_courses(request):
return HttpResponseForbidden()

if 'lang' in data:
HttpResponse('test');
HttpResponse('test')
else:
courses = Course.objects.filter(public=1).order_by('-subscribers')[:10]
return get_json_response(serializers.serialize('json', courses))
Expand All @@ -187,7 +189,7 @@ def get_newest_courses(request):
return HttpResponseForbidden()

if 'lang' in data:
HttpResponse('test');
HttpResponse('test')
else:
courses = Course.objects.filter(public=1).order_by('-created_at')[:10]
return get_json_response(serializers.serialize('json', courses))
Expand Down Expand Up @@ -303,8 +305,8 @@ def update_course(request):
course.public = data['is_public']
course.save()
except ObjectDoesNotExist:
return HttpResponse('false');
return HttpResponse('true');
return HttpResponse('false')
return HttpResponse('true')


def edit_course_lang(request, course_id):
Expand Down Expand Up @@ -359,7 +361,7 @@ def update_activity(request):
subscription.save()
except ObjectDoesNotExist:
pass
return HttpResponse("");
return HttpResponse("")

def get_last_accessed(request):
data = parse_params(request)
Expand All @@ -380,7 +382,7 @@ def get_last_accessed(request):
'native_lang' : subscription.course.native_lang.pk,
'public' : subscription.course.public
})
return JsonResponse(courses, safe=False);
return JsonResponse(courses, safe=False)

# Lessons
def get_lesson_types(request):
Expand Down

0 comments on commit b0df9d8

Please sign in to comment.