use POST_ACTIVATE_REDIRECT_URL instead of DOMAIN

2 files changed, 1 insertions, 5 deletions

diff --git a/blocks/authAPI/views.py b/blocks/authAPI/views.py
index e1cc173b..49dbdac2 100644
--- a/blocks/authAPI/views.py
+++ b/blocks/authAPI/views.py
@@ -10,7 +10,6 @@ from django.http import HttpResponseNotFound
 from djoser import utils
 from djoser.serializers import TokenSerializer
 from authAPI.serializers import TokenCreateSerializer
-from blocks.settings import DOMAIN
 
 Token = djoser_settings.TOKEN_MODEL
 
@@ -50,8 +49,7 @@ def get_social_user(email, request, callback, service):
         user.save()
     token, created = Token.objects.get_or_create(user=user)
 
-    protocol = 'https://' if request.is_secure() else 'http://'
-    web_url = protocol + DOMAIN + '/#/dashboard'
+    web_url = settings.POST_ACTIVATE_REDIRECT_URL + '#/dashboard'
 
     return render(request, callback,
                   {'token': token,
diff --git a/blocks/blocks/settings.py b/blocks/blocks/settings.py
index 40dc5a11..aba1009f 100644
--- a/blocks/blocks/settings.py
+++ b/blocks/blocks/settings.py
@@ -155,8 +155,6 @@ GITHUB_OAUTH_REDIRECT_URI = os.environ.get('GITHUB_OAUTH_REDIRECT_URI',
                                            'http://localhost/api/auth/github-callback')
 POST_ACTIVATE_REDIRECT_URL = os.environ.get('POST_ACTIVATE_REDIRECT_URL',
                                             'http://localhost/')
-DOMAIN = os.environ.get('EMAIL_DOMAIN', 'localhost')
-SITE_NAME = os.environ.get('EMAIL_SITE_NAME', 'Xcos')
 
 DJOSER = {
     'LOGIN_FIELD': 'email',