refactor: append / to api

This commit is contained in:
Tristan Yang
2023-04-18 10:54:53 +08:00
parent 56b5d2cee5
commit 72c4dbd69f
4 changed files with 34 additions and 33 deletions
+3 -3
View File
@@ -76,7 +76,7 @@ export const authApi = createApi({
}), }),
register: builder.mutation<UserRegResponse, UserRegDTO>({ register: builder.mutation<UserRegResponse, UserRegDTO>({
query: (data) => ({ query: (data) => ({
url: `user/register`, url: `/user/register`,
method: "POST", method: "POST",
body: { body: {
...data, ...data,
@@ -140,7 +140,7 @@ export const authApi = createApi({
headers: { headers: {
accept: "text/plain" accept: "text/plain"
}, },
url: `user/send_login_magic_link?email=${encodeURIComponent(email)}`, url: `/user/send_login_magic_link?email=${encodeURIComponent(email)}`,
method: "POST", method: "POST",
responseHandler: "text" responseHandler: "text"
}) })
@@ -157,7 +157,7 @@ export const authApi = createApi({
} }
>({ >({
query: (data) => ({ query: (data) => ({
url: `user/send_reg_magic_link`, url: `/user/send_reg_magic_link`,
method: "POST", method: "POST",
body: data body: data
}) })
+10 -9
View File
@@ -18,13 +18,13 @@ export const channelApi = createApi({
refetchOnFocus: true, refetchOnFocus: true,
endpoints: (builder) => ({ endpoints: (builder) => ({
getChannels: builder.query<Channel[], void>({ getChannels: builder.query<Channel[], void>({
query: () => ({ url: `group` }) query: () => ({ url: `/group` })
}), }),
getChannel: builder.query<Channel, number>({ getChannel: builder.query<Channel, number>({
query: (id) => ({ url: `group/${id}` }) query: (id) => ({ url: `/group/${id}` })
}), }),
leaveChannel: builder.query<void, number>({ leaveChannel: builder.query<void, number>({
query: (id) => ({ url: `group/${id}/leave` }), query: (id) => ({ url: `/group/${id}/leave` }),
async onQueryStarted(gid, { dispatch, queryFulfilled }) { async onQueryStarted(gid, { dispatch, queryFulfilled }) {
try { try {
await queryFulfilled; await queryFulfilled;
@@ -43,7 +43,7 @@ export const channelApi = createApi({
}), }),
changeChannelType: builder.mutation<number, { is_public: boolean, id: number, members?: number[] }>({ changeChannelType: builder.mutation<number, { is_public: boolean, id: number, members?: number[] }>({
query: ({ id, is_public, members }) => ({ query: ({ id, is_public, members }) => ({
url: `group/${id}/change_type`, url: `/group/${id}/change_type`,
method: "POST", method: "POST",
body: members ? { is_public, members } : { is_public } body: members ? { is_public, members } : { is_public }
}), }),
@@ -61,7 +61,7 @@ export const channelApi = createApi({
}), }),
updateChannel: builder.mutation<void, ChannelDTO>({ updateChannel: builder.mutation<void, ChannelDTO>({
query: ({ id, ...data }) => ({ query: ({ id, ...data }) => ({
url: `group/${id}`, url: `/group/${id}`,
method: "PUT", method: "PUT",
body: data body: data
}), }),
@@ -97,7 +97,7 @@ export const channelApi = createApi({
}), }),
removeChannel: builder.query<void, number>({ removeChannel: builder.query<void, number>({
query: (id) => ({ query: (id) => ({
url: `group/${id}`, url: `/group/${id}`,
method: "DELETE" method: "DELETE"
}), }),
async onQueryStarted(id, { dispatch, getState, queryFulfilled }) { async onQueryStarted(id, { dispatch, getState, queryFulfilled }) {
@@ -142,7 +142,7 @@ export const channelApi = createApi({
? btoa(unescape(encodeURIComponent(JSON.stringify(properties)))) ? btoa(unescape(encodeURIComponent(JSON.stringify(properties))))
: "" : ""
}, },
url: `group/${id}/send`, url: `/group/${id}/send`,
method: "POST", method: "POST",
body: type == "file" ? JSON.stringify(content) : content body: type == "file" ? JSON.stringify(content) : content
}), }),
@@ -152,14 +152,14 @@ export const channelApi = createApi({
}), }),
addMembers: builder.mutation<void, { id: number; members: number[] }>({ addMembers: builder.mutation<void, { id: number; members: number[] }>({
query: ({ id, members }) => ({ query: ({ id, members }) => ({
url: `group/${id}/members/add`, url: `/group/${id}/members/add`,
method: "POST", method: "POST",
body: members body: members
}) })
}), }),
removeMembers: builder.mutation<void, { id: number; members: number[] }>({ removeMembers: builder.mutation<void, { id: number; members: number[] }>({
query: ({ id, members }) => ({ query: ({ id, members }) => ({
url: `group/${id}/members/remove`, url: `/group/${id}/members/remove`,
method: "POST", method: "POST",
body: members body: members
}) })
@@ -196,6 +196,7 @@ export const {
useLazyCreateInviteLinkQuery, useLazyCreateInviteLinkQuery,
useCreateInviteLinkQuery, useCreateInviteLinkQuery,
useGetChannelQuery, useGetChannelQuery,
useLazyGetChannelQuery,
useUpdateChannelMutation, useUpdateChannelMutation,
useLazyRemoveChannelQuery, useLazyRemoveChannelQuery,
useGetChannelsQuery, useGetChannelsQuery,
+16 -16
View File
@@ -32,7 +32,7 @@ export const serverApi = createApi({
baseQuery, baseQuery,
endpoints: (builder) => ({ endpoints: (builder) => ({
getServer: builder.query<Server, void>({ getServer: builder.query<Server, void>({
query: () => ({ url: `admin/system/organization` }), query: () => ({ url: `/admin/system/organization` }),
async onQueryStarted(data, { dispatch, queryFulfilled }) { async onQueryStarted(data, { dispatch, queryFulfilled }) {
try { try {
const { data: server } = await queryFulfilled; const { data: server } = await queryFulfilled;
@@ -77,24 +77,24 @@ export const serverApi = createApi({
} }
}), }),
getFirebaseConfig: builder.query<FirebaseConfig, void>({ getFirebaseConfig: builder.query<FirebaseConfig, void>({
query: () => ({ url: `admin/fcm/config` }) query: () => ({ url: `/admin/fcm/config` })
}), }),
getGoogleAuthConfig: builder.query<GoogleAuthConfig, void>({ getGoogleAuthConfig: builder.query<GoogleAuthConfig, void>({
query: () => ({ url: `admin/google_auth/config` }) query: () => ({ url: `/admin/google_auth/config` })
}), }),
updateGoogleAuthConfig: builder.mutation<void, GoogleAuthConfig>({ updateGoogleAuthConfig: builder.mutation<void, GoogleAuthConfig>({
query: (data) => ({ query: (data) => ({
url: `admin/google_auth/config`, url: `/admin/google_auth/config`,
method: "POST", method: "POST",
body: data body: data
}) })
}), }),
getGithubAuthConfig: builder.query<GithubAuthConfig, void>({ getGithubAuthConfig: builder.query<GithubAuthConfig, void>({
query: () => ({ url: `admin/github_auth/config` }) query: () => ({ url: `/admin/github_auth/config` })
}), }),
updateGithubAuthConfig: builder.mutation<void, GithubAuthConfig>({ updateGithubAuthConfig: builder.mutation<void, GithubAuthConfig>({
query: (data) => ({ query: (data) => ({
url: `admin/github_auth/config`, url: `/admin/github_auth/config`,
method: "POST", method: "POST",
body: data body: data
}) })
@@ -108,17 +108,17 @@ export const serverApi = createApi({
}), }),
updateFirebaseConfig: builder.mutation<void, FirebaseConfig>({ updateFirebaseConfig: builder.mutation<void, FirebaseConfig>({
query: (data) => ({ query: (data) => ({
url: `admin/fcm/config`, url: `/admin/fcm/config`,
method: "POST", method: "POST",
body: data body: data
}) })
}), }),
getAgoraConfig: builder.query<AgoraConfig, void>({ getAgoraConfig: builder.query<AgoraConfig, void>({
query: () => ({ url: `admin/agora/config` }) query: () => ({ url: `/admin/agora/config` })
}), }),
updateAgoraConfig: builder.mutation<void, AgoraConfig>({ updateAgoraConfig: builder.mutation<void, AgoraConfig>({
query: (data) => ({ query: (data) => ({
url: `admin/agora/config`, url: `/admin/agora/config`,
method: "POST", method: "POST",
body: data body: data
}) })
@@ -158,7 +158,7 @@ export const serverApi = createApi({
} }
}), }),
getSystemCommon: builder.query<SystemCommon, void>({ getSystemCommon: builder.query<SystemCommon, void>({
query: () => ({ url: `admin/system/common` }), query: () => ({ url: `/admin/system/common` }),
async onQueryStarted(data, { dispatch, queryFulfilled }) { async onQueryStarted(data, { dispatch, queryFulfilled }) {
try { try {
const resp = await queryFulfilled; const resp = await queryFulfilled;
@@ -172,7 +172,7 @@ export const serverApi = createApi({
}), }),
updateSystemCommon: builder.mutation<void, Partial<SystemCommon>>({ updateSystemCommon: builder.mutation<void, Partial<SystemCommon>>({
query: (data) => ({ query: (data) => ({
url: `admin/system/common`, url: `/admin/system/common`,
method: "PUT", method: "PUT",
body: data body: data
}), }),
@@ -188,24 +188,24 @@ export const serverApi = createApi({
} }
}), }),
getSMTPConfig: builder.query<SMTPConfig, void>({ getSMTPConfig: builder.query<SMTPConfig, void>({
query: () => ({ url: `admin/smtp/config` }) query: () => ({ url: `/admin/smtp/config` })
}), }),
getSMTPStatus: builder.query<boolean, void>({ getSMTPStatus: builder.query<boolean, void>({
query: () => ({ url: `/admin/smtp/enabled` }) query: () => ({ url: `/admin/smtp/enabled` })
}), }),
updateSMTPConfig: builder.mutation<void, SMTPConfig>({ updateSMTPConfig: builder.mutation<void, SMTPConfig>({
query: (data) => ({ query: (data) => ({
url: `admin/smtp/config`, url: `/admin/smtp/config`,
method: "POST", method: "POST",
body: data body: data
}) })
}), }),
getLoginConfig: builder.query<LoginConfig, void>({ getLoginConfig: builder.query<LoginConfig, void>({
query: () => ({ url: `admin/login/config` }) query: () => ({ url: `/admin/login/config` })
}), }),
updateLoginConfig: builder.mutation<void, Partial<LoginConfig>>({ updateLoginConfig: builder.mutation<void, Partial<LoginConfig>>({
query: (data) => ({ query: (data) => ({
url: `admin/login/config`, url: `/admin/login/config`,
method: "POST", method: "POST",
body: data body: data
}) })
@@ -215,7 +215,7 @@ export const serverApi = createApi({
headers: { headers: {
"content-type": "image/png" "content-type": "image/png"
}, },
url: `admin/system/organization/logo`, url: `/admin/system/organization/logo`,
method: "POST", method: "POST",
body: data body: data
}), }),
+5 -5
View File
@@ -95,7 +95,7 @@ export const userApi = createApi({
headers: { headers: {
"content-type": "image/png" "content-type": "image/png"
}, },
url: `user/avatar`, url: `/user/avatar`,
method: "POST", method: "POST",
body: data body: data
}) })
@@ -105,7 +105,7 @@ export const userApi = createApi({
headers: { headers: {
"content-type": "image/png" "content-type": "image/png"
}, },
url: `admin/user/${uid}/avatar`, url: `/admin/user/${uid}/avatar`,
method: "POST", method: "POST",
body: file body: file
}) })
@@ -116,7 +116,7 @@ export const userApi = createApi({
// bot operations // bot operations
createBotAPIKey: builder.mutation<void, { uid: number, name: string }>({ createBotAPIKey: builder.mutation<void, { uid: number, name: string }>({
query: ({ uid, name }) => ({ query: ({ uid, name }) => ({
url: `admin/user/bot-api-key/${uid}`, url: `/admin/user/bot-api-key/${uid}`,
method: "POST", method: "POST",
body: { name }, body: { name },
}), }),
@@ -131,7 +131,7 @@ export const userApi = createApi({
// bot operations end // bot operations end
updateInfo: builder.mutation<User, UserDTO>({ updateInfo: builder.mutation<User, UserDTO>({
query: (data) => ({ query: (data) => ({
url: `user`, url: `/user`,
method: "PUT", method: "PUT",
body: data body: data
}) })
@@ -147,7 +147,7 @@ export const userApi = createApi({
? btoa(unescape(encodeURIComponent(JSON.stringify(properties)))) ? btoa(unescape(encodeURIComponent(JSON.stringify(properties))))
: "" : ""
}, },
url: `user/${id}/send`, url: `/user/${id}/send`,
method: "POST", method: "POST",
body: type == "file" ? JSON.stringify(content) : content body: type == "file" ? JSON.stringify(content) : content
}), }),