From 72c4dbd69ff4d4577e4022e2959ef05519afbb11 Mon Sep 17 00:00:00 2001 From: Tristan Yang Date: Tue, 18 Apr 2023 10:54:53 +0800 Subject: [PATCH] refactor: append / to api --- src/app/services/auth.ts | 6 +++--- src/app/services/channel.ts | 19 ++++++++++--------- src/app/services/server.ts | 32 ++++++++++++++++---------------- src/app/services/user.ts | 10 +++++----- 4 files changed, 34 insertions(+), 33 deletions(-) diff --git a/src/app/services/auth.ts b/src/app/services/auth.ts index ef95d760..5cb30de7 100644 --- a/src/app/services/auth.ts +++ b/src/app/services/auth.ts @@ -76,7 +76,7 @@ export const authApi = createApi({ }), register: builder.mutation({ query: (data) => ({ - url: `user/register`, + url: `/user/register`, method: "POST", body: { ...data, @@ -140,7 +140,7 @@ export const authApi = createApi({ headers: { accept: "text/plain" }, - url: `user/send_login_magic_link?email=${encodeURIComponent(email)}`, + url: `/user/send_login_magic_link?email=${encodeURIComponent(email)}`, method: "POST", responseHandler: "text" }) @@ -157,7 +157,7 @@ export const authApi = createApi({ } >({ query: (data) => ({ - url: `user/send_reg_magic_link`, + url: `/user/send_reg_magic_link`, method: "POST", body: data }) diff --git a/src/app/services/channel.ts b/src/app/services/channel.ts index c34498d3..9c13fcb5 100644 --- a/src/app/services/channel.ts +++ b/src/app/services/channel.ts @@ -18,13 +18,13 @@ export const channelApi = createApi({ refetchOnFocus: true, endpoints: (builder) => ({ getChannels: builder.query({ - query: () => ({ url: `group` }) + query: () => ({ url: `/group` }) }), getChannel: builder.query({ - query: (id) => ({ url: `group/${id}` }) + query: (id) => ({ url: `/group/${id}` }) }), leaveChannel: builder.query({ - query: (id) => ({ url: `group/${id}/leave` }), + query: (id) => ({ url: `/group/${id}/leave` }), async onQueryStarted(gid, { dispatch, queryFulfilled }) { try { await queryFulfilled; @@ -43,7 +43,7 @@ export const channelApi = createApi({ }), changeChannelType: builder.mutation({ query: ({ id, is_public, members }) => ({ - url: `group/${id}/change_type`, + url: `/group/${id}/change_type`, method: "POST", body: members ? { is_public, members } : { is_public } }), @@ -61,7 +61,7 @@ export const channelApi = createApi({ }), updateChannel: builder.mutation({ query: ({ id, ...data }) => ({ - url: `group/${id}`, + url: `/group/${id}`, method: "PUT", body: data }), @@ -97,7 +97,7 @@ export const channelApi = createApi({ }), removeChannel: builder.query({ query: (id) => ({ - url: `group/${id}`, + url: `/group/${id}`, method: "DELETE" }), async onQueryStarted(id, { dispatch, getState, queryFulfilled }) { @@ -142,7 +142,7 @@ export const channelApi = createApi({ ? btoa(unescape(encodeURIComponent(JSON.stringify(properties)))) : "" }, - url: `group/${id}/send`, + url: `/group/${id}/send`, method: "POST", body: type == "file" ? JSON.stringify(content) : content }), @@ -152,14 +152,14 @@ export const channelApi = createApi({ }), addMembers: builder.mutation({ query: ({ id, members }) => ({ - url: `group/${id}/members/add`, + url: `/group/${id}/members/add`, method: "POST", body: members }) }), removeMembers: builder.mutation({ query: ({ id, members }) => ({ - url: `group/${id}/members/remove`, + url: `/group/${id}/members/remove`, method: "POST", body: members }) @@ -196,6 +196,7 @@ export const { useLazyCreateInviteLinkQuery, useCreateInviteLinkQuery, useGetChannelQuery, + useLazyGetChannelQuery, useUpdateChannelMutation, useLazyRemoveChannelQuery, useGetChannelsQuery, diff --git a/src/app/services/server.ts b/src/app/services/server.ts index 3effb94e..08de66c0 100644 --- a/src/app/services/server.ts +++ b/src/app/services/server.ts @@ -32,7 +32,7 @@ export const serverApi = createApi({ baseQuery, endpoints: (builder) => ({ getServer: builder.query({ - query: () => ({ url: `admin/system/organization` }), + query: () => ({ url: `/admin/system/organization` }), async onQueryStarted(data, { dispatch, queryFulfilled }) { try { const { data: server } = await queryFulfilled; @@ -77,24 +77,24 @@ export const serverApi = createApi({ } }), getFirebaseConfig: builder.query({ - query: () => ({ url: `admin/fcm/config` }) + query: () => ({ url: `/admin/fcm/config` }) }), getGoogleAuthConfig: builder.query({ - query: () => ({ url: `admin/google_auth/config` }) + query: () => ({ url: `/admin/google_auth/config` }) }), updateGoogleAuthConfig: builder.mutation({ query: (data) => ({ - url: `admin/google_auth/config`, + url: `/admin/google_auth/config`, method: "POST", body: data }) }), getGithubAuthConfig: builder.query({ - query: () => ({ url: `admin/github_auth/config` }) + query: () => ({ url: `/admin/github_auth/config` }) }), updateGithubAuthConfig: builder.mutation({ query: (data) => ({ - url: `admin/github_auth/config`, + url: `/admin/github_auth/config`, method: "POST", body: data }) @@ -108,17 +108,17 @@ export const serverApi = createApi({ }), updateFirebaseConfig: builder.mutation({ query: (data) => ({ - url: `admin/fcm/config`, + url: `/admin/fcm/config`, method: "POST", body: data }) }), getAgoraConfig: builder.query({ - query: () => ({ url: `admin/agora/config` }) + query: () => ({ url: `/admin/agora/config` }) }), updateAgoraConfig: builder.mutation({ query: (data) => ({ - url: `admin/agora/config`, + url: `/admin/agora/config`, method: "POST", body: data }) @@ -158,7 +158,7 @@ export const serverApi = createApi({ } }), getSystemCommon: builder.query({ - query: () => ({ url: `admin/system/common` }), + query: () => ({ url: `/admin/system/common` }), async onQueryStarted(data, { dispatch, queryFulfilled }) { try { const resp = await queryFulfilled; @@ -172,7 +172,7 @@ export const serverApi = createApi({ }), updateSystemCommon: builder.mutation>({ query: (data) => ({ - url: `admin/system/common`, + url: `/admin/system/common`, method: "PUT", body: data }), @@ -188,24 +188,24 @@ export const serverApi = createApi({ } }), getSMTPConfig: builder.query({ - query: () => ({ url: `admin/smtp/config` }) + query: () => ({ url: `/admin/smtp/config` }) }), getSMTPStatus: builder.query({ query: () => ({ url: `/admin/smtp/enabled` }) }), updateSMTPConfig: builder.mutation({ query: (data) => ({ - url: `admin/smtp/config`, + url: `/admin/smtp/config`, method: "POST", body: data }) }), getLoginConfig: builder.query({ - query: () => ({ url: `admin/login/config` }) + query: () => ({ url: `/admin/login/config` }) }), updateLoginConfig: builder.mutation>({ query: (data) => ({ - url: `admin/login/config`, + url: `/admin/login/config`, method: "POST", body: data }) @@ -215,7 +215,7 @@ export const serverApi = createApi({ headers: { "content-type": "image/png" }, - url: `admin/system/organization/logo`, + url: `/admin/system/organization/logo`, method: "POST", body: data }), diff --git a/src/app/services/user.ts b/src/app/services/user.ts index d9b11c19..8b381996 100644 --- a/src/app/services/user.ts +++ b/src/app/services/user.ts @@ -95,7 +95,7 @@ export const userApi = createApi({ headers: { "content-type": "image/png" }, - url: `user/avatar`, + url: `/user/avatar`, method: "POST", body: data }) @@ -105,7 +105,7 @@ export const userApi = createApi({ headers: { "content-type": "image/png" }, - url: `admin/user/${uid}/avatar`, + url: `/admin/user/${uid}/avatar`, method: "POST", body: file }) @@ -116,7 +116,7 @@ export const userApi = createApi({ // bot operations createBotAPIKey: builder.mutation({ query: ({ uid, name }) => ({ - url: `admin/user/bot-api-key/${uid}`, + url: `/admin/user/bot-api-key/${uid}`, method: "POST", body: { name }, }), @@ -131,7 +131,7 @@ export const userApi = createApi({ // bot operations end updateInfo: builder.mutation({ query: (data) => ({ - url: `user`, + url: `/user`, method: "PUT", body: data }) @@ -147,7 +147,7 @@ export const userApi = createApi({ ? btoa(unescape(encodeURIComponent(JSON.stringify(properties)))) : "" }, - url: `user/${id}/send`, + url: `/user/${id}/send`, method: "POST", body: type == "file" ? JSON.stringify(content) : content }),