Merging of latest changes.

diff --git a/example/templates/done.html b/example/templates/done.html
index b492cb00bde6e5c3e3dc42792db5b6795a2e0d98..2c09819dcba32858d253597cc8bb383d3af1d808 100644 (file)
--- a/example/templates/done.html
+++ b/example/templates/done.html
@@ -57,10 +57,10 @@
       </form>
     </li>
     <li>
-      <form action="/login/yandex/" method="post">{% csrf_token %}
+      <form action="{% url begin "yandex" %} method="post">{% csrf_token %}
         <div>
           <label for="openid_ya_user">Yandex user
-            {% if yandex %} <span class="associated">(associated)</span>{% endif %}:
+            {% if yandex %}(<span class="disconnect"><a href="{% url disconnect "yandex" %}">disconnect</a>)</span>{% endif %}
           </label>
           <input id="openid_ya_user" type="text" value="" name="openid_ya_user" />
           <input type="submit" value="Login"/>

diff --git a/example/templates/home.html b/example/templates/home.html
index 15652f2abf41058ec83db9bd55c2d80cb68ac6f6..f1fa6f25154ed7d785c955954311ec4231374816 100644 (file)
--- a/example/templates/home.html
+++ b/example/templates/home.html
@@ -28,7 +28,7 @@
       </form>
     </li>
     <li>
-      <form action="/login/yandex/" method="post">{% csrf_token %}
+      <form action="{% url begin "yandex" %}" method="post">{% csrf_token %}
         <div>
           <label for="openid_ya_user">Yandex user:</label>
           <input id="openid_ya_user" type="text" value="" name="openid_ya_user" />
@@ -52,7 +52,7 @@
 <div>
   <h3>Login using other authentication systems:</h3>
        <ul>
-               <li><a rel="nofollow" href="/login/vkontakte/">VKontakte OpenAPI</a></li>
+               <li><a rel="nofollow" href="{% url begin "vkontakte" %}">VKontakte OpenAPI</a></li>
        </ul>
 </div>
 {% endblock %}

diff --git a/social_auth/backends/contrib/yandex.py b/social_auth/backends/contrib/yandex.py
index ff00809162c836b9c300f27c8f6da7a4cdb02dba..15e4e72137f81090881e3671081f09878ef0a58c 100644 (file)
--- a/social_auth/backends/contrib/yandex.py
+++ b/social_auth/backends/contrib/yandex.py
@@ -32,11 +32,6 @@ class YandexBackend(OpenIDBackend):
 class YandexAuth(OpenIdAuth):
     """Yandex OpenID authentication"""
     AUTH_BACKEND = YandexBackend
-    
-    def auth_complete(self, *args, **kwargs):
-        # Yandex returns some stuff in both GET and POST
-        self.data = self.request.REQUEST
-        return super(YandexAuth, self).auth_complete(*args, **kwargs)
         
     def openid_url(self):
         """Returns Yandex authentication URL"""