allowing redirect by headers

moacirmoda · moacirmoda · commit 414a381fd4e9 · 2020-04-23T09:22:02.000-03:00
diff --git a/pythonpro/redirector/migrations/0003_redirect_use_javascript.py b/pythonpro/redirector/migrations/0003_redirect_use_javascript.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.0.4 on 2020-04-22 00:49
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('redirector', '0002_auto_20200421_2144'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='redirect',
+            name='use_javascript',
+            field=models.BooleanField(default=False),
+        ),
+    ]
diff --git a/pythonpro/redirector/models.py b/pythonpro/redirector/models.py
@@ -8,6 +8,7 @@ class Redirect(models.Model):
     updated = models.DateTimeField("Alterado em", auto_now=True)
     slug = models.SlugField(primary_key=True)
     url = models.URLField(null=True, blank=True)
+    use_javascript = models.BooleanField(default=False)
 
 
 class RedirectLink(models.Model):
diff --git a/pythonpro/redirector/tests/__init__.py b/pythonpro/redirector/tests/__init__.py
diff --git a/pythonpro/redirector/tests/test_redirect_by_headers.py b/pythonpro/redirector/tests/test_redirect_by_headers.py
@@ -9,18 +9,13 @@
 
 @pytest.fixture
 def redirect(db):
-    return mommy.make(Redirect)
+    return mommy.make(Redirect, url='https://google.com')
 
 
 @pytest.fixture
 def resp(client, redirect):
     return client.get(reverse('redirector:redirect', kwargs={'slug': redirect.slug}), secure=True)
 
 
-def test_status_code(resp):
-    assert resp.status_code == 200
-
-
-def test_redirect_js(resp, redirect):
-    url = get_redirect_url(redirect)
-    dj_assert_contains(resp, f'window.location.replace("{url}")')
+def test_status_code_should_return_302(resp):
+    assert resp.status_code == 302
diff --git a/pythonpro/redirector/tests/test_redirect_by_javascript.py b/pythonpro/redirector/tests/test_redirect_by_javascript.py
@@ -0,0 +1,30 @@
+import pytest
+from django.urls import reverse
+from model_mommy import mommy
+
+from pythonpro.django_assertions import dj_assert_contains
+from pythonpro.redirector.models import Redirect
+from pythonpro.redirector.facade import get_redirect_url
+
+
+@pytest.fixture
+def redirect(db):
+    return mommy.make(Redirect, url='https://google.com', use_javascript=True)
+
+
+def test_should_redirect_url_in_redirect_object(redirect):
+    assert get_redirect_url(redirect) == redirect.url
+
+
+@pytest.fixture
+def resp(client, redirect):
+    return client.get(reverse('redirector:redirect', kwargs={'slug': redirect.slug}), secure=True)
+
+
+def test_status_code_should_return_200(resp):
+    assert resp.status_code == 200
+
+
+def test_should_redirect_js_contains_redirect_url(resp, redirect):
+    dj_assert_contains(resp, f'window.location.replace("{redirect.url}")')
+
diff --git a/pythonpro/redirector/views.py b/pythonpro/redirector/views.py
@@ -1,10 +1,15 @@
-from django.shortcuts import render
+from django.shortcuts import render, redirect as redirect_url
 
 from pythonpro.redirector.models import Redirect
 from pythonpro.redirector.facade import get_redirect_url
 
 
 def redirect(request, slug: str):
     redirect = Redirect.objects.get(slug=slug)
-    ctx = {'url': get_redirect_url(redirect)}
+    url = get_redirect_url(redirect)
+
+    if redirect.use_javascript is False:
+        return redirect_url(url)
+
+    ctx = {'url': url}
     return render(request, 'redirector/redirect.html', ctx)
