From cfd0e7ee054476a7f8d3143adb0772d3f8b66bb0 Mon Sep 17 00:00:00 2001
From: Christian Dresen <c.dresen@fh-muenster.de>
Date: Wed, 12 Apr 2017 00:54:12 +0200
Subject: [PATCH] [WarpInfra] Fixed last Commit
---
www/web/warpauth/views/register.py | 7 ++++++-
www/web/warpauth/views/reset_password.py | 6 +++---
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/www/web/warpauth/views/register.py b/www/web/warpauth/views/register.py
index 5533791..5721f87 100644
--- a/www/web/warpauth/views/register.py
+++ b/www/web/warpauth/views/register.py
@@ -11,6 +11,7 @@ from warpauth.util import *
from django.utils.translation import ugettext as _
from django.core.exceptions import ObjectDoesNotExist
from warpzone.settings import INSTANCE_NAME
+from django.shortcuts import redirect
def send_token(token):
email_content = _("https://infra.warpzone.ms/account/registration/activate/%(token)s") % {'token': token.token }
@@ -21,7 +22,7 @@ def send_token(token):
def register(request):
page_context['success'] = False
if "INTERN" in INSTANCE_NAME:
- return redirect('http://infra.warpzone.ms/registration/')
+ return redirect('http://infra.warpzone.ms/account/registration/')
if request.method == "POST":
username = request.POST['username']
@@ -75,6 +76,8 @@ def register(request):
def activate(request, token=None):
+ if "INTERN" in INSTANCE_NAME:
+ return redirect('http://infra.warpzone.ms/account/registration/')
try:
activation_token = ActivationToken.objects.get(token=token)
group = LdapGroup.objects.filter(name="active").get()
@@ -87,6 +90,8 @@ def activate(request, token=None):
return HttpResponse(render(request, 'warpauth/register/activate.html', page_context))
def resend_token(request):
+ if "INTERN" in INSTANCE_NAME:
+ return redirect('http://infra.warpzone.ms/account/registration/')
if request.method == "POST":
try:
token = ActivationToken.objects.get(user=request.POST["username"])
diff --git a/www/web/warpauth/views/reset_password.py b/www/web/warpauth/views/reset_password.py
index 15741ae..ade8aef 100644
--- a/www/web/warpauth/views/reset_password.py
+++ b/www/web/warpauth/views/reset_password.py
@@ -13,7 +13,7 @@ from warpzone.util import send_email
from warpauth.util import *
from warpauth.models import PasswordResetToken, LdapUser
-
+from django.shortcuts import redirect
from warpzone.settings import PW_RESET_TOKEN_LIFETIME, INSTANCE_NAME
#
@@ -22,7 +22,7 @@ from warpzone.settings import PW_RESET_TOKEN_LIFETIME, INSTANCE_NAME
def gen_token(request):
if "INTERN" in INSTANCE_NAME:
- return redirect('http://infra.warpzone.ms/reset_password/')
+ return redirect('http://infra.warpzone.ms/account/reset_password/')
if request.POST:
try:
@@ -49,7 +49,7 @@ def gen_token(request):
def change_password(request, reset_hash=None):
if "INTERN" in INSTANCE_NAME:
- return redirect('http://infra.warpzone.ms/reset_password/')
+ return redirect('http://infra.warpzone.ms/account/reset_password/')
try:
pw_reset_token = PasswordResetToken.objects.get(hash=reset_hash)
time_difference = datetime.datetime.now() - pw_reset_token.created
--
GitLab