@@ -491,8 +521,13 @@
loadRoles = async () => {
try {
- const res = await $axios.get('/api/roles');
- roles = res.items || [];
+ const res = await fetch('/api/roles');
+ if (res.status !== 200) {
+ const err = await res.json();
+ throw new Error(err.message);
+ }
+ const data = await res.json();
+ roles = data.items || [];
} catch (e) {
$message.error(e.message);
}
@@ -510,13 +545,13 @@
openCreateModal = () => {
isEdit = false;
- formData = { id: null, code: "", name: "", description: "" };
+ formData = {id: null, code: "", name: "", description: ""};
showModal = true;
};
openEditModal = (r) => {
isEdit = true;
- formData = { ...r };
+ formData = {...r};
showModal = true;
};
@@ -535,10 +570,18 @@
name: formData.name,
description: formData.description
};
- await $axios.patch(`/api/roles/${formData.id}`, payload);
+ const res = await fetch(`/api/roles/${formData.id}`, {method: 'PATCH', headers: {'Content-Type': 'application/json'}, body: JSON.stringify(payload)});
+ if (res.status !== 200) {
+ const err = await res.json();
+ throw new Error(err.message);
+ }
$message.success($t('org.updated'));
} else {
- await $axios.post('/api/roles', formData);
+ const res = await fetch('/api/roles', {method: 'POST', headers: {'Content-Type': 'application/json'}, body: JSON.stringify(formData)});
+ if (res.status !== 200) {
+ const err = await res.json();
+ throw new Error(err.message);
+ }
$message.success($t('org.created'));
}
closeModal();
@@ -551,7 +594,11 @@
deleteRole = async (r) => {
try {
await $message.confirm($t('role.delete_confirm'));
- await $axios.delete(`/api/roles/${r.id}`);
+ const res = await fetch(`/api/roles/${r.id}`, {method: 'DELETE'});
+ if (res.status !== 200) {
+ const err = await res.json();
+ throw new Error(err.message);
+ }
$message.success($t('org.deleted'));
loadRoles();
} catch (e) {
@@ -583,7 +630,11 @@
loadRolePermissions = async () => {
if (!currentRole) return;
try {
- const res = await $axios.get(`/api/roles/${currentRole.id}/permissions`);
+ const res = await fetch(`/api/roles/${currentRole.id}/permissions`);
+ if (res.status !== 200) {
+ const err = await res.json();
+ throw new Error(err.message);
+ }
rolePermissions = res || [];
} catch (e) {
$message.error(e.message);
@@ -608,12 +659,17 @@
// you might need a /api/permissions endpoint to list all available permissions
try {
// This is a placeholder - adjust based on your actual API
- const res = await $axios.get('/api/auth/me');
- if (res.permissions) {
+ const res = await fetch('/api/auth/me');
+ if (res.status !== 200) {
+ const err = await res.json();
+ throw new Error(err.message);
+ }
+ const me = await res.json();
+ if (me.permissions) {
// Extract unique permission IDs
const uniquePerms = [];
const seen = new Set();
- res.permissions.forEach(p => {
+ me.permissions.forEach(p => {
if (!seen.has(p.permission_id)) {
seen.add(p.permission_id);
uniquePerms.push({
@@ -664,9 +720,15 @@
saveRolePermissions = async () => {
if (!currentRole) return;
try {
- await $axios.put(`/api/roles/${currentRole.id}/permissions`, {
- permission_ids: selectedPermissionIds
+ const res = await fetch(`/api/roles/${currentRole.id}/permissions`, {
+ method: 'PUT', headers: {'Content-Type': 'application/json'}, body: JSON.stringify({
+ permission_ids: selectedPermissionIds
+ })
});
+ if (res.status !== 200) {
+ const err = await res.json();
+ throw new Error(err.message);
+ }
$message.success($t('role.permissions_updated'));
closePermissionSelector();
loadRolePermissions();
@@ -682,9 +744,15 @@
const newPermissions = rolePermissions
.filter(rp => rp.id !== p.id)
.map(rp => rp.id);
- await $axios.put(`/api/roles/${currentRole.id}/permissions`, {
- permission_ids: newPermissions
+ const res = await fetch(`/api/roles/${currentRole.id}/permissions`, {
+ method: 'PUT', headers: {'Content-Type': 'application/json'}, body: JSON.stringify({
+ permission_ids: newPermissions
+ })
});
+ if (res.status !== 200) {
+ const err = await res.json();
+ throw new Error(err.message);
+ }
$message.success($t('role.permission_removed'));
loadRolePermissions();
} catch (e) {
@@ -709,13 +777,24 @@
try {
// Get users who have this role
// We need to fetch users and filter by role
- const res = await $axios.get('/api/users', { params: { page_size: 1000 } });
- const allUsers = res.items || [];
+ const params = new URLSearchParams({page_size: 1000});
+ let res = await fetch('/api/users?' + params);
+ if (res.status !== 200) {
+ const err = await res.json();
+ throw new Error(err.message);
+ }
+ const data = await res.json();
+ const allUsers = data.items || [];
// For each user, check if they have this role
const usersWithRole = [];
for (const user of allUsers) {
try {
- const userRoles = await $axios.get(`/api/users/${user.id}/roles`);
+ res = await fetch(`/api/users/${user.id}/roles`);
+ if (res.status !== 200) {
+ const err = await res.json();
+ throw new Error(err.message);
+ }
+ const userRoles = await res.json();
if (userRoles.some(ur => ur.id === currentRole.id)) {
usersWithRole.push(user);
}
@@ -753,13 +832,11 @@
searchAvailableUsers = async () => {
try {
- const res = await $axios.get('/api/auth/users', {
- params: {
- keyword: availableUserSearchQuery,
- limit: 50
- }
- });
- availableUsers = res.items || [];
+ const params = new URLSearchParams({keyword: availableUserSearchQuery, limit: 50});
+ const res = await fetch('/api/auth/users?' + params);
+ const json_ = await res.json();
+ if (json_.code !== 200) throw new Error(json_.message);
+ availableUsers = json_.data?.items || [];
} catch (e) {
$message.error(e.message);
}
@@ -791,16 +868,35 @@
// Users to remove
const toRemove = currentUserIds.filter(id => !selectedUserIds.includes(id));
+ let res = null
for (const userId of toAdd) {
- const userRoles = await $axios.get(`/api/users/${userId}/roles`);
+ res = await fetch(`/api/users/${userId}/roles`);
+ if (res.status !== 200) {
+ const err = await res.json();
+ throw new Error(err.message);
+ }
+ const userRoles = await res.json();
const roleIds = [...userRoles.map(r => r.id), currentRole.id];
- await $axios.put(`/api/users/${userId}/roles`, { role_ids: roleIds });
+ res = await fetch(`/api/users/${userId}/roles`, {method: 'PUT', headers: {'Content-Type': 'application/json'}, body: JSON.stringify({role_ids: roleIds})});
+ if (res.status !== 200) {
+ const err = await res.json();
+ throw new Error(err.message);
+ }
}
for (const userId of toRemove) {
- const userRoles = await $axios.get(`/api/users/${userId}/roles`);
+ res = await fetch(`/api/users/${userId}/roles`);
+ if (res.status !== 200) {
+ const err = await res.json();
+ throw new Error(err.message);
+ }
+ const userRoles = await res.json();
const roleIds = userRoles.filter(r => r.id !== currentRole.id).map(r => r.id);
- await $axios.put(`/api/users/${userId}/roles`, { role_ids: roleIds });
+ res = await fetch(`/api/users/${userId}/roles`, {method: 'PUT', headers: {'Content-Type': 'application/json'}, body: JSON.stringify({role_ids: roleIds})});
+ if (res.status !== 200) {
+ const err = await res.json();
+ throw new Error(err.message);
+ }
}
$message.success($t('role.users_updated'));
@@ -815,9 +911,18 @@
if (!currentRole || currentRole.is_system) return;
try {
await $message.confirm($t('role.remove_user_confirm'));
- const userRoles = await $axios.get(`/api/users/${u.id}/roles`);
+ let res = await fetch(`/api/users/${u.id}/roles`);
+ if (res.status !== 200) {
+ const err = await res.json();
+ throw new Error(err.message);
+ }
+ const userRoles = await res.json();
const roleIds = userRoles.filter(r => r.id !== currentRole.id).map(r => r.id);
- await $axios.put(`/api/users/${u.id}/roles`, { role_ids: roleIds });
+ res = await fetch(`/api/users/${u.id}/roles`, {method: 'PUT', headers: {'Content-Type': 'application/json'}, body: JSON.stringify({role_ids: roleIds})});
+ if (res.status !== 200) {
+ const err = await res.json();
+ throw new Error(err.message);
+ }
$message.success($t('role.user_removed'));
loadRoleUsers();
} catch (e) {
diff --git a/ui/page/sys/settings.html b/ui/page/sys/settings.html
index 74bcf35..8bf5e7b 100644
--- a/ui/page/sys/settings.html
+++ b/ui/page/sys/settings.html
@@ -672,10 +672,15 @@
loadSettings = async () => {
loading = true;
try {
- const response = await $axios.get('/api/settings');
- if (response && response.items) {
+ const res = await fetch('/api/settings');
+ if (res.status !== 200) {
+ const err = await res.json();
+ throw new Error(err.message);
+ }
+ const data = await res.json();
+ if (data?.items) {
const settingsMap = {};
- response.items.forEach(item => {
+ data.items.forEach(item => {
settingsMap[item.key] = item.value;
});
settings = settingsMap;
@@ -719,7 +724,11 @@
return;
}
- await $axios.put('/api/settings', { settings: settingsToUpdate });
+ const res = await fetch('/api/settings', { method: 'PUT', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ settings: settingsToUpdate }) });
+ if (res.status !== 200) {
+ const err = await res.json();
+ throw new Error(err.message);
+ }
originalSettings = { ...settings };
$message.success($t('settings.save_success'));
} catch (error) {
diff --git a/ui/page/sys/user/index.html b/ui/page/sys/user/index.html
index 1b2a558..61e8b88 100644
--- a/ui/page/sys/user/index.html
+++ b/ui/page/sys/user/index.html
@@ -204,8 +204,13 @@
loadUsers = async () => {
try {
- const res = await $axios.get('/api/users');
- users = res.items || []; // Adjust based on actual API response structure (array or {items: []})
+ const res = await fetch('/api/users');
+ if (res.status !== 200) {
+ const err = await res.json();
+ throw new Error(err.message);
+ }
+ const data = await res.json();
+ users = data.items || []; // Adjust based on actual API response structure (array or {items: []})
} catch (e) {
$message.error(e.message);
}
@@ -245,14 +250,22 @@
if (isEdit) {
const payload = { email: formData.email };
if (formData.password) payload.password = formData.password;
- await $axios.patch(`/api/users/${formData.id}`, payload);
+ const res = await fetch(`/api/users/${formData.id}`, { method: 'PATCH', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(payload) });
+ if (res.status !== 200) {
+ const err = await res.json();
+ throw new Error(err.message);
+ }
$message.success("User updated");
} else {
if (!formData.password) {
$message.error("Password is required for new users");
return;
}
- await $axios.post('/api/users', formData);
+ const res = await fetch('/api/users', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(formData) });
+ if (res.status !== 200) {
+ const err = await res.json();
+ throw new Error(err.message);
+ }
$message.success("User created");
}
closeModal();
@@ -265,7 +278,11 @@
deleteUser = async (u) => {
try {
await $message.confirm(`Delete user "${u.username}"?`);
- await $axios.delete(`/api/users/${u.id}`);
+ const res = await fetch(`/api/users/${u.id}`, { method: 'DELETE' });
+ if (res.status !== 200) {
+ const err = await res.json();
+ throw new Error(err.message);
+ }
$message.success("Deleted");
loadUsers();
} catch (e) {
diff --git a/ui/page/user/profile.html b/ui/page/user/profile.html
index 034cb7c..0375eb4 100644
--- a/ui/page/user/profile.html
+++ b/ui/page/user/profile.html
@@ -260,14 +260,24 @@
loadBindings = async () => {
try {
// Get enabled providers
- const providersRes = await $axios.get('/api/auth/login-methods');
- providers = providersRes.methods.filter(p => p.type !== 'password' && p.type !== 'code' && p.type !== 'email_code' && p.type !== 'phone_code').map(p => ({
+ const res = await fetch('/api/auth/login-methods');
+ if (res.status !== 200) {
+ const err = await res.json();
+ throw new Error(err.message);
+ }
+ const providersData = await res.json();
+ providers = providersData.methods.filter(p => p.type !== 'password' && p.type !== 'code' && p.type !== 'email_code' && p.type !== 'phone_code').map(p => ({
code: p.type,
name: p.name
}));
// Get current bindings
- bindings = await $axios.get('/api/auth/me/bindings');
+ const resBind = await fetch('/api/auth/me/bindings');
+ if (resBind.status !== 200) {
+ const err = await resBind.json();
+ throw new Error(err.message);
+ }
+ bindings = await resBind.json();
} catch (e) {
console.error(e);
}
@@ -276,12 +286,16 @@
updateProfile = async () => {
loading = true;
try {
- await $axios.patch('/api/auth/me', {
+ const res = await fetch('/api/auth/me', { method: 'PATCH', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({
nickname: user.nickname,
email: user.email,
phone: user.phone,
avatar: user.avatar
- });
+ }) });
+ if (res.status !== 200) {
+ const err = await res.json();
+ throw new Error(err.message);
+ }
$message.success($t('common.save_success'));
await loadUser();
} catch (e) {
@@ -295,10 +309,14 @@
if (!passwordForm.new_password || !passwordForm.old_password) return;
pwdLoading = true;
try {
- await $axios.post('/api/auth/me/change-password', {
+ const res = await fetch('/api/auth/me/change-password', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({
old_password: passwordForm.old_password,
new_password: passwordForm.new_password
- });
+ }) });
+ if (res.status !== 200) {
+ const err = await res.json();
+ throw new Error(err.message);
+ }
$message.success($t('auth.password_changed'));
passwordForm.old_password = '';
passwordForm.new_password = '';
@@ -325,17 +343,15 @@
bind = async (provider) => {
try {
- // Fetch authorization URL
- const res = await $axios.get('/api/auth/authorize/thirdparty', {
- params: {
- provider: provider,
- redirect: window.location.origin + '/callback/' + provider,
- bind_mode: true
- }
- });
- // Redirect to provider auth page
- if (res.auth_url) {
- window.location.href = res.auth_url;
+ const params = new URLSearchParams({ provider, redirect: redirect || '', bind_mode: true });
+ const res = await fetch('/api/auth/authorize/thirdparty?' + params);
+ if (res.status !== 200) {
+ const err = await res.json();
+ throw new Error(err.message);
+ }
+ const data = await res.json();
+ if (data.auth_url) {
+ window.location.href = data.auth_url;
}
} catch (e) {
$message.error(e.message);
@@ -345,7 +361,11 @@
unbind = async (provider) => {
try {
await $message.confirm($t('auth.unbind_confirm'));
- await $axios.delete(`/api/auth/me/bindings/${provider}`);
+ const res = await fetch(`/api/auth/me/bindings/${provider}`, { method: 'DELETE' });
+ if (res.status !== 200) {
+ const err = await res.json();
+ throw new Error(err.message);
+ }
$message.success($t('common.success'));
loadBindings();
} catch (e) {
diff --git a/ui/routes.js b/ui/routes.js
index aea1dd2..c13f15b 100644
--- a/ui/routes.js
+++ b/ui/routes.js
@@ -1,7 +1,7 @@
const routes = [
// Public
- { path: '/login', component: '/page/auth/login.html' },
- { path: '/callback/:provider', component: '/page/auth/callback.html' },
+ { path: '/login', component: '/page/auth/login.html', layout: 'auth' },
+ { path: '/callback/:provider', component: '/page/auth/callback.html', layout: 'auth' },
// Dashboard (Default Layout)
{
diff --git a/ui/ui/langs.json b/ui/ui/langs.json
new file mode 100644
index 0000000..b1f524c
--- /dev/null
+++ b/ui/ui/langs.json
@@ -0,0 +1,8 @@
+{
+ "zh-CN": {
+ "auth.send_code": "发送验证码"
+ },
+ "en-US": {
+ "auth.send_code": "Send Code"
+ }
+}
\ No newline at end of file