From 5bd8842c4b9729a9e1528e7932a0380edeea94a0 Mon Sep 17 00:00:00 2001 From: Mateusz Sikora Date: Tue, 14 Oct 2014 16:44:57 +0200 Subject: [PATCH 1/5] draft demo project --- demo/db.sqlite3 | Bin 0 -> 167936 bytes demo/demo/__init__.py | 0 demo/demo/settings.py | 100 ++++++++++++++++++++++++++++++++ demo/demo/urls.py | 12 ++++ demo/demo/wsgi.py | 14 +++++ demo/manage.py | 10 ++++ demo/templates/home.html | 120 +++++++++++++++++++++++++++++++++++++++ 7 files changed, 256 insertions(+) create mode 100644 demo/db.sqlite3 create mode 100644 demo/demo/__init__.py create mode 100644 demo/demo/settings.py create mode 100644 demo/demo/urls.py create mode 100644 demo/demo/wsgi.py create mode 100644 demo/manage.py create mode 100644 demo/templates/home.html diff --git a/demo/db.sqlite3 b/demo/db.sqlite3 new file mode 100644 index 0000000000000000000000000000000000000000..4881c8fbce53d08b4803ac3500dfbb6b5b742fc0 GIT binary patch literal 167936 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 + + + + + + + + + Starter Template for Bootstrap + + + + + + + + + + + + + + + + +
+ + + + +
+
+
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+
+ +
+
+
+
+
+
+
+
E-mail verification
+
+
+ + + + + + + From 5fd7ea5596b302dd0c8b33213eb2eed37d7f474d Mon Sep 17 00:00:00 2001 From: Mateusz Sikora Date: Wed, 15 Oct 2014 17:32:19 +0200 Subject: [PATCH 2/5] update demo project - still not finished --- demo/db.sqlite3 | Bin 167936 -> 172032 bytes demo/demo/settings.py | 7 + demo/demo/urls.py | 11 +- demo/templates/base.html | 96 +++++++++++++ demo/templates/email_verification.html | 9 ++ .../fragments/email_verification_form.html | 17 +++ demo/templates/fragments/login_form.html | 24 ++++ .../password_reset_confirm_form.html | 38 ++++++ .../fragments/password_reset_form.html | 16 +++ demo/templates/fragments/signup_form.html | 38 ++++++ demo/templates/home.html | 127 ++---------------- demo/templates/login.html | 8 ++ demo/templates/password_reset.html | 8 ++ demo/templates/password_reset_confirm.html | 8 ++ demo/templates/signup.html | 23 ++++ docs/api_endpoints.rst | 2 +- rest_auth/registration/urls.py | 2 +- 17 files changed, 311 insertions(+), 123 deletions(-) create mode 100644 demo/templates/base.html create mode 100644 demo/templates/email_verification.html create mode 100644 demo/templates/fragments/email_verification_form.html create mode 100644 demo/templates/fragments/login_form.html create mode 100644 demo/templates/fragments/password_reset_confirm_form.html create mode 100644 demo/templates/fragments/password_reset_form.html create mode 100644 demo/templates/fragments/signup_form.html create mode 100644 demo/templates/login.html create mode 100644 demo/templates/password_reset.html create mode 100644 demo/templates/password_reset_confirm.html create mode 100644 demo/templates/signup.html diff --git a/demo/db.sqlite3 b/demo/db.sqlite3 index 4881c8fbce53d08b4803ac3500dfbb6b5b742fc0..9f5f009b8427e307baf76f36bf7aff6353f43428 100644 GIT binary patch delta 5256 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 MtjX4YWQN5521ZoVZ2$lO delta 680 zcmah_T}V@L6#t*y>&Cs?{hz6+(8_IOW#q@)owcbCvxl@$i?YNXn$z9sru$%D~mE!nC zJR`7-75t;AA>U|HN^ljxh!6<-qk}QuKrEV)qA6eMR9xaTAIkm1l`_okzpS{Fh=h{K zP%LUG(=qiM+(>9J;ZJGTWRajzEygK=%Q%DQu@9Zd(hu|z&C&^)+3K(>c5{zWnQD%) zWgJ~4xQYunjn^=N$FLbUQMEX(dqI`eE<2QS=p}d(y|{)iaS0#d80PSTmT?DWyuJm- zBFttCeS0;@(}FS^>DX7!@p*z_`kJ-~w*_h%Gp-m9@Ocd&^Gg1~(IS@9exg*(zo!|8 zc}B^;3VIm}_R9t{Xfn1cln+~hRfAT@rkPS^Q8whD8Y)yr4nFJT>-S(M1$Gf__LMPgegb(!`52=MEc%qY+m%t|9eFq0kF0rZ6Q@6+2==6vxzJ;%# z*V7*a+f~yF-1!}0XBD=S?f)}VzpsG-O7vJw@G(x}Eo{ST3?ipR{zA85kXW6L23Ku^ xqt@xRHMp8YPgA3-&Mmq<9=EZQX$5(188*xNf5M!?#=lu-(yZgpawBcl`WMPE&{F^a diff --git a/demo/demo/settings.py b/demo/demo/settings.py index 10fc69f..b0b3941 100644 --- a/demo/demo/settings.py +++ b/demo/demo/settings.py @@ -98,3 +98,10 @@ USE_TZ = True STATIC_URL = '/static/' TEMPLATE_DIRS = [os.path.join(BASE_DIR, 'templates')] + +REST_SESSION_LOGIN = False +EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' +SITE_ID = 1 +ACCOUNT_EMAIL_REQUIRED = True +ACCOUNT_AUTHENTICATION_METHOD = 'email' +ACCOUNT_EMAIL_VERIFICATION = 'mandatory' diff --git a/demo/demo/urls.py b/demo/demo/urls.py index 7cdb267..15ac67f 100644 --- a/demo/demo/urls.py +++ b/demo/demo/urls.py @@ -3,9 +3,16 @@ from django.contrib import admin from django.views.generic import TemplateView urlpatterns = patterns('', - # Examples: url(r'^$', TemplateView.as_view(template_name="home.html"), name='home'), - # url(r'^blog/', include('blog.urls')), + url(r'^signup/$', TemplateView.as_view(template_name="signup.html"), name='signup'), + url(r'^email-verification/$', TemplateView.as_view(template_name="email_verification.html"), name='email-verification'), + url(r'^login/$', TemplateView.as_view(template_name="login.html"), name='login'), + url(r'^password-reset/$', TemplateView.as_view(template_name="password_reset.html"), name='password-reset'), + + url(r'^password-reset/confirm/(?P[0-9A-Za-z_\-]+)/(?P[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', + TemplateView.as_view(template_name="password_reset_confirm.html"), + name='password_reset_confirm'), + url(r'^rest-auth/', include('rest_auth.urls')), url(r'^rest-auth/registration/', include('rest_auth.registration.urls')), url(r'^admin/', include(admin.site.urls)), diff --git a/demo/templates/base.html b/demo/templates/base.html new file mode 100644 index 0000000..8d19353 --- /dev/null +++ b/demo/templates/base.html @@ -0,0 +1,96 @@ + + + + + + + + + + Starter Template for Bootstrap + + + + + + + + + + + + + + + + +
+ {% block content %}{% endblock %} +
+ + + + + + {% block script %}{% endblock %} + + diff --git a/demo/templates/email_verification.html b/demo/templates/email_verification.html new file mode 100644 index 0000000..eb49b3e --- /dev/null +++ b/demo/templates/email_verification.html @@ -0,0 +1,9 @@ +{% extends "base.html" %} + +{% block content %} +
+

E-mail verification

+

Paste here a key which was sent in verification email

+ {% include "fragments/email_verification_form.html" %} +
+{% endblock %} diff --git a/demo/templates/fragments/email_verification_form.html b/demo/templates/fragments/email_verification_form.html new file mode 100644 index 0000000..862ef27 --- /dev/null +++ b/demo/templates/fragments/email_verification_form.html @@ -0,0 +1,17 @@ + +
+
+ +
+ +
+
+ +
+
+ +
+
+ +
+
diff --git a/demo/templates/fragments/login_form.html b/demo/templates/fragments/login_form.html new file mode 100644 index 0000000..23eaf29 --- /dev/null +++ b/demo/templates/fragments/login_form.html @@ -0,0 +1,24 @@ + +
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+
+ +
+
+ +
+
diff --git a/demo/templates/fragments/password_reset_confirm_form.html b/demo/templates/fragments/password_reset_confirm_form.html new file mode 100644 index 0000000..61a1d78 --- /dev/null +++ b/demo/templates/fragments/password_reset_confirm_form.html @@ -0,0 +1,38 @@ + +
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+
+ +
+
+ +
+
diff --git a/demo/templates/fragments/password_reset_form.html b/demo/templates/fragments/password_reset_form.html new file mode 100644 index 0000000..acae37e --- /dev/null +++ b/demo/templates/fragments/password_reset_form.html @@ -0,0 +1,16 @@ + +
+
+ +
+ +
+
+ +
+
+ +
+
+
+
diff --git a/demo/templates/fragments/signup_form.html b/demo/templates/fragments/signup_form.html new file mode 100644 index 0000000..335ee64 --- /dev/null +++ b/demo/templates/fragments/signup_form.html @@ -0,0 +1,38 @@ + +
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+
+ +
+
+ +
+
diff --git a/demo/templates/home.html b/demo/templates/home.html index a4107e0..134198a 100644 --- a/demo/templates/home.html +++ b/demo/templates/home.html @@ -1,120 +1,9 @@ - - - - - - - - +{% extends "base.html" %} - Starter Template for Bootstrap - - - - - - - - - - - - - - - - -
- - - - -
-
-
- -
-
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
-
- -
-
-
-
-
-
-
-
E-mail verification
-
-
- - - - - - - +{% block content %} + +
+

django-rest-auth demo

+

Welcome in django-rest-auth demo project!

+
+{% endblock %} diff --git a/demo/templates/login.html b/demo/templates/login.html new file mode 100644 index 0000000..70d8081 --- /dev/null +++ b/demo/templates/login.html @@ -0,0 +1,8 @@ +{% extends "base.html" %} + +{% block content %} +
+

Login

+ {% include "fragments/login_form.html" %} +
+{% endblock %} diff --git a/demo/templates/password_reset.html b/demo/templates/password_reset.html new file mode 100644 index 0000000..9100bee --- /dev/null +++ b/demo/templates/password_reset.html @@ -0,0 +1,8 @@ +{% extends "base.html" %} + +{% block content %} +
+

Password reset

+ {% include "fragments/password_reset_form.html" %} +
+{% endblock %} diff --git a/demo/templates/password_reset_confirm.html b/demo/templates/password_reset_confirm.html new file mode 100644 index 0000000..09c6000 --- /dev/null +++ b/demo/templates/password_reset_confirm.html @@ -0,0 +1,8 @@ +{% extends "base.html" %} + +{% block content %} +
+

Password reset confirmation

+ {% include "fragments/password_reset_confirm_form.html" %} +
+{% endblock %} diff --git a/demo/templates/signup.html b/demo/templates/signup.html new file mode 100644 index 0000000..4c5a909 --- /dev/null +++ b/demo/templates/signup.html @@ -0,0 +1,23 @@ +{% extends "base.html" %} + +{% block content %} +
+

Signup

+ {% include "fragments/signup_form.html" %} +
+{% endblock %} + +{% comment %} +{% block script %} + +{% endblock %} +{% endcomment %} diff --git a/docs/api_endpoints.rst b/docs/api_endpoints.rst index 8ad7001..21cb62f 100644 --- a/docs/api_endpoints.rst +++ b/docs/api_endpoints.rst @@ -60,7 +60,7 @@ Registration See allauth documentation for more details. -- /rest-auth/registration/ (POST) +- /rest-auth/registration/verify-email/ (POST) - key diff --git a/rest_auth/registration/urls.py b/rest_auth/registration/urls.py index 8afadab..f9df934 100644 --- a/rest_auth/registration/urls.py +++ b/rest_auth/registration/urls.py @@ -5,7 +5,7 @@ from .views import Register, VerifyEmail urlpatterns = patterns('', url(r'^$', Register.as_view(), name='rest_register'), - url(r'^verify-email/$', VerifyEmail.as_view(), name='verify_email'), + url(r'^verify-email/$', VerifyEmail.as_view(), name='rest_verify_email'), # These two views are used in django-allauth and empty TemplateView were # defined just to allow reverse() call inside app, for example when email From aac42af9918134117701563f6eb31a6d10aea07c Mon Sep 17 00:00:00 2001 From: Mateusz Sikora Date: Wed, 15 Oct 2014 17:36:21 +0200 Subject: [PATCH 3/5] fix tests --- rest_auth/tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_auth/tests.py b/rest_auth/tests.py index 65671a0..4f66124 100644 --- a/rest_auth/tests.py +++ b/rest_auth/tests.py @@ -154,7 +154,7 @@ class APITestCase1(TestCase, BaseAPITestCase): self.register_url = reverse('rest_register') self.password_reset_url = reverse('rest_password_reset') self.user_url = reverse('rest_user_details') - self.veirfy_email_url = reverse('verify_email') + self.veirfy_email_url = reverse('rest_verify_email') def _login(self): payload = { From 81a96cfe19b40dda27ff5cc7e8e7d3b41d3d9412 Mon Sep 17 00:00:00 2001 From: Mateusz Sikora Date: Thu, 16 Oct 2014 13:13:55 +0200 Subject: [PATCH 4/5] final versio of demo project --- .gitignore | 1 + demo/db.sqlite3 | Bin 172032 -> 0 bytes demo/demo/urls.py | 26 ++++++-- demo/templates/base.html | 18 +++--- demo/templates/email_verification.html | 1 - .../fragments/email_verification_form.html | 3 +- demo/templates/fragments/login_form.html | 2 +- .../fragments/password_change_form.html | 25 ++++++++ .../password_reset_confirm_form.html | 20 +++--- .../fragments/password_reset_form.html | 2 +- demo/templates/fragments/signup_form.html | 2 +- .../fragments/user_details_form.html | 39 ++++++++++++ demo/templates/password_change.html | 39 ++++++++++++ demo/templates/password_reset_confirm.html | 18 ++++++ demo/templates/signup.html | 15 ----- demo/templates/user_details.html | 58 ++++++++++++++++++ 16 files changed, 227 insertions(+), 42 deletions(-) delete mode 100644 demo/db.sqlite3 create mode 100644 demo/templates/fragments/password_change_form.html create mode 100644 demo/templates/fragments/user_details_form.html create mode 100644 demo/templates/password_change.html create mode 100644 demo/templates/user_details.html diff --git a/.gitignore b/.gitignore index 6e5e982..eec873e 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,4 @@ coverage.xml docs/_build/ .DS_Store +db.sqlite3 diff --git a/demo/db.sqlite3 b/demo/db.sqlite3 deleted file mode 100644 index 9f5f009b8427e307baf76f36bf7aff6353f43428..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 172032 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 AX8-^I diff --git a/demo/demo/urls.py b/demo/demo/urls.py index 15ac67f..42b4a88 100644 --- a/demo/demo/urls.py +++ b/demo/demo/urls.py @@ -4,11 +4,29 @@ from django.views.generic import TemplateView urlpatterns = patterns('', url(r'^$', TemplateView.as_view(template_name="home.html"), name='home'), - url(r'^signup/$', TemplateView.as_view(template_name="signup.html"), name='signup'), - url(r'^email-verification/$', TemplateView.as_view(template_name="email_verification.html"), name='email-verification'), - url(r'^login/$', TemplateView.as_view(template_name="login.html"), name='login'), - url(r'^password-reset/$', TemplateView.as_view(template_name="password_reset.html"), name='password-reset'), + url(r'^signup/$', TemplateView.as_view(template_name="signup.html"), + name='signup'), + url(r'^email-verification/$', + TemplateView.as_view(template_name="email_verification.html"), + name='email-verification'), + url(r'^login/$', TemplateView.as_view(template_name="login.html"), + name='login'), + url(r'^password-reset/$', + TemplateView.as_view(template_name="password_reset.html"), + name='password-reset'), + url(r'^password-reset/confirm/$', + TemplateView.as_view(template_name="password_reset_confirm.html"), + name='password-reset-confirm'), + url(r'^user-details/$', + TemplateView.as_view(template_name="user_details.html"), + name='user-details'), + url(r'^password-change/$', + TemplateView.as_view(template_name="password_change.html"), + name='password-change'), + + + # this url is used to generate email content url(r'^password-reset/confirm/(?P[0-9A-Za-z_\-]+)/(?P[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', TemplateView.as_view(template_name="password_reset_confirm.html"), name='password_reset_confirm'), diff --git a/demo/templates/base.html b/demo/templates/base.html index 8d19353..8a0b0ed 100644 --- a/demo/templates/base.html +++ b/demo/templates/base.html @@ -31,16 +31,16 @@ API endpoints @@ -82,9 +82,9 @@ } $().ready(function(){ - $('form button[type=submit]').click(function(){ - var form = $('form'); - $.post(form.attr('action'), $('form').serialize()) + $('form.ajax-post button[type=submit]').click(function(){ + var form = $('form.ajax-post'); + $.post(form.attr('action'), form.serialize()) .fail(function(data){error_response(data);}) .done(function(data){susccess_response(data);}); return false; diff --git a/demo/templates/email_verification.html b/demo/templates/email_verification.html index eb49b3e..342e4a7 100644 --- a/demo/templates/email_verification.html +++ b/demo/templates/email_verification.html @@ -3,7 +3,6 @@ {% block content %}

E-mail verification

-

Paste here a key which was sent in verification email

{% include "fragments/email_verification_form.html" %}
{% endblock %} diff --git a/demo/templates/fragments/email_verification_form.html b/demo/templates/fragments/email_verification_form.html index 862ef27..aa9a5f6 100644 --- a/demo/templates/fragments/email_verification_form.html +++ b/demo/templates/fragments/email_verification_form.html @@ -1,9 +1,10 @@ -
+
+

Put here a key which was sent in verification email

diff --git a/demo/templates/fragments/login_form.html b/demo/templates/fragments/login_form.html index 23eaf29..ee02b53 100644 --- a/demo/templates/fragments/login_form.html +++ b/demo/templates/fragments/login_form.html @@ -1,5 +1,5 @@ - +
diff --git a/demo/templates/fragments/password_change_form.html b/demo/templates/fragments/password_change_form.html new file mode 100644 index 0000000..9e64ea4 --- /dev/null +++ b/demo/templates/fragments/password_change_form.html @@ -0,0 +1,25 @@ + + + +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+
+ +
+
+ +
+ diff --git a/demo/templates/fragments/password_reset_confirm_form.html b/demo/templates/fragments/password_reset_confirm_form.html index 61a1d78..973b05d 100644 --- a/demo/templates/fragments/password_reset_confirm_form.html +++ b/demo/templates/fragments/password_reset_confirm_form.html @@ -1,30 +1,32 @@ -
+
- +
- + +

Uid value sent in email

- +
- + +

Token value sent in email

- +
- +
- +
- +
diff --git a/demo/templates/fragments/password_reset_form.html b/demo/templates/fragments/password_reset_form.html index acae37e..6840193 100644 --- a/demo/templates/fragments/password_reset_form.html +++ b/demo/templates/fragments/password_reset_form.html @@ -1,5 +1,5 @@ - +
diff --git a/demo/templates/fragments/signup_form.html b/demo/templates/fragments/signup_form.html index 335ee64..9a7e43e 100644 --- a/demo/templates/fragments/signup_form.html +++ b/demo/templates/fragments/signup_form.html @@ -1,5 +1,5 @@ - +
diff --git a/demo/templates/fragments/user_details_form.html b/demo/templates/fragments/user_details_form.html new file mode 100644 index 0000000..405403b --- /dev/null +++ b/demo/templates/fragments/user_details_form.html @@ -0,0 +1,39 @@ + + + +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+
+ +
+
+ +
+ diff --git a/demo/templates/password_change.html b/demo/templates/password_change.html new file mode 100644 index 0000000..383dfc9 --- /dev/null +++ b/demo/templates/password_change.html @@ -0,0 +1,39 @@ +{% extends "base.html" %} + +{% block content %} + +
+
+ +
+ +

Token received after login

+
+
+
+ +
+

Update User Details

+ {% include "fragments/password_change_form.html" %} +
+{% endblock %} + +{% block script %} + +{% endblock %} diff --git a/demo/templates/password_reset_confirm.html b/demo/templates/password_reset_confirm.html index 09c6000..162cc35 100644 --- a/demo/templates/password_reset_confirm.html +++ b/demo/templates/password_reset_confirm.html @@ -6,3 +6,21 @@ {% include "fragments/password_reset_confirm_form.html" %}
{% endblock %} + + + +{% block script %} + +{% endblock %} diff --git a/demo/templates/signup.html b/demo/templates/signup.html index 4c5a909..0854683 100644 --- a/demo/templates/signup.html +++ b/demo/templates/signup.html @@ -6,18 +6,3 @@ {% include "fragments/signup_form.html" %}
{% endblock %} - -{% comment %} -{% block script %} - -{% endblock %} -{% endcomment %} diff --git a/demo/templates/user_details.html b/demo/templates/user_details.html new file mode 100644 index 0000000..42d19c5 --- /dev/null +++ b/demo/templates/user_details.html @@ -0,0 +1,58 @@ +{% extends "base.html" %} + +{% block content %} + +
+

Retrieve User Details

+
+ +
+ +

Token received after login

+
+ +
+
+ +
+

Update User Details

+ {% include "fragments/user_details_form.html" %} +
+{% endblock %} + +{% block script %} + +{% endblock %} From 28da4dc7c876fb7d8749ef31ff6b8847d8f71c78 Mon Sep 17 00:00:00 2001 From: Mateusz Sikora Date: Thu, 16 Oct 2014 13:31:25 +0200 Subject: [PATCH 5/5] add requirements in demo, update doc --- demo/requirements.pip | 3 +++ docs/demo.rst | 15 +++++++++++++++ docs/index.rst | 1 + 3 files changed, 19 insertions(+) create mode 100644 demo/requirements.pip create mode 100644 docs/demo.rst diff --git a/demo/requirements.pip b/demo/requirements.pip new file mode 100644 index 0000000..caf7db8 --- /dev/null +++ b/demo/requirements.pip @@ -0,0 +1,3 @@ +django==1.7 +django-rest-auth==0.3.0 +django-allauth==0.18.0 diff --git a/docs/demo.rst b/docs/demo.rst new file mode 100644 index 0000000..0482ffe --- /dev/null +++ b/docs/demo.rst @@ -0,0 +1,15 @@ +Demo project +============ + +To run demo project (ideally in virtualenv): + +.. code-block:: python + + cd /tmp + git clone git@github.com:Tivix/django-rest-auth.git + cd django-rest-auth/demo/ + pip install -r requirements.pip + python manage.py syncdb --settings=demo.settings --noinput + python manage.py runserver --settings=demo.settings + +Now, go to ``http://127.0.0.1:8000/`` in your browser. diff --git a/docs/index.rst b/docs/index.rst index a8a74ee..6f9547e 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -21,6 +21,7 @@ Contents Installation API endpoints Configuration + Demo project Changelog