Skip to content
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

feat: single origin for requests #975

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat: single origin for requests #975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
131d7d2
fix: apply single origin to currentMember
spaenleh Oct 28, 2024
a91aac1
fix: update more endpoints
spaenleh Oct 28, 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
2 changes: 1 addition & 1 deletion src/hooks/mention.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ describe('Chat Mention Hooks', () => {
});

describe('useMentions', () => {
const currentMemberRoute = `/${buildGetCurrentMemberRoute()}`;
const currentMemberRoute = `/api/${buildGetCurrentMemberRoute()}`;
const route = `/${buildGetMemberMentionsRoute()}`;
const key = buildMentionKey();

Expand Down
78 changes: 27 additions & 51 deletions src/member/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ import {
UUID,
} from '@graasp/sdk';

import { AxiosProgressEvent } from 'axios';
import axios from 'axios';
import type { AxiosProgressEvent } from 'axios';
import { StatusCodes } from 'http-status-codes';

import { verifyAuthentication } from '../api/axios.js';
Expand All @@ -25,7 +26,6 @@ import {
buildGetMemberRoute,
buildGetMemberStorageFilesRoute,
buildGetMemberStorageRoute,
buildGetMembersByEmailRoute,
buildGetMembersByIdRoute,
buildPatchCurrentMemberRoute,
buildPatchMemberPasswordRoute,
Expand All @@ -34,37 +34,18 @@ import {
buildUploadAvatarRoute,
} from './routes.js';

export const getMembersByEmail = async (
{ emails }: { emails: string[] },
{ API_HOST, axios }: PartialQueryConfigForApi,
) =>
axios
.get<ResultOf<Member>>(`${API_HOST}/${buildGetMembersByEmailRoute(emails)}`)
.then(({ data }) => data);

export const getMember = async (
{ id }: { id: UUID },
{ API_HOST, axios }: PartialQueryConfigForApi,
) =>
axios
.get<Member>(`${API_HOST}/${buildGetMemberRoute(id)}`)
.then(({ data }) => data);
export const getMember = async ({ id }: { id: UUID }) =>
axios.get<Member>(`/api/${buildGetMemberRoute(id)}`).then(({ data }) => data);

export const getMembers = (
{ ids }: { ids: UUID[] },
{ API_HOST, axios }: PartialQueryConfigForApi,
) =>
export const getMembers = ({ ids }: { ids: UUID[] }) =>
axios
.get<ResultOf<Member>>(`${API_HOST}/${buildGetMembersByIdRoute(ids)}`)
.get<ResultOf<Member>>(`/api/${buildGetMembersByIdRoute(ids)}`)
.then(({ data }) => data);

export const getCurrentMember = async ({
API_HOST,
axios,
}: PartialQueryConfigForApi) =>
export const getCurrentMember = async () =>
verifyAuthentication(() =>
axios
.get<CurrentAccount>(`${API_HOST}/${buildGetCurrentMemberRoute()}`)
.get<CurrentAccount>(`/api/${buildGetCurrentMemberRoute()}`)
.then(({ data }) => data)
.catch((error) => {
if (error.response) {
Expand All @@ -78,24 +59,18 @@ export const getCurrentMember = async ({
}),
);

export const getMemberStorage = async ({
API_HOST,
axios,
}: PartialQueryConfigForApi) =>
export const getMemberStorage = async () =>
verifyAuthentication(() =>
axios
.get<MemberStorage>(`${API_HOST}/${buildGetMemberStorageRoute()}`)
.get<MemberStorage>(`/api/${buildGetMemberStorageRoute()}`)
.then(({ data }) => data),
);

export const getMemberStorageFiles = async (
pagination: Partial<Pagination>,
{ API_HOST, axios }: PartialQueryConfigForApi,
) =>
export const getMemberStorageFiles = async (pagination: Partial<Pagination>) =>
axios
.get<
Paginated<MemberStorageItem>
>(`${API_HOST}/${buildGetMemberStorageFilesRoute(pagination)}`)
>(`/api/${buildGetMemberStorageFilesRoute(pagination)}`)
.then(({ data }) => data);

export const editCurrentMember = async (
Expand All @@ -108,7 +83,7 @@ export const editCurrentMember = async (
name?: string;
enableSaveActions?: boolean;
},
{ API_HOST, axios }: PartialQueryConfigForApi,
{ API_HOST }: PartialQueryConfigForApi,
) => {
const url = new URL(buildPatchCurrentMemberRoute(), API_HOST);
const body: Partial<
Expand All @@ -135,7 +110,6 @@ export const editCurrentMember = async (

export const deleteCurrentMember = async ({
API_HOST,
axios,
}: PartialQueryConfigForApi) =>
verifyAuthentication(() =>
axios
Expand All @@ -145,15 +119,15 @@ export const deleteCurrentMember = async ({

export const createPassword = async (
payload: { password: Password },
{ API_HOST, axios }: PartialQueryConfigForApi,
{ API_HOST }: PartialQueryConfigForApi,
) =>
axios
.post<void>(`${API_HOST}/${buildPostMemberPasswordRoute()}`, payload)
.then((data) => data);

export const updatePassword = async (
payload: { password: Password; currentPassword: Password },
{ API_HOST, axios }: PartialQueryConfigForApi,
{ API_HOST }: PartialQueryConfigForApi,
) =>
axios
.patch<void>(`${API_HOST}/${buildPatchMemberPasswordRoute()}`, payload)
Expand All @@ -164,7 +138,7 @@ export const uploadAvatar = async (
file: Blob;
onUploadProgress?: (progressEvent: AxiosProgressEvent) => void;
},
{ API_HOST, axios }: PartialQueryConfigForApi,
{ API_HOST }: PartialQueryConfigForApi,
) => {
const { file } = args;
const itemPayload = new FormData();
Expand All @@ -186,7 +160,7 @@ export const uploadAvatar = async (

export const downloadAvatar = async (
{ id, size = DEFAULT_THUMBNAIL_SIZE }: { id: UUID; size?: string },
{ API_HOST, axios }: PartialQueryConfigForApi,
{ API_HOST }: PartialQueryConfigForApi,
) =>
axios
.get<Blob>(
Expand All @@ -197,27 +171,30 @@ export const downloadAvatar = async (
)
.then(({ data }) => data);

export const downloadAvatarUrl = async (
{ id, size = DEFAULT_THUMBNAIL_SIZE }: { id: UUID; size?: string },
{ API_HOST, axios }: PartialQueryConfigForApi,
) =>
export const downloadAvatarUrl = async ({
id,
size = DEFAULT_THUMBNAIL_SIZE,
}: {
id: UUID;
size?: string;
}) =>
axios
.get<string>(
`${API_HOST}/${buildDownloadAvatarRoute({ id, size, replyUrl: true })}`,
`/api/${buildDownloadAvatarRoute({ id, size, replyUrl: true })}`,
)
.then(({ data }) => data);

export const updateEmail = async (
email: string,
{ API_HOST, axios }: PartialQueryConfigForApi,
{ API_HOST }: PartialQueryConfigForApi,
) =>
axios.post<void>(`${API_HOST}/${buildPostMemberEmailUpdateRoute()}`, {
email,
});

export const validateEmailUpdate = async (
token: string,
{ API_HOST, axios }: PartialQueryConfigForApi,
{ API_HOST }: PartialQueryConfigForApi,
) =>
axios.patch<void>(
`${API_HOST}/${buildPostMemberEmailUpdateRoute()}`,
Expand All @@ -229,7 +206,6 @@ export const validateEmailUpdate = async (
// Define the function to export member data
export const exportMemberData = async ({
API_HOST,
axios,
}: PartialQueryConfigForApi) =>
axios
.post<void>(`${API_HOST}/${buildExportMemberDataRoute()}`)
Expand Down
Loading