mirrors/barkey
1
0
Fork 0
mirror of https://codeberg.org/yeentown/barkey.git synced 2025-07-07 12:36:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

pass token in Authorization header instead of i property

Browse source
This commit is contained in:
Hazelnoot 2025-05-08 22:40:44 -04:00
parent 2acf7fa46d
commit 2d48387f49
5 changed files with 47 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
packages/frontend/src/accounts.ts
View file

@ -63,11 +63,10 @@ function fetchAccount(token: string, id?: string, forceShowDialog?: boolean): Pr
return new Promise((done, fail) => {
window.fetch(`${apiUrl}/i`, {
method: 'POST',
body: JSON.stringify({
i: token,
}),
body: '{}',
headers: {
'Content-Type': 'application/json',
'Authorization': `Bearer ${token}`,
},
})
.then(res => new Promise<Misskey.entities.MeDetailed | { error: Record<string, any> }>((done2, fail2) => {

5
packages/frontend/src/components/MkCropperDialog.vue
View file

@ -73,12 +73,12 @@ const ok = async () => {
const croppedCanvas = await croppedSection?.$toCanvas({ width: widthToRender });
croppedCanvas?.toBlob(blob => {
if (!blob) return;
if (!$i) return;
const formData = new FormData();
formData.append('file', blob);
formData.append('name', `cropped_${props.file.name}`);
formData.append('isSensitive', props.file.isSensitive ? 'true' : 'false');
if (props.file.comment) { formData.append('comment', props.file.comment);}
formData.append('i', $i!.token);
if (props.uploadFolder) {
formData.append('folderId', props.uploadFolder);
} else if (props.uploadFolder !== null && prefer.s.uploadFolder) {
@ -88,6 +88,9 @@ const ok = async () => {
window.fetch(apiUrl + '/drive/files/create', {
method: 'POST',
body: formData,
headers: {
'Authorization': `Bearer ${$i.token}`,
},
})
.then(response => response.json())
.then(f => {

4
packages/frontend/src/pages/drop-and-fusion.game.vue
View file

@ -908,7 +908,6 @@ function getGameImageDriveFile() {
formData.append('file', blob);
formData.append('name', `bubble-game-${Date.now()}.png`);
formData.append('isSensitive', 'false');
formData.append('i', $i.token);
if (prefer.s.uploadFolder) {
formData.append('folderId', prefer.s.uploadFolder);
}
@ -916,6 +915,9 @@ function getGameImageDriveFile() {
window.fetch(apiUrl + '/drive/files/create', {
method: 'POST',
body: formData,
headers: {
'Authorization': `Bearer ${$i.token}`,
},
})
.then(response => response.json())
.then(f => {

2
packages/frontend/src/signout.ts
View file

@ -56,11 +56,11 @@ export async function signout() {
await window.fetch(`${apiUrl}/sw/unregister`, {
method: 'POST',
body: JSON.stringify({
i: $i.token,
endpoint: push.endpoint,
}),
headers: {
'Content-Type': 'application/json',
'Authorization': `Bearer ${$i.token}`,
},
});
}

44
packages/frontend/src/utility/misskey-api.ts
View file

@ -29,7 +29,7 @@ export function misskeyApi<
_ResT = ResT extends void ? Response<E, P> : ResT,
>(
endpoint: E,
data: P & { i?: string | null; } = {} as any,
data: P & { i?: string | null; } = {} as P & {},
token?: string | null | undefined,
signal?: AbortSignal,
): Promise<_ResT> {
@ -41,9 +41,23 @@ export function misskeyApi<
};
const promise = new Promise<_ResT>((resolve, reject) => {
const headers: Record<string, string> = {
'Content-Type': 'application/json',
};
// Append a credential
if ($i) data.i = $i.token;
if (token !== undefined) data.i = token;
const auth = token !== undefined
? token
: data.i !== undefined
? data.i
: $i?.token;
if (auth) {
headers['Authorization'] = `Bearer ${auth}`;
}
// Don't let the body value leak through
delete data.i;
// Send request
window.fetch(`${apiUrl}/${endpoint}`, {
@ -51,9 +65,7 @@ export function misskeyApi<
body: JSON.stringify(data),
credentials: 'omit',
cache: 'no-cache',
headers: {
'Content-Type': 'application/json',
},
headers,
signal,
}).then(async (res) => {
const body = res.status === 204 ? null : await res.json();
@ -81,7 +93,9 @@ export function misskeyApiGet<
_ResT = ResT extends void ? Misskey.api.SwitchCaseResponseType<E, P> : ResT,
>(
endpoint: E,
data: P = {} as any,
data: P & { i?: string | null; } = {} as P & {},
token?: string | null | undefined,
signal?: AbortSignal,
): Promise<_ResT> {
pendingApiRequestsCount.value++;
@ -92,11 +106,27 @@ export function misskeyApiGet<
const query = new URLSearchParams(data as any);
const promise = new Promise<_ResT>((resolve, reject) => {
// Append a credential
const auth = token !== undefined
? token
: data.i !== undefined
? data.i
: $i?.token;
const headers = auth
? { 'Authorization': `Bearer ${auth}` }
: undefined;
// Don't let the body value leak through
query.delete('i');
// Send request
window.fetch(`${apiUrl}/${endpoint}?${query}`, {
method: 'GET',
credentials: 'omit',
cache: 'default',
headers,
signal,
}).then(async (res) => {
const body = res.status === 204 ? null : await res.json();