hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix tests. msw has issues on firefox with vitest isolation.

Browse source
This commit is contained in:
Henry Jameson 2026-06-18 19:58:50 +03:00
commit 9d24782cd8
11 changed files with 592 additions and 863 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/api/oauth.js
View file

@ -5,7 +5,12 @@ import { paramsString, promisedRequest } from './helpers.js'
import { StatusCodeError } from 'src/services/errors/errors.js'
const REDIRECT_URI = `${window.location.origin}/oauth-callback`
const MASTODON_APP_VERIFY_URL = '/api/v1/apps/verify_credentials'
export const MASTODON_APP_VERIFY_URL = '/api/v1/apps/verify_credentials'
export const MASTODON_APP_URL = '/api/v1/apps'
export const OAUTH_TOKEN_URL = '/oauth/token'
export const OAUTH_MFA_CHALLENGE_URL = '/oauth/mfa/challenge'
export const OAUTH_REVOKE_URL = '/oauth/revoke'
export const createApp = () => {
const formData = new window.FormData()
@ -16,8 +21,8 @@ export const createApp = () => {
formData.append('scopes', 'read write follow push admin')
return promisedRequest({
url: '/api/v1/apps',
method: 'POST',
url: MASTODON_APP_URL,
formData,
}).then(({ data, ...rest }) => ({
...rest,
@ -61,7 +66,7 @@ export const getTokenWithCredentials = ({
formData.append('password', password)
return promisedRequest({
url: '/oauth/token',
url: OAUTH_TOKEN_URL,
method: 'POST',
formData,
})
@ -77,7 +82,7 @@ export const getToken = ({ clientId, clientSecret, code }) => {
formData.append('redirect_uri', `${window.location.origin}/oauth-callback`)
return promisedRequest({
url: '/oauth/token',
url: OAUTH_TOKEN_URL,
method: 'POST',
formData,
})
@ -92,7 +97,7 @@ export const getClientToken = ({ clientId, clientSecret }) => {
formData.append('redirect_uri', `${window.location.origin}/oauth-callback`)
return promisedRequest({
url: '/oauth/token',
url: OAUTH_TOKEN_URL,
method: 'POST',
formData,
})
@ -108,7 +113,7 @@ export const verifyOTPCode = ({ app, mfaToken, code }) => {
formData.append('challenge_type', 'totp')
return promisedRequest({
url: '/oauth/mfa/challenge',
url: OAUTH_MFA_CHALLENGE_URL,
method: 'POST',
formData,
})
@ -124,7 +129,7 @@ export const verifyRecoveryCode = ({ app, mfaToken, code }) => {
formData.append('challenge_type', 'recovery')
return promisedRequest({
url: '/oauth/mfa/challenge',
url: OAUTH_MFA_CHALLENGE_URL,
method: 'POST',
formData,
})
@ -138,7 +143,7 @@ export const revokeToken = ({ app, token }) => {
formData.append('token', token)
return promisedRequest({
url: '/oauth/revoke',
url: OAUTH_REVOKE_URL,
method: 'POST',
formData,
})

10
src/api/user.js
View file

@ -44,8 +44,8 @@ const MASTODON_DENY_USER_URL = (id) => `/api/v1/follow_requests/${id}/reject`
const MASTODON_USER_RELATIONSHIPS_URL = ({ id, withSuspended }) =>
`/api/v1/accounts/relationships/${paramsString({ id, withSuspended })}`
const MASTODON_USER_IN_LISTS = (id) => `/api/v1/accounts/${id}/lists`
const MASTODON_LIST_URL = (id) => `/api/v1/lists/${id}`
const MASTODON_LIST_ACCOUNTS_URL = (id) => `/api/v1/lists/${id}/accounts`
export const MASTODON_LIST_URL = (id) => `/api/v1/lists/${id}`
export const MASTODON_LIST_ACCOUNTS_URL = (id) => `/api/v1/lists/${id}/accounts`
const MASTODON_USER_BLOCKS_URL = ({
maxId,
sinceId,
@ -80,7 +80,6 @@ const MASTODON_UNPIN_OWN_STATUS = (id) => `/api/v1/statuses/${id}/unpin`
const MASTODON_MUTE_CONVERSATION = (id) => `/api/v1/statuses/${id}/mute`
const MASTODON_UNMUTE_CONVERSATION = (id) => `/api/v1/statuses/${id}/unmute`
const MASTODON_DOMAIN_BLOCKS_URL = '/api/v1/domain_blocks'
const MASTODON_LISTS_URL = '/api/v1/lists'
const MASTODON_ANNOUNCEMENTS_URL = '/api/v1/announcements'
const MASTODON_ANNOUNCEMENTS_DISMISS_URL = (id) =>
`/api/v1/announcements/${id}/dismiss`
@ -824,13 +823,13 @@ export const revokeOAuthToken = ({ id, credentials }) =>
// #Lists
export const fetchLists = ({ credentials }) =>
promisedRequest({
url: MASTODON_LISTS_URL,
url: MASTODON_LIST_URL(),
credentials,
})
export const createList = ({ title, credentials }) =>
promisedRequest({
url: MASTODON_LISTS_URL,
url: MASTODON_LIST_URL(),
credentials,
method: 'POST',
payload: { title },
@ -843,6 +842,7 @@ export const getList = ({ listId, credentials }) =>
})
export const updateList = ({ listId, title, credentials }) =>
console.log('PUT', MASTODON_LIST_URL(listId)) ||
promisedRequest({
url: MASTODON_LIST_URL(listId),