Skip to content

refactor: change login url #157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
f2c-ci-robot merged 4 commits into from
Oct 12, 2024
Merged

refactor: change login url #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7bd4a21
refactor: change login url
ruibaby Oct 4, 2024
ac8a016
Update requires
ruibaby Oct 4, 2024
d450528
Change logout url
ruibaby Oct 6, 2024
82ae09a
Merge branch 'main' into refactor/change-login-url
ruibaby Oct 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 3 additions & 19 deletions packages/comment-widget/src/base-form.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export class BaseForm extends LitElement {
.join('-')
.replaceAll(/-+/g, '-')}`;

return `/console/login?redirect_uri=${encodeURIComponent(window.location.href + parentDomId)}`;
return `/login?redirect_uri=${encodeURIComponent(window.location.pathname + parentDomId)}`;
}

get showCaptcha() {
Expand All @@ -98,25 +98,9 @@ export class BaseForm extends LitElement {
}

async handleLogout() {
if (window.confirm('确定要退出登录吗？')) {
if (window.confirm('点击确定将跳转至退出登录页面，请确保正在编辑的内容已保存。')) {
try {
const response = await fetch(`${this.baseUrl}/logout`, {
method: 'POST',
headers: {
'X-Xsrf-Token':
document.cookie
.split('; ')
.find((row) => row.startsWith('XSRF-TOKEN'))
?.split('=')[1] || '',
},
credentials: 'same-origin',
});

if (!response.ok) {
throw new Error('Failed to logout');
}

window.location.reload();
window.location.href = '/logout';
} catch (error) {
console.error('Failed to logout', error);
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/plugin.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
"store.halo.run/app-id": "app-YXyaD"
spec:
enabled: true
requires: ">=2.17.0"
requires: ">=2.20.0"
author:
name: Halo
website: https://github.com/halo-dev
Expand Down