Chore(cleanup) cleanup account activation view class

-remove multiple return statements

[Delivers #161883256]

authors/apps/authentication/helpers.py

@@ -0,0 +1,5 @@
+def clean_byte_str(byte_str):
+    """
+    Removes b'' from bytes converted to strings
+    """
+    return byte_str[2:-1]

authors/apps/authentication/views.py

@@ -11,6 +11,7 @@
                           UserSerializer, ResetPasswordSerializer)
 from .models import User
 from .validation import validate
+from .helpers import clean_byte_str
 from django.http import HttpResponseRedirect
 import base64
 
@@ -41,7 +42,7 @@ def post(self, request):
         token = serializer.data['token']
 
         encoded_url = str(base64.b64encode(bytes(redirect_url, 'utf-8')))
-        encoded_url = encoded_url[2:-1]  # remove b''
+        encoded_url = clean_byte_str(encoded_url)
         redirect_str = token + "$" + str(encoded_url)
         content = "Thank you for registering with Authors Haven.\
         Follow this link to activate your account {}{}{}/".format(
@@ -164,7 +165,7 @@ def get(self, request, token):
         cleantoken = token
         if '$' in str(token):
             redirect_url = str(base64.b64decode((token.rsplit('$', 1)[1])))
-            redirect_url = redirect_url[2:-1]
+            redirect_url = clean_byte_str(redirect_url)
             cleantoken = str((token.rsplit('$')[0]))
         try:
 
@@ -175,10 +176,7 @@ def get(self, request, token):
                 user.is_verified = True
                 user.save()
 
-                if redirect_url:
-                    return HttpResponseRedirect(redirect_url)
-
-                return Response({
+                return self.redirect_if_true(redirect_url) or Response({
                     "message":
                     "Your account has been successfully " +
                     "activated. Complete profile",
@@ -187,18 +185,21 @@ def get(self, request, token):
                 },
                                 status=status.HTTP_200_OK)
 
-            if redirect_url:
-                return HttpResponseRedirect(redirect_url)
-
-            return Response(
+            return self.redirect_if_true(redirect_url) or Response(
                 {
                     "message": "Account already activated. Please login"
                 },
                 status=status.HTTP_200_OK)
 
-        except Exception:
-            return Response({
+
+        except Exception as e:
+
+            return self.redirect_if_true(redirect_url) or Response({
                 "message":
                 "Sorry. Activation link " + "either expired or is invalid"
             },
                             status=status.HTTP_400_BAD_REQUEST)
+
+    def redirect_if_true(self, redirect_url):
+        if redirect_url:
+            return HttpResponseRedirect(redirect_url)