matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

pl-api: allow username+password log in with iceshrimp.net

Browse Source 
Signed-off-by: Nicole Mikołajczyk <git@mkljczk.pl>
This commit is contained in:
Nicole Mikołajczyk
2025-05-21 18:38:06 +02:00
parent 5472c4b408
commit 817f1b083d
9 changed files with 81 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/pl-api/lib/request.ts
View File

@@ -42,7 +42,7 @@ interface RequestBody<Params = Record<string, any>> {
type RequestMeta = Pick<RequestBody, 'idempotencyKey' | 'onUploadProgress' | 'signal'>;
function request<T = any>(this: Pick<PlApiClient, 'accessToken' | 'baseURL'>, input: URL | RequestInfo, {
function request<T = any>(this: Pick<PlApiClient, 'accessToken' | 'iceshrimpAccessToken' | 'baseURL'>, input: URL | RequestInfo, {
body,
method = body ? 'POST' : 'GET',
params,
@@ -51,10 +51,12 @@ function request<T = any>(this: Pick<PlApiClient, 'accessToken' | 'baseURL'>, in
contentType = 'application/json',
idempotencyKey,
}: RequestBody = {}) {
const fullPath = buildFullPath(input.toString(), this.baseURL, params);
input = input.toString();
const fullPath = buildFullPath(input, this.baseURL, params);
const headers = new Headers();
if (this.accessToken) headers.set('Authorization', `Bearer ${this.accessToken}`);
if (input.startsWith('/api/iceshrimp/') && this.iceshrimpAccessToken) headers.set('Authorization', `Bearer ${this.iceshrimpAccessToken}`);
else if (this.accessToken) headers.set('Authorization', `Bearer ${this.accessToken}`);
if (contentType !== '' && body) headers.set('Content-Type', contentType);
if (idempotencyKey) headers.set('Idempotency-Key', contentType);