diff --git a/src/connections/GitHub/index.ts b/src/connections/GitHub/index.ts
index d79fd51e..ab3f8e65 100644
--- a/src/connections/GitHub/index.ts
+++ b/src/connections/GitHub/index.ts
@@ -1,6 +1,7 @@
import {
Config,
ConnectedAccount,
+ ConnectedAccountCommonOAuthTokenResponse,
ConnectionCallbackSchema,
ConnectionLoader,
DiscordApiErrors,
@@ -9,14 +10,6 @@ import fetch from "node-fetch";
import Connection from "../../util/connections/Connection";
import { GitHubSettings } from "./GitHubSettings";
-interface OAuthTokenResponse {
- access_token: string;
- token_type: string;
- scope: string;
- refresh_token?: string;
- expires_in?: number;
-}
-
interface UserResponse {
login: string;
id: number;
@@ -63,7 +56,10 @@ export default class GitHubConnection extends Connection {
return url.toString();
}
- async exchangeCode(state: string, code: string): Promise<string> {
+ async exchangeCode(
+ state: string,
+ code: string,
+ ): Promise<ConnectedAccountCommonOAuthTokenResponse> {
this.validateState(state);
const url = this.getTokenUrl(code);
@@ -75,7 +71,6 @@ export default class GitHubConnection extends Connection {
},
})
.then((res) => res.json())
- .then((res: OAuthTokenResponse) => res.access_token)
.catch((e) => {
console.error(
`Error exchanging token for ${this.id} connection: ${e}`,
@@ -98,8 +93,8 @@ export default class GitHubConnection extends Connection {
params: ConnectionCallbackSchema,
): Promise<ConnectedAccount | null> {
const userId = this.getUserId(params.state);
- const token = await this.exchangeCode(params.state, params.code!);
- const userInfo = await this.getUser(token);
+ const tokenData = await this.exchangeCode(params.state, params.code!);
+ const userInfo = await this.getUser(tokenData.access_token);
const exists = await this.hasConnection(userId, userInfo.id.toString());
|
