femsci/forgejo
femsci/forgejo
1
0
Fork 0
forked from NYANDEV/forgejo
Code Pull requests Activity

Use JSON response for "user/logout" (#25522)

Browse source 
The request sent to "user/logout" is from "link-action", it expects to
get JSON response.
This commit is contained in:
wxiaoguang 2023-06-27 03:36:10 +08:00 committed by GitHub
parent da6df0d063
commit ddf96f68cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
routers/web/auth/auth.go
View file

@ -383,7 +383,7 @@ func SignOut(ctx *context.Context) {
}) })
} }
HandleSignOut(ctx) HandleSignOut(ctx)
ctx.Redirect(setting.AppSubURL + "/") ctx.JSONRedirect(setting.AppSubURL + "/")
} }
// SignUp render the register page // SignUp render the register page

4
templates/base/head_navbar.tmpl
View file

@ -68,7 +68,7 @@
</div> </div>
<div class="divider"></div> <div class="divider"></div>
<a class="item link-action" href data-url="{{AppSubUrl}}/user/logout" data-redirect="{{AppSubUrl}}/"> <a class="item link-action" href data-url="{{AppSubUrl}}/user/logout">
{{svg "octicon-sign-out"}} {{svg "octicon-sign-out"}}
{{.locale.Tr "sign_out"}} {{.locale.Tr "sign_out"}}
</a> </a>
@ -186,7 +186,7 @@
{{end}} {{end}}
<div class="divider"></div> <div class="divider"></div>
<a class="item link-action" href data-url="{{AppSubUrl}}/user/logout" data-redirect="{{AppSubUrl}}/"> <a class="item link-action" href data-url="{{AppSubUrl}}/user/logout">
{{svg "octicon-sign-out"}} {{svg "octicon-sign-out"}}
{{.locale.Tr "sign_out"}} {{.locale.Tr "sign_out"}}
</a> </a>

2
tests/integration/signout_test.go
View file

@ -16,7 +16,7 @@ func TestSignOut(t *testing.T) {
session := loginUser(t, "user2") session := loginUser(t, "user2")
req := NewRequest(t, "POST", "/user/logout") req := NewRequest(t, "POST", "/user/logout")
session.MakeRequest(t, req, http.StatusSeeOther) session.MakeRequest(t, req, http.StatusOK)
// try to view a private repo, should fail // try to view a private repo, should fail
req = NewRequest(t, "GET", "/user2/repo2") req = NewRequest(t, "GET", "/user2/repo2")