diff --git a/src/connections/BattleNet/index.ts b/src/connections/BattleNet/index.ts
index ecba0fa9..8e8eeeed 100644
--- a/src/connections/BattleNet/index.ts
+++ b/src/connections/BattleNet/index.ts
@@ -1,4 +1,5 @@
import {
+ ApiError,
Config,
ConnectedAccount,
ConnectedAccountCommonOAuthTokenResponse,
@@ -81,7 +82,13 @@ export default class BattleNetConnection extends Connection {
}/connections/${this.id}/callback`,
}),
})
- .then((res) => res.json())
+ .then((res) => {
+ if (!res.ok) {
+ throw new ApiError("Failed to exchange code", 0, 400);
+ }
+
+ return res.json();
+ })
.then(
(
res: ConnectedAccountCommonOAuthTokenResponse &
@@ -95,7 +102,7 @@ export default class BattleNetConnection extends Connection {
console.error(
`Error exchanging token for ${this.id} connection: ${e}`,
);
- throw DiscordApiErrors.INVALID_OAUTH_TOKEN;
+ throw DiscordApiErrors.GENERAL_ERROR;
});
}
@@ -107,10 +114,22 @@ export default class BattleNetConnection extends Connection {
Authorization: `Bearer ${token}`,
},
})
- .then((res) => res.json())
+ .then((res) => {
+ if (!res.ok) {
+ throw new ApiError("Failed to fetch user", 0, 400);
+ }
+
+ return res.json();
+ })
.then((res: BattleNetConnectionUser & BattleNetErrorResponse) => {
if (res.error) throw new Error(res.error_description);
return res;
+ })
+ .catch((e) => {
+ console.error(
+ `Error fetching user for ${this.id} connection: ${e}`,
+ );
+ throw DiscordApiErrors.GENERAL_ERROR;
});
}
diff --git a/src/connections/Discord/index.ts b/src/connections/Discord/index.ts
index 61efcfc5..23f5d978 100644
--- a/src/connections/Discord/index.ts
+++ b/src/connections/Discord/index.ts
@@ -1,4 +1,5 @@
import {
+ ApiError,
Config,
ConnectedAccount,
ConnectedAccountCommonOAuthTokenResponse,
@@ -81,12 +82,18 @@ export default class DiscordConnection extends Connection {
}/connections/${this.id}/callback`,
}),
})
- .then((res) => res.json())
+ .then((res) => {
+ if (!res.ok) {
+ throw new ApiError("Failed to exchange token", 0, 400);
+ }
+
+ return res.json();
+ })
.catch((e) => {
console.error(
`Error exchanging token for ${this.id} connection: ${e}`,
);
- throw DiscordApiErrors.INVALID_OAUTH_TOKEN;
+ throw DiscordApiErrors.GENERAL_ERROR;
});
}
@@ -97,7 +104,20 @@ export default class DiscordConnection extends Connection {
headers: {
Authorization: `Bearer ${token}`,
},
- }).then((res) => res.json());
+ })
+ .then((res) => {
+ if (!res.ok) {
+ throw new ApiError("Failed to fetch user", 0, 400);
+ }
+
+ return res.json();
+ })
+ .catch((e) => {
+ console.error(
+ `Error fetching user for ${this.id} connection: ${e}`,
+ );
+ throw DiscordApiErrors.GENERAL_ERROR;
+ });
}
async handleCallback(
diff --git a/src/connections/EpicGames/index.ts b/src/connections/EpicGames/index.ts
index f1f3f24c..c720dc5d 100644
--- a/src/connections/EpicGames/index.ts
+++ b/src/connections/EpicGames/index.ts
@@ -1,4 +1,5 @@
import {
+ ApiError,
Config,
ConnectedAccount,
ConnectedAccountCommonOAuthTokenResponse,
@@ -86,12 +87,18 @@ export default class EpicGamesConnection extends Connection {
code,
}),
})
- .then((res) => res.json())
+ .then((res) => {
+ if (!res.ok) {
+ throw new ApiError("Failed to exchange code", 0, 400);
+ }
+
+ return res.json();
+ })
.catch((e) => {
console.error(
`Error exchanging token for ${this.id} connection: ${e}`,
);
- throw DiscordApiErrors.INVALID_OAUTH_TOKEN;
+ throw DiscordApiErrors.GENERAL_ERROR;
});
}
@@ -106,7 +113,20 @@ export default class EpicGamesConnection extends Connection {
headers: {
Authorization: `Bearer ${token}`,
},
- }).then((res) => res.json());
+ })
+ .then((res) => {
+ if (!res.ok) {
+ throw new ApiError("Failed to fetch user", 0, 400);
+ }
+
+ return res.json();
+ })
+ .catch((e) => {
+ console.error(
+ `Error fetching user for ${this.id} connection: ${e}`,
+ );
+ throw DiscordApiErrors.GENERAL_ERROR;
+ });
}
async handleCallback(
diff --git a/src/connections/Facebook/index.ts b/src/connections/Facebook/index.ts
index 2d490c63..67f8da79 100644
--- a/src/connections/Facebook/index.ts
+++ b/src/connections/Facebook/index.ts
@@ -1,4 +1,5 @@
import {
+ ApiError,
Config,
ConnectedAccount,
ConnectedAccountCommonOAuthTokenResponse,
@@ -88,7 +89,13 @@ export default class FacebookConnection extends Connection {
Accept: "application/json",
},
})
- .then((res) => res.json())
+ .then((res) => {
+ if (!res.ok) {
+ throw new ApiError("Failed to exchange code", 0, 400);
+ }
+
+ return res.json();
+ })
.then(
(
res: ConnectedAccountCommonOAuthTokenResponse &
@@ -102,7 +109,7 @@ export default class FacebookConnection extends Connection {
console.error(
`Error exchanging token for ${this.id} connection: ${e}`,
);
- throw DiscordApiErrors.INVALID_OAUTH_TOKEN;
+ throw DiscordApiErrors.GENERAL_ERROR;
});
}
@@ -114,10 +121,22 @@ export default class FacebookConnection extends Connection {
Authorization: `Bearer ${token}`,
},
})
- .then((res) => res.json())
+ .then((res) => {
+ if (!res.ok) {
+ throw new ApiError("Failed to fetch user", 0, 400);
+ }
+
+ return res.json();
+ })
.then((res: UserResponse & FacebookErrorResponse) => {
if (res.error) throw new Error(res.error.message);
return res;
+ })
+ .catch((e) => {
+ console.error(
+ `Error fetching user for ${this.id} connection: ${e}`,
+ );
+ throw DiscordApiErrors.GENERAL_ERROR;
});
}
diff --git a/src/connections/GitHub/index.ts b/src/connections/GitHub/index.ts
index ab3f8e65..aa686b03 100644
--- a/src/connections/GitHub/index.ts
+++ b/src/connections/GitHub/index.ts
@@ -1,4 +1,5 @@
import {
+ ApiError,
Config,
ConnectedAccount,
ConnectedAccountCommonOAuthTokenResponse,
@@ -70,12 +71,18 @@ export default class GitHubConnection extends Connection {
Accept: "application/json",
},
})
- .then((res) => res.json())
+ .then((res) => {
+ if (!res.ok) {
+ throw new ApiError("Failed to exchange code", 0, 400);
+ }
+
+ return res.json();
+ })
.catch((e) => {
console.error(
- `Error exchanging token for ${this.id} connection: ${e}`,
+ `Error exchanging code for ${this.id} connection: ${e}`,
);
- throw DiscordApiErrors.INVALID_OAUTH_TOKEN;
+ throw DiscordApiErrors.GENERAL_ERROR;
});
}
@@ -86,7 +93,20 @@ export default class GitHubConnection extends Connection {
headers: {
Authorization: `Bearer ${token}`,
},
- }).then((res) => res.json());
+ })
+ .then((res) => {
+ if (!res.ok) {
+ throw new ApiError("Failed to fetch user", 0, 400);
+ }
+
+ return res.json();
+ })
+ .catch((e) => {
+ console.error(
+ `Error fetching user for ${this.id} connection: ${e}`,
+ );
+ throw DiscordApiErrors.GENERAL_ERROR;
+ });
}
async handleCallback(
diff --git a/src/connections/Reddit/index.ts b/src/connections/Reddit/index.ts
index 182cd5a5..06fbcbe5 100644
--- a/src/connections/Reddit/index.ts
+++ b/src/connections/Reddit/index.ts
@@ -1,4 +1,5 @@
import {
+ ApiError,
Config,
ConnectedAccount,
ConnectedAccountCommonOAuthTokenResponse,
@@ -90,12 +91,18 @@ export default class RedditConnection extends Connection {
}/connections/${this.id}/callback`,
}),
})
- .then((res) => res.json())
+ .then((res) => {
+ if (!res.ok) {
+ throw new ApiError("Failed to code", 0, 400);
+ }
+
+ return res.json();
+ })
.catch((e) => {
console.error(
- `Error exchanging token for ${this.id} connection: ${e}`,
+ `Error exchanging code for ${this.id} connection: ${e}`,
);
- throw DiscordApiErrors.INVALID_OAUTH_TOKEN;
+ throw DiscordApiErrors.GENERAL_ERROR;
});
}
@@ -106,7 +113,20 @@ export default class RedditConnection extends Connection {
headers: {
Authorization: `Bearer ${token}`,
},
- }).then((res) => res.json());
+ })
+ .then((res) => {
+ if (!res.ok) {
+ throw new ApiError("Failed to fetch user", 0, 400);
+ }
+
+ return res.json();
+ })
+ .catch((e) => {
+ console.error(
+ `Error fetching user for ${this.id} connection: ${e}`,
+ );
+ throw DiscordApiErrors.GENERAL_ERROR;
+ });
}
async handleCallback(
diff --git a/src/connections/Spotify/index.ts b/src/connections/Spotify/index.ts
index b40d6189..44a4bc28 100644
--- a/src/connections/Spotify/index.ts
+++ b/src/connections/Spotify/index.ts
@@ -1,4 +1,5 @@
import {
+ ApiError,
Config,
ConnectedAccount,
ConnectedAccountCommonOAuthTokenResponse,
@@ -99,21 +100,28 @@ export default class SpotifyConnection extends RefreshableConnection {
}/connections/${this.id}/callback`,
}),
})
- .then((res) => res.json())
+ .then((res) => {
+ if (!res.ok) {
+ throw new ApiError("Failed to refresh token", 0, 400);
+ }
+
+ return res.json();
+ })
.then(
(
res: ConnectedAccountCommonOAuthTokenResponse &
TokenErrorResponse,
) => {
- if (res.error) throw new Error(res.error_description);
+ if (res.error)
+ throw new ApiError(res.error_description, 0, 400);
return res;
},
)
.catch((e) => {
console.error(
- `Error exchanging token for ${this.id} connection: ${e}`,
+ `Error exchanging code for ${this.id} connection: ${e}`,
);
- throw DiscordApiErrors.INVALID_OAUTH_TOKEN;
+ throw DiscordApiErrors.GENERAL_ERROR;
});
}
@@ -137,13 +145,26 @@ export default class SpotifyConnection extends RefreshableConnection {
refresh_token,
}),
})
- .then((res) => res.json())
+ .then(async (res) => {
+ if ([400, 401].includes(res.status)) {
+ // assume the token was revoked
+ await connectedAccount.revoke();
+ return DiscordApiErrors.CONNECTION_REVOKED;
+ }
+ // otherwise throw a general error
+ if (!res.ok) {
+ throw new ApiError("Failed to refresh token", 0, 400);
+ }
+
+ return await res.json();
+ })
.then(
(
res: ConnectedAccountCommonOAuthTokenResponse &
TokenErrorResponse,
) => {
- if (res.error) throw new Error(res.error_description);
+ if (res.error)
+ throw new ApiError(res.error_description, 0, 400);
return res;
},
)
@@ -151,7 +172,7 @@ export default class SpotifyConnection extends RefreshableConnection {
console.error(
`Error refreshing token for ${this.id} connection: ${e}`,
);
- throw DiscordApiErrors.INVALID_OAUTH_TOKEN;
+ throw DiscordApiErrors.GENERAL_ERROR;
});
}
@@ -163,10 +184,22 @@ export default class SpotifyConnection extends RefreshableConnection {
Authorization: `Bearer ${token}`,
},
})
- .then((res) => res.json())
+ .then((res) => {
+ if (!res.ok) {
+ throw new ApiError("Failed to fetch user", 0, 400);
+ }
+
+ return res.json();
+ })
.then((res: UserResponse & ErrorResponse) => {
if (res.error) throw new Error(res.error.message);
return res;
+ })
+ .catch((e) => {
+ console.error(
+ `Error fetching user for ${this.id} connection: ${e}`,
+ );
+ throw DiscordApiErrors.GENERAL_ERROR;
});
}
@@ -182,7 +215,7 @@ export default class SpotifyConnection extends RefreshableConnection {
if (exists) return null;
return await this.createConnection({
- token_data: tokenData,
+ token_data: { ...tokenData, fetched_at: Date.now() },
user_id: userId,
external_id: userInfo.id,
friend_sync: params.friend_sync,
diff --git a/src/connections/Twitch/TwitchSettings.ts b/src/connections/Twitch/TwitchSettings.ts
new file mode 100644
index 00000000..eb732c82
--- /dev/null
+++ b/src/connections/Twitch/TwitchSettings.ts
@@ -0,0 +1,5 @@
+export class TwitchSettings {
+ enabled: boolean = false;
+ clientId: string | null = null;
+ clientSecret: string | null = null;
+}
diff --git a/src/connections/Twitch/index.ts b/src/connections/Twitch/index.ts
new file mode 100644
index 00000000..ce04f098
--- /dev/null
+++ b/src/connections/Twitch/index.ts
@@ -0,0 +1,196 @@
+import {
+ ApiError,
+ Config,
+ ConnectedAccount,
+ ConnectedAccountCommonOAuthTokenResponse,
+ ConnectionCallbackSchema,
+ ConnectionLoader,
+ DiscordApiErrors,
+} from "@fosscord/util";
+import fetch from "node-fetch";
+import RefreshableConnection from "../../util/connections/RefreshableConnection";
+import { TwitchSettings } from "./TwitchSettings";
+
+interface TwitchConnectionUserResponse {
+ data: {
+ id: string;
+ login: string;
+ display_name: string;
+ type: string;
+ broadcaster_type: string;
+ description: string;
+ profile_image_url: string;
+ offline_image_url: string;
+ view_count: number;
+ created_at: string;
+ }[];
+}
+
+export default class TwitchConnection extends RefreshableConnection {
+ public readonly id = "twitch";
+ public readonly authorizeUrl = "https://id.twitch.tv/oauth2/authorize";
+ public readonly tokenUrl = "https://id.twitch.tv/oauth2/token";
+ public readonly userInfoUrl = "https://api.twitch.tv/helix/users";
+ public readonly scopes = [
+ "channel_subscriptions",
+ "channel_check_subscription",
+ "channel:read:subscriptions",
+ ];
+ settings: TwitchSettings = new TwitchSettings();
+
+ init(): void {
+ this.settings = ConnectionLoader.getConnectionConfig(
+ this.id,
+ this.settings,
+ ) as TwitchSettings;
+ }
+
+ getAuthorizationUrl(userId: string): string {
+ const state = this.createState(userId);
+ const url = new URL(this.authorizeUrl);
+
+ url.searchParams.append("client_id", this.settings.clientId!);
+ // TODO: probably shouldn't rely on cdn as this could be different from what we actually want. we should have an api endpoint setting.
+ url.searchParams.append(
+ "redirect_uri",
+ `${
+ Config.get().cdn.endpointPrivate || "http://localhost:3001"
+ }/connections/${this.id}/callback`,
+ );
+ url.searchParams.append("response_type", "code");
+ url.searchParams.append("scope", this.scopes.join(" "));
+ url.searchParams.append("state", state);
+ return url.toString();
+ }
+
+ getTokenUrl(): string {
+ return this.tokenUrl;
+ }
+
+ async exchangeCode(
+ state: string,
+ code: string,
+ ): Promise<ConnectedAccountCommonOAuthTokenResponse> {
+ this.validateState(state);
+
+ const url = this.getTokenUrl();
+
+ return fetch(url.toString(), {
+ method: "POST",
+ headers: {
+ Accept: "application/json",
+ "Content-Type": "application/x-www-form-urlencoded",
+ },
+ body: new URLSearchParams({
+ grant_type: "authorization_code",
+ code: code,
+ client_id: this.settings.clientId!,
+ client_secret: this.settings.clientSecret!,
+ redirect_uri: `${
+ Config.get().cdn.endpointPrivate || "http://localhost:3001"
+ }/connections/${this.id}/callback`,
+ }),
+ })
+ .then((res) => {
+ if (!res.ok) {
+ throw new ApiError("Failed to exchange code", 0, 400);
+ }
+
+ return res.json();
+ })
+ .catch((e) => {
+ console.error(
+ `Error exchanging code for ${this.id} connection: ${e}`,
+ );
+ throw DiscordApiErrors.GENERAL_ERROR;
+ });
+ }
+
+ async refreshToken(
+ connectedAccount: ConnectedAccount,
+ ): Promise<ConnectedAccountCommonOAuthTokenResponse> {
+ if (!connectedAccount.token_data?.refresh_token)
+ throw new Error("No refresh token available.");
+ const refresh_token = connectedAccount.token_data.refresh_token;
+
+ const url = this.getTokenUrl();
+
+ return fetch(url.toString(), {
+ method: "POST",
+ headers: {
+ Accept: "application/json",
+ "Content-Type": "application/x-www-form-urlencoded",
+ },
+ body: new URLSearchParams({
+ grant_type: "refresh_token",
+ client_id: this.settings.clientId!,
+ client_secret: this.settings.clientSecret!,
+ refresh_token: refresh_token,
+ }),
+ })
+ .then(async (res) => {
+ if ([400, 401].includes(res.status)) {
+ // assume the token was revoked
+ await connectedAccount.revoke();
+ return DiscordApiErrors.CONNECTION_REVOKED;
+ }
+ // otherwise throw a general error
+ if (!res.ok) {
+ throw new ApiError("Failed to refresh token", 0, 400);
+ }
+
+ return await res.json();
+ })
+ .catch((e) => {
+ console.error(
+ `Error refreshing token for ${this.id} connection: ${e}`,
+ );
+ throw DiscordApiErrors.GENERAL_ERROR;
+ });
+ }
+
+ async getUser(token: string): Promise<TwitchConnectionUserResponse> {
+ const url = new URL(this.userInfoUrl);
+ return fetch(url.toString(), {
+ method: "GET",
+ headers: {
+ Authorization: `Bearer ${token}`,
+ "Client-Id": this.settings.clientId!,
+ },
+ })
+ .then((res) => {
+ if (!res.ok) {
+ throw new ApiError("Failed to fetch user", 0, 400);
+ }
+
+ return res.json();
+ })
+ .catch((e) => {
+ console.error(
+ `Error fetching user for ${this.id} connection: ${e}`,
+ );
+ throw DiscordApiErrors.GENERAL_ERROR;
+ });
+ }
+
+ async handleCallback(
+ params: ConnectionCallbackSchema,
+ ): Promise<ConnectedAccount | null> {
+ const userId = this.getUserId(params.state);
+ const tokenData = await this.exchangeCode(params.state, params.code!);
+ const userInfo = await this.getUser(tokenData.access_token);
+
+ const exists = await this.hasConnection(userId, userInfo.data[0].id);
+
+ if (exists) return null;
+
+ return await this.createConnection({
+ token_data: { ...tokenData, fetched_at: Date.now() },
+ user_id: userId,
+ external_id: userInfo.data[0].id,
+ friend_sync: params.friend_sync,
+ name: userInfo.data[0].display_name,
+ type: this.id,
+ });
+ }
+}
|
