Merge branch '11.0'

seahub/templates/client_login_complete.html

@@ -0,0 +1,8 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block main_content %}
+<div class="text-panel">
+    <p>{% trans "The client has logged in. Please open the client to confirm." %}</p>
+</div>
+{% endblock %}

seahub/templates/client_login_confirm.html

@@ -3,7 +3,7 @@
 
 {% block main_content %}
 <div class="new-narrow-panel">
-    <h2 class="hd">{% trans "Desktop Client Login Confirm" %}</h2>
+    <h2 class="hd">{% trans "Client Login Confirm" %}</h2>
     <form action="" method="post" class="con">{% csrf_token %}
     <label>{% trans "Do you want to login to your client?" %}</label><br />
     <input type="submit" value="{% trans "Yes" %}" class="submit" />

seahub/views/sso.py

@@ -232,6 +232,7 @@ def client_sso_complete(request, token):
         else:
             logger.warning('Client SSO token is not waiting, skip.')
 
-        return HttpResponseRedirect(reverse('libraries'))
+        template_name = 'client_login_complete.html'
+        return render(request, template_name, {})
     else:
         return render_permission_error(request, _('Permission denied.'))

tests/seahub/views/test_sso.py

@@ -39,7 +39,7 @@ class SSOTest(BaseTestCase):
 
         t.accessed()
         resp = self.client.post('/client-sso/%s/complete/' % t.token)
-        self.assertEqual(resp.status_code, 302)
+        self.assertEqual(resp.status_code, 200)
 
         t2 = ClientSSOToken.objects.get(token=t.token)
         assert t2.api_key is not None