caravancoop · merwok · Oct 18, 2018 · Oct 24, 2018 · Oct 29, 2018 · Oct 30, 2018
diff --git a/demo/demo/accounts/templates/rest_auth_toolkit/email_confirmation.html b/demo/demo/accounts/templates/rest_auth_toolkit/email_confirmation.html
@@ -0,0 +1,25 @@
+{% load i18n demotags %}
+<!doctype html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+</head>
+<body style="background-color: #F7F8FA;">
+<div>
+
+<p>
+  {% trans "Follow this link to validate your email:" %}<br>
+  {% url "pages:confirm-email" token=confirmation.external_id as confirmation_url %}
+  {% frontend_base_url as base_url %}
+  <a href="{{ base_url }}{{ confirmation_url }}">{{ base_url }}{{ confirmation_url }}</a>
+</p>
+
+<p>
+  {% trans "Or send an API request to simulate a front-end application:" %}<br>
+  <code>HTTP POST {{ base_url }}{% url "auth:confirm" %} email="{{ user.email }}" token="{{ confirmation.external_id }}"</code>
+</p>
+
+</div>
+</body>
+</html>
diff --git a/demo/demo/accounts/templates/rest_auth_toolkit/email_confirmation.txt b/demo/demo/accounts/templates/rest_auth_toolkit/email_confirmation.txt
@@ -0,0 +1,11 @@
+{% autoescape off %}
+{% load i18n demotags %}
+
+{% trans "Follow this link to validate your email:" %}
+{% frontend_base_url as base_url %}
+{{ base_url }}{% url "pages:confirm-email" token=confirmation.external_id %}
+
+{% trans "Or send an API request to simulate a front-end application:" %}
+  HTTP POST {{ base_url }}{% url "auth:confirm" %} email="{{ user.email }}" token="{{ confirmation.external_id }}"
+
+{% endautoescape %}
diff --git a/demo/demo/accounts/templatetags/__init__.py b/demo/demo/accounts/templatetags/__init__.py
diff --git a/demo/demo/accounts/templatetags/demotags.py b/demo/demo/accounts/templatetags/demotags.py
@@ -0,0 +1,10 @@
+from django import template
+
+
+register = template.Library()
+
+
+@register.simple_tag(takes_context=True)
+def frontend_base_url(context):
+    request = context['request']
+    return request.build_absolute_uri('/')[:-1]
diff --git a/demo/demo/pages/auth_urls.py b/demo/demo/pages/auth_urls.py
diff --git a/demo/demo/pages/templates/base.html b/demo/demo/pages/templates/base.html
@@ -0,0 +1,13 @@
+{% load i18n %}
+{% get_current_language as LANGUAGE_CODE %}
+<!doctype html>
+<html lang="{{ LANGUAGE_CODE }}">
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title>{% block title %}{% endblock %}</title>
+</head>
+<body>
+  {% block body %}{% endblock %}
+</body>
+</html>
diff --git a/demo/demo/pages/templates/error.html b/demo/demo/pages/templates/error.html
@@ -1,18 +1,10 @@
+{% extends "base.html" %}
 {% load i18n %}
-{% get_current_language as LANGUAGE_CODE %}
-<!doctype html>
-<html lang="{{ LANGUAGE_CODE }}">
-<head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title>{{ site_name }}</title>
-</head>
-<body>
+{% block title %}Error! {{ site_name }}{% endblock %}
 
+{% block body %}
 <div>
   <h1>{% trans "Error!" %}</h1>
   <p>{{ error }}</p>
 </div>
-
-</body>
-</html>
+{% endblock %}
diff --git a/demo/demo/pages/templates/index.html b/demo/demo/pages/templates/index.html
@@ -1,13 +1,7 @@
-{% load i18n %}
-{% get_current_language as LANGUAGE_CODE %}
-<!doctype html>
-<html lang="{{ LANGUAGE_CODE }}">
-<head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title>{{ site_name }}</title>
-</head>
-<body>
+{% extends "base.html" %}
+{% block title %}{{ site_name }}{% endblock %}
+
+{% block body %}
 <script>
   window.fbAsyncInit = function() {
     FB.init({appId: "{{ fb_app_id }}", xfbml: true, version: "v2.9"});
@@ -34,12 +28,11 @@
 <div id="fb-root"></div>
 
 <div>
-  <h1>Hello!</h1>
+  <h1>Hello world!</h1>
   <button onclick="fb_login()">Login with Facebook</button>
 </div>
 
 <script src="https://code.jquery.com/jquery-3.2.1.min.js"
   integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4="
   crossorigin="anonymous"></script>
-</body>
-</html>
+{% endblock %}
diff --git a/demo/demo/pages/templates/welcome.html b/demo/demo/pages/templates/welcome.html
@@ -0,0 +1,10 @@
+{% extends "base.html" %}
+{% load i18n %}
+{% block title %}Success! {{ site_name }}{% endblock %}
+
+{% block body %}
+<div>
+  <h1>{% trans "Success!" %}</h1>
+  <p>Your address {{ email }} is now confirmed.</p>
+</div>
+{% endblock %}
diff --git a/demo/demo/pages/urls.py b/demo/demo/pages/urls.py
@@ -8,4 +8,5 @@
 
 urlpatterns = [
     path('', views.index, name='root'),
+    path('welcome/<token>/', views.confirm_email, name='confirm-email'),
 ]
diff --git a/demo/demo/pages/views.py b/demo/demo/pages/views.py
@@ -14,12 +14,12 @@ def index(request):
     return render(request, 'index.html', context=ctx)
 
 
-def email_view(request, external_id):
+def confirm_email(request, token):
     """Landing page for links in confirmation emails."""
     error = None
 
     try:
-        confirmation = EmailConfirmation.objects.get(external_id=external_id)
+        confirmation = EmailConfirmation.objects.get(external_id=token)
         confirmation.confirm()
     except EmailConfirmation.DoesNotExist:
         error = _('Invalid link')
@@ -33,4 +33,8 @@ def email_view(request, external_id):
         }
         return render(request, 'error.html', context=ctx)
     else:
-        return index(request)
+        ctx = {
+            'site_name': 'Demo',
+            'email': confirmation.user.email,
+        }
+        return render(request, 'welcome.html', context=ctx)
diff --git a/demo/demo/settings.py b/demo/demo/settings.py
@@ -121,6 +121,5 @@
 REST_AUTH_TOOLKIT = {
     'email_confirmation_class': 'demo.accounts.models.EmailConfirmation',
     'email_confirmation_from': 'auth-demo@localhost',
-    'email_confirmation_lookup_field': 'external_id',
     'api_token_class': 'demo.accounts.models.APIToken',
 }
diff --git a/demo/demo/urls.py b/demo/demo/urls.py
@@ -6,7 +6,13 @@
 from rest_framework.documentation import include_docs_urls
 from rest_framework.renderers import DocumentationRenderer
 
-from rest_auth_toolkit.views import FacebookLoginView, LoginView, LogoutView, SignupView
+from rest_auth_toolkit.views import (
+    EmailConfirmationView,
+    FacebookLoginView,
+    LoginView,
+    LogoutView,
+    SignupView,
+)
 
 
 class GoAwayRenderer(DocumentationRenderer):
@@ -16,6 +22,7 @@ class GoAwayRenderer(DocumentationRenderer):
 
 auth_urlpatterns = [
     path('signup/', SignupView.as_view(), name='signup'),
+    path('confirm/', EmailConfirmationView.as_view(), name='confirm'),
     path('login/', LoginView.as_view(), name='login'),
     path('logout/', LogoutView.as_view(), name='logout'),
     path('fb-login/', FacebookLoginView.as_view(), name='fb-login'),
@@ -32,5 +39,4 @@ class GoAwayRenderer(DocumentationRenderer):
     path('admin/', admin.site.urls),
     path('api/', include(api_urlpatterns)),
     path('', include('demo.pages.urls')),
-    path('', include('demo.pages.auth_urls')),
 ]
diff --git a/rest_auth_toolkit/app.py b/rest_auth_toolkit/app.py
@@ -5,7 +5,7 @@ class RestAuthToolkitConfig(AppConfig):
     """Default app config for RATK.
 
     This installs a signal handler to set user.is_active when
-    email_confirmed is emitted.
+    email_confirmed is emitted by EmailConfirmationView.
     """
     name = 'rest_auth_toolkit'
 

diff --git a/rest_auth_toolkit/serializers.py b/rest_auth_toolkit/serializers.py
@@ -8,6 +8,8 @@
 from rest_framework import serializers
 from rest_framework.exceptions import ValidationError
 
+from .utils import get_object_from_setting
+
 try:
     import facepy
 except ImportError:
@@ -17,6 +19,7 @@
 
 
 User = get_user_model()
+EmailConfirmation = get_object_from_setting('email_confirmation_class')
 
 
 class SignupDeserializer(serializers.ModelSerializer):
@@ -54,6 +57,31 @@ def create(self, validated_data):
         )
 
 
+class EmailConfirmationDeserializer(serializers.Serializer):
+    email = serializers.EmailField()
+    token = serializers.CharField()
+
+    def validate(self, data):
+        msg = None
+
+        try:
+            confirmation = EmailConfirmation.objects.get(
+                external_id=data['token'],
+                user__email=data['email'],
+            )
+            confirmation.confirm()
+        except EmailConfirmation.DoesNotExist:
+            msg = _('Invalid link')
+        except EmailConfirmation.IsExpired:
+            # FIXME it's not possible to register with the same email
+            msg = _('Email expired, please register again')
+
+        if msg:
+            raise ValidationError({'errors': [msg]})
+
+        return {'user': confirmation.user}
+
+
 class LoginDeserializer(serializers.Serializer):
     """Deserializer to find a user from credentials."""
 

diff --git a/rest_auth_toolkit/templates/rest_auth_toolkit/email_confirmation.html b/rest_auth_toolkit/templates/rest_auth_toolkit/email_confirmation.html
diff --git a/rest_auth_toolkit/templates/rest_auth_toolkit/email_confirmation.txt b/rest_auth_toolkit/templates/rest_auth_toolkit/email_confirmation.txt