From f356e5b85a4dd2631969f2091cc753cb6ebf2449 Mon Sep 17 00:00:00 2001
From: lian <imwhatiam123@gmail.com>
Date: Wed, 21 Aug 2024 14:39:11 +0800
Subject: [PATCH] add client login complete msg (#6602)

* add client login complete msg

* update test
---
 seahub/templates/client_login_complete.html | 8 ++++++++
 seahub/templates/client_login_confirm.html  | 2 +-
 seahub/views/sso.py                         | 3 ++-
 tests/seahub/views/test_sso.py              | 2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 seahub/templates/client_login_complete.html

diff --git a/seahub/templates/client_login_complete.html b/seahub/templates/client_login_complete.html
new file mode 100644
index 0000000000..21c7941082
--- /dev/null
+++ b/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 %}
diff --git a/seahub/templates/client_login_confirm.html b/seahub/templates/client_login_confirm.html
index fc62fd7706..2f2034f4b5 100644
--- a/seahub/templates/client_login_confirm.html
+++ b/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" />
diff --git a/seahub/views/sso.py b/seahub/views/sso.py
index 72e559727f..36fa54cbc0 100644
--- a/seahub/views/sso.py
+++ b/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.'))
diff --git a/tests/seahub/views/test_sso.py b/tests/seahub/views/test_sso.py
index e5f5e40805..495c8dc586 100644
--- a/tests/seahub/views/test_sso.py
+++ b/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