Logout POST action (#10582) (#10585)

* Change logout to POST * Update for redirect * Revert octicon to font Signed-off-by: jolheiser <[email protected]>
go-gitea · Mar 3, 2020 · 6f5656a · 6f5656a
1 parent e4a876c
commit 6f5656a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/integrations/signout_test.go b/integrations/signout_test.go
@@ -14,7 +14,7 @@ func TestSignOut(t *testing.T) {
 
  session := loginUser(t, "user2")
 
- req := NewRequest(t, "GET", "/user/logout")
+ req := NewRequest(t, "POST", "/user/logout")
  session.MakeRequest(t, req, http.StatusFound)
 
  // try to view a private repo, should fail

diff --git a/routers/routes/routes.go b/routers/routes/routes.go
@@ -399,7 +399,7 @@ func RegisterRoutes(m *macaron.Macaron) {
  m.Post("/recover_account", user.ResetPasswdPost)
  m.Get("/forgot_password", user.ForgotPasswd)
  m.Post("/forgot_password", user.ForgotPasswdPost)
- m.Get("/logout", user.SignOut)
+ m.Post("/logout", user.SignOut)
  })
  // ***** END: User *****
 

diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl
@@ -109,7 +109,7 @@
  {{end}}
 
  <div class="divider"></div>
- <a class="item" href="{{AppSubUrl}}/user/logout">
+ <a class="item link-action" href data-url="{{AppSubUrl}}/user/logout" data-redirect="{{AppSubUrl}}/">
  <i class="octicon octicon-sign-out"></i>
  {{.i18n.Tr "sign_out"}}<!-- Sign Out -->
  </a>

diff --git a/web_src/js/index.js b/web_src/js/index.js
@@ -2740,11 +2740,14 @@ function showAddAllPopup() {
 
 function linkAction() {
  const $this = $(this);
+ const redirect = $this.data('redirect');
  $.post($this.data('url'), {
  _csrf: csrf
  }).done((data) => {
  if (data.redirect) {
  window.location.href = data.redirect;
+ } else if (redirect) {
+ window.location.href = redirect;
  } else {
  window.location.reload();
  }