Merge pull request #35 from akatsoulas/better-url-naming

Simplify naming schema for urls.

Author: akatsoulas

mozilla_django_oidc/urls.py

@@ -3,8 +3,8 @@
 from mozilla_django_oidc import views
 
 urlpatterns = [
-    url(r'^oidc/authentication_callback/$', views.OIDCAuthenticationCallbackView.as_view(),
+    url(r'^callback/$', views.OIDCAuthenticationCallbackView.as_view(),
         name='oidc_authentication_callback'),
-    url(r'^oidc/authentication_init/$', views.OIDCAuthenticationRequestView.as_view(),
+    url(r'^authenticate/$', views.OIDCAuthenticationRequestView.as_view(),
         name='oidc_authentication_init'),
 ]

tests/test_auth.py

@@ -77,7 +77,7 @@ def test_successful_authentication_existing_user(self, token_mock, request_mock)
             'client_secret': 'example_secret',
             'grant_type': 'authorization_code',
             'code': 'foo',
-            'redirect_uri': 'http://site-url.com/oidc/authentication_callback/'
+            'redirect_uri': 'http://site-url.com/callback/'
         }
         self.assertEqual(self.backend.authenticate(code='foo', state='bar'), user)
         token_mock.assert_called_once_with('id_token')
@@ -112,7 +112,7 @@ def test_successful_authentication_new_user(self, token_mock, request_mock):
             'client_secret': 'example_secret',
             'grant_type': 'authorization_code',
             'code': 'foo',
-            'redirect_uri': 'http://site-url.com/oidc/authentication_callback/',
+            'redirect_uri': 'http://site-url.com/callback/',
         }
         self.assertEqual(User.objects.all().count(), 0)
         self.backend.authenticate(code='foo', state='bar')

tests/test_views.py

@@ -128,7 +128,7 @@ def test_get(self, mock_random_string):
             'response_type': ['code'],
             'scope': ['openid'],
             'client_id': ['example_id'],
-            'redirect_uri': ['http://site-url.com/oidc/authentication_callback/'],
+            'redirect_uri': ['http://site-url.com/callback/'],
             'state': ['examplestring']
         }
         self.assertDictEqual(parse_qs(o.query), expected_query)