From 2b9aa869794f27a3dd4da06f8017b1c07d3a602d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Mat=C3=ADas=20Aguirre?= <matiasaguirre@gmail.com>
Date: Sun, 3 Jul 2011 17:18:52 -0300
Subject: [PATCH] Non-backward compatible URL name changes. Closes gh-95

---
 example/templates/done.html   | 24 ++++++++++++------------
 example/templates/home.html   | 22 +++++++++++-----------
 social_auth/tests/facebook.py |  2 +-
 social_auth/tests/google.py   |  2 +-
 social_auth/tests/twitter.py  |  2 +-
 social_auth/urls.py           | 12 ++++++------
 social_auth/views.py          |  6 +++---
 7 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/example/templates/done.html b/example/templates/done.html
index 4084a98..74e2c34 100644
--- a/example/templates/done.html
+++ b/example/templates/done.html
@@ -21,7 +21,7 @@
   <ul>
   {% for account in accounts %}
     <li>
-        <span class="disconnect"><a href={% url disconnect_individual account.provider account.id %}>{{ account.provider|title }} (ID {{ account.id }})</a></span>
+        <span class="disconnect"><a href={% url socialauth_disconnect_individual account.provider account.id %}>{{ account.provider|title }} (ID {{ account.id }})</a></span>
     </li>
   {% endfor %}
   </ul>
@@ -30,42 +30,42 @@
   <h3>Associate new OAuth credentials:</h3>
   <ul>
     <li>
-      <a rel="nofollow" href="{% url associate_begin "twitter" %}">Twitter</a>
+      <a rel="nofollow" href="{% url socialauth_associate_begin "twitter" %}">Twitter</a>
     </li>
     <li>
-      <a rel="nofollow" href="{% url associate_begin "facebook" %}">Facebook</a>
+      <a rel="nofollow" href="{% url socialauth_associate_begin "facebook" %}">Facebook</a>
     </li>
     <li>
-      <a rel="nofollow" href="{% url associate_begin "linkedin" %}">LinkedIn</a>
+      <a rel="nofollow" href="{% url socialauth_associate_begin "linkedin" %}">LinkedIn</a>
     </li>
     <li>
-      <a rel="nofollow" href="{% url associate_begin "orkut" %}">Orkut</a>
+      <a rel="nofollow" href="{% url socialauth_associate_begin "orkut" %}">Orkut</a>
     </li>
     <li>
-      <a rel="nofollow" href="{% url associate_begin "google-oauth" %}">Google OAuth</a>
+      <a rel="nofollow" href="{% url socialauth_associate_begin "google-oauth" %}">Google OAuth</a>
     </li>
   </ul>
 
   <h3>Associate new OAuth2 credentials:</h3>
   <ul>
     <li>
-      <a rel="nofollow" href="{% url associate_begin "google-oauth2" %}">Google OAuth2</a>
+      <a rel="nofollow" href="{% url socialauth_associate_begin "google-oauth2" %}">Google OAuth2</a>
     </li>
     <li>
-      <a rel="nofollow" href="{% url associate_begin "foursquare" %}">Foursquare</a>
+      <a rel="nofollow" href="{% url socialauth_associate_begin "foursquare" %}">Foursquare</a>
     </li>
   </ul>
 
   <h3>Associate new OpenID credentials:</h3>
   <ul>
     <li>
-      <a rel="nofollow" href="{% url associate_begin "google" %}">Google OpenID</a>
+      <a rel="nofollow" href="{% url socialauth_associate_begin "google" %}">Google OpenID</a>
     </li>
     <li>
-      <a rel="nofollow" href="{% url associate_begin "yahoo" %}">Yahoo</a>
+      <a rel="nofollow" href="{% url socialauth_associate_begin "yahoo" %}">Yahoo</a>
     </li>
     <li>
-      <form action="{% url associate_begin "livejournal" %}" method="post">{% csrf_token %}
+      <form action="{% url socialauth_associate_begin "livejournal" %}" method="post">{% csrf_token %}
         <div>
           <label for="openid_lj_user">LiveJournal user
           </label>
@@ -75,7 +75,7 @@
       </form>
     </li>
     <li>
-      <form action="{% url associate_begin "openid" %}" method="post">{% csrf_token %}
+      <form action="{% url socialauth_associate_begin "openid" %}" method="post">{% csrf_token %}
         <div>
           <label for="openid_identifier">Other provider:</label>
           <input id="openid_identifier" type="text" value="" name="openid_identifier" />
diff --git a/example/templates/home.html b/example/templates/home.html
index 8555a50..14b0edf 100644
--- a/example/templates/home.html
+++ b/example/templates/home.html
@@ -6,29 +6,29 @@
 <div>
   <h3>Login using <a href="http://oauth.net/" title="OAuth">OAuth</a> from:</h3>
   <ul>
-    <li><a rel="nofollow" href="{% url begin "twitter" %}">Twitter</a></li>
-    <li><a rel="nofollow" href="{% url begin "facebook" %}">Facebook</a></li>
-    <li><a rel="nofollow" href="{% url begin "linkedin" %}">Linkedin</a></li>
-    <li><a rel="nofollow" href="{% url begin "orkut" %}">Orkut</a></li>
-    <li><a rel="nofollow" href="{% url begin "google-oauth" %}">Google OAuth</a></li>
+    <li><a rel="nofollow" href="{% url socialauth_begin "twitter" %}">Twitter</a></li>
+    <li><a rel="nofollow" href="{% url socialauth_begin "facebook" %}">Facebook</a></li>
+    <li><a rel="nofollow" href="{% url socialauth_begin "linkedin" %}">Linkedin</a></li>
+    <li><a rel="nofollow" href="{% url socialauth_begin "orkut" %}">Orkut</a></li>
+    <li><a rel="nofollow" href="{% url socialauth_begin "google-oauth" %}">Google OAuth</a></li>
   </ul>
 </div>
 
 <div>
   <h3>Login using <a href="http://tools.ietf.org/html/draft-ietf-oauth-v2-10" title="OAuth2">OAuth2</a> from:</h3>
   <ul>
-    <li><a rel="nofollow" href="{% url begin "google-oauth2" %}">Google OAuth2</a></li>
-    <li><a rel="nofollow" href="{% url begin "foursquare" %}">Foursquare</a></li>
+    <li><a rel="nofollow" href="{% url socialauth_begin "google-oauth2" %}">Google OAuth2</a></li>
+    <li><a rel="nofollow" href="{% url socialauth_begin "foursquare" %}">Foursquare</a></li>
   </ul>
 </div>
 
 <div>
   <h3>Login using <a href="http://openid.net/" title="OpenId">OpenId</a> from:</h3>
   <ul>
-    <li><a rel="nofollow" href="{% url begin "google" %}">Google</a></li>
-    <li><a rel="nofollow" href="{% url begin "yahoo" %}">Yahoo</a></li>
+    <li><a rel="nofollow" href="{% url socialauth_begin "google" %}">Google</a></li>
+    <li><a rel="nofollow" href="{% url socialauth_begin "yahoo" %}">Yahoo</a></li>
     <li>
-      <form action="{% url begin "livejournal" %}" method="post">{% csrf_token %}
+      <form action="{% url socialauth_begin "livejournal" %}" method="post">{% csrf_token %}
         <div>
           <label for="openid_lj_user">LiveJournal user:</label>
           <input id="openid_lj_user" type="text" value="" name="openid_lj_user" />
@@ -37,7 +37,7 @@
       </form>
     </li>
     <li>
-      <form action="{% url begin "openid" %}" method="post">{% csrf_token %}
+      <form action="{% url socialauth_begin "openid" %}" method="post">{% csrf_token %}
         <div>
           <label for="openid_identifier">Other provider</label>
           <input id="openid_identifier" type="text" value="" name="openid_identifier" />
diff --git a/social_auth/tests/facebook.py b/social_auth/tests/facebook.py
index d804d6f..c0c324b 100644
--- a/social_auth/tests/facebook.py
+++ b/social_auth/tests/facebook.py
@@ -22,7 +22,7 @@ REDIRECT_RE = re.compile('window.location.replace\("(.*)"\);')
 
 class FacebookTestLogin(FacebookTestCase):
     def test_login_succeful(self):
-        response = self.client.get(self.reverse('begin', 'facebook'))
+        response = self.client.get(self.reverse('socialauth_begin', 'facebook'))
         # social_auth must redirect to service page
         self.assertEqual(response.status_code, 302)
 
diff --git a/social_auth/tests/google.py b/social_auth/tests/google.py
index 52c99ee..94509fa 100644
--- a/social_auth/tests/google.py
+++ b/social_auth/tests/google.py
@@ -23,7 +23,7 @@ class GoogleOpenIdTestLogin(GoogleTestCase):
     SERVER_PORT = '8000'
 
     def test_login_succeful(self):
-        response = self.client.get(self.reverse('begin', 'google'))
+        response = self.client.get(self.reverse('socialauth_begin', 'google'))
 
         parser = FormParserByID('openid_message')
         parser.feed(response.content)
diff --git a/social_auth/tests/twitter.py b/social_auth/tests/twitter.py
index 19406db..9a77a60 100644
--- a/social_auth/tests/twitter.py
+++ b/social_auth/tests/twitter.py
@@ -16,7 +16,7 @@ class TwitterTestCase(SocialAuthTestsCase):
 
 class TwitterTestLogin(TwitterTestCase):
     def test_login_succeful(self):
-        response = self.client.get(self.reverse('begin', 'twitter'))
+        response = self.client.get(self.reverse('socialauth_begin', 'twitter'))
         # social_auth must redirect to service page
         self.assertEqual(response.status_code, 302)
 
diff --git a/social_auth/urls.py b/social_auth/urls.py
index 61dadea..17c2b76 100644
--- a/social_auth/urls.py
+++ b/social_auth/urls.py
@@ -6,12 +6,12 @@ from social_auth.views import auth, complete, associate, associate_complete, \
 
 
 urlpatterns = patterns('',
-    url(r'^login/(?P<backend>[^/]+)/$', auth, name='begin'),
-    url(r'^complete/(?P<backend>[^/]+)/$', complete, name='complete'),
-    url(r'^associate/(?P<backend>[^/]+)/$', associate, name='associate_begin'),
+    url(r'^login/(?P<backend>[^/]+)/$', auth, name='socialauth_begin'),
+    url(r'^complete/(?P<backend>[^/]+)/$', complete, name='socialauth_complete'),
+    url(r'^associate/(?P<backend>[^/]+)/$', associate, name='socialauth_associate_begin'),
     url(r'^associate/complete/(?P<backend>[^/]+)/$', associate_complete,
-        name='associate_complete'),
-    url(r'^disconnect/(?P<backend>[^/]+)/$', disconnect, name='disconnect'),
+        name='socialauth_associate_complete'),
+    url(r'^disconnect/(?P<backend>[^/]+)/$', disconnect, name='socialauth_disconnect'),
     url(r'^disconnect/(?P<backend>[^/]+)/(?P<association_id>\d+)/$', disconnect,
-        name='disconnect_individual'),
+        name='socialauth_disconnect_individual'),
 )
diff --git a/social_auth/views.py b/social_auth/views.py
index 6edfee6..f654078 100644
--- a/social_auth/views.py
+++ b/social_auth/views.py
@@ -20,11 +20,11 @@ NEW_USER_REDIRECT = _setting('SOCIAL_AUTH_NEW_USER_REDIRECT_URL')
 NEW_ASSOCIATION_REDIRECT = _setting('SOCIAL_AUTH_NEW_ASSOCIATION_REDIRECT_URL')
 DISCONNECT_REDIRECT_URL = _setting('SOCIAL_AUTH_DISCONNECT_REDIRECT_URL')
 LOGIN_ERROR_URL = _setting('LOGIN_ERROR_URL', settings.LOGIN_URL)
-COMPLETE_URL_NAME = _setting('SOCIAL_AUTH_COMPLETE_URL_NAME', 'complete')
+COMPLETE_URL_NAME = _setting('SOCIAL_AUTH_COMPLETE_URL_NAME', 'socialauth_complete')
 ASSOCIATE_URL_NAME = _setting('SOCIAL_AUTH_ASSOCIATE_URL_NAME',
-                              'associate_complete')
+                              'socialauth_associate_complete')
 SOCIAL_AUTH_LAST_LOGIN = _setting('SOCIAL_AUTH_LAST_LOGIN',
-                                 'social_auth_last_login_backend')
+                                  'social_auth_last_login_backend')
 SESSION_EXPIRATION = _setting('SOCIAL_AUTH_SESSION_EXPIRATION', True)
 
 
-- 
2.39.5