diff options
author | Puyodead1 <puyodead@proton.me> | 2023-01-13 08:52:24 -0500 |
---|---|---|
committer | Puyodead1 <puyodead@proton.me> | 2023-03-18 19:28:46 -0400 |
commit | d8ecc4269f2049f64ee60f518076ccd162857a36 (patch) | |
tree | cd14b6082bac049b26a8a493898b43ef3216c10b /src/connections/GitHub/index.ts | |
parent | add Xbox connection (diff) | |
download | server-d8ecc4269f2049f64ee60f518076ccd162857a36.tar.xz |
replace node-fetch with wretch
Diffstat (limited to 'src/connections/GitHub/index.ts')
-rw-r--r-- | src/connections/GitHub/index.ts | 42 |
1 files changed, 12 insertions, 30 deletions
diff --git a/src/connections/GitHub/index.ts b/src/connections/GitHub/index.ts index aa686b03..8380e765 100644 --- a/src/connections/GitHub/index.ts +++ b/src/connections/GitHub/index.ts @@ -1,5 +1,4 @@ import { - ApiError, Config, ConnectedAccount, ConnectedAccountCommonOAuthTokenResponse, @@ -7,7 +6,7 @@ import { ConnectionLoader, DiscordApiErrors, } from "@fosscord/util"; -import fetch from "node-fetch"; +import wretch from "wretch"; import Connection from "../../util/connections/Connection"; import { GitHubSettings } from "./GitHubSettings"; @@ -65,46 +64,29 @@ export default class GitHubConnection extends Connection { const url = this.getTokenUrl(code); - return fetch(url.toString(), { - method: "POST", - headers: { + return wretch(url.toString()) + .headers({ Accept: "application/json", - }, - }) - .then((res) => { - if (!res.ok) { - throw new ApiError("Failed to exchange code", 0, 400); - } - - return res.json(); }) + + .post() + .json<ConnectedAccountCommonOAuthTokenResponse>() .catch((e) => { - console.error( - `Error exchanging code for ${this.id} connection: ${e}`, - ); + console.error(e); throw DiscordApiErrors.GENERAL_ERROR; }); } async getUser(token: string): Promise<UserResponse> { const url = new URL(this.userInfoUrl); - return fetch(url.toString(), { - method: "GET", - headers: { + return wretch(url.toString()) + .headers({ Authorization: `Bearer ${token}`, - }, - }) - .then((res) => { - if (!res.ok) { - throw new ApiError("Failed to fetch user", 0, 400); - } - - return res.json(); }) + .get() + .json<UserResponse>() .catch((e) => { - console.error( - `Error fetching user for ${this.id} connection: ${e}`, - ); + console.error(e); throw DiscordApiErrors.GENERAL_ERROR; }); } |