summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/api/routes/users/@me/connections/#connection_name/#connection_id/access-token.ts16
-rw-r--r--src/api/routes/users/@me/connections/#connection_name/#connection_id/index.ts13
-rw-r--r--src/connections/BattleNet/index.ts25
-rw-r--r--src/connections/Discord/index.ts26
-rw-r--r--src/connections/EpicGames/index.ts26
-rw-r--r--src/connections/Facebook/index.ts25
-rw-r--r--src/connections/GitHub/index.ts28
-rw-r--r--src/connections/Reddit/index.ts28
-rw-r--r--src/connections/Spotify/index.ts51
-rw-r--r--src/connections/Twitch/TwitchSettings.ts5
-rw-r--r--src/connections/Twitch/index.ts196
-rw-r--r--src/util/connections/RefreshableConnection.ts2
-rw-r--r--src/util/dtos/ConnectedAccountDTO.ts2
-rw-r--r--src/util/entities/ConnectedAccount.ts10
-rw-r--r--src/util/interfaces/ConnectedAccount.ts1
-rw-r--r--src/util/schemas/ConnectedAccountSchema.ts2
-rw-r--r--src/util/schemas/ConnectionUpdateSchema.ts1
-rw-r--r--src/util/util/Constants.ts5
18 files changed, 416 insertions, 46 deletions
diff --git a/src/api/routes/users/@me/connections/#connection_name/#connection_id/access-token.ts b/src/api/routes/users/@me/connections/#connection_name/#connection_id/access-token.ts
index 760f8135..1ad1c7a7 100644
--- a/src/api/routes/users/@me/connections/#connection_name/#connection_id/access-token.ts
+++ b/src/api/routes/users/@me/connections/#connection_name/#connection_id/access-token.ts
@@ -19,7 +19,7 @@ const ALLOWED_CONNECTIONS = ["twitch", "youtube"];
 router.get("/", route({}), async (req: Request, res: Response) => {
 	const { connection_name, connection_id } = req.params;
 
-	const connection = ConnectionStore.connections.get(connection_id);
+	const connection = ConnectionStore.connections.get(connection_name);
 
 	if (!ALLOWED_CONNECTIONS.includes(connection_name) || !connection)
 		throw FieldErrors({
@@ -41,7 +41,7 @@ router.get("/", route({}), async (req: Request, res: Response) => {
 	const connectedAccount = await ConnectedAccount.findOne({
 		where: {
 			type: connection_name,
-			id: connection_id,
+			external_id: connection_id,
 			user_id: req.user_id,
 		},
 		select: [
@@ -64,14 +64,12 @@ router.get("/", route({}), async (req: Request, res: Response) => {
 		throw new ApiError("No token data", 0, 400);
 
 	let access_token = connectedAccount.token_data.access_token;
-	const { expires_at, expires_in } = connectedAccount.token_data;
+	const { expires_at, expires_in, fetched_at } = connectedAccount.token_data;
 
-	if (expires_at && expires_at < Date.now()) {
-		if (!(connection instanceof RefreshableConnection))
-			throw new ApiError("Access token expired", 0, 400);
-		const tokenData = await connection.refresh(connectedAccount);
-		access_token = tokenData.access_token;
-	} else if (expires_in && expires_in < Date.now()) {
+	if (
+		(expires_at && expires_at < Date.now()) ||
+		(expires_in && fetched_at + expires_in * 1000 < Date.now())
+	) {
 		if (!(connection instanceof RefreshableConnection))
 			throw new ApiError("Access token expired", 0, 400);
 		const tokenData = await connection.refresh(connectedAccount);
diff --git a/src/api/routes/users/@me/connections/#connection_name/#connection_id/index.ts b/src/api/routes/users/@me/connections/#connection_name/#connection_id/index.ts
index 9d5f517d..07440eac 100644
--- a/src/api/routes/users/@me/connections/#connection_name/#connection_id/index.ts
+++ b/src/api/routes/users/@me/connections/#connection_name/#connection_id/index.ts
@@ -1,5 +1,10 @@
 import { route } from "@fosscord/api";
-import { ConnectedAccount, DiscordApiErrors, emitEvent, ConnectionUpdateSchema } from "@fosscord/util";
+import {
+	ConnectedAccount,
+	ConnectionUpdateSchema,
+	DiscordApiErrors,
+	emitEvent
+} from "@fosscord/util";
 import { Request, Response, Router } from "express";
 const router = Router();
 
@@ -35,6 +40,8 @@ router.patch(
 
 		//@ts-ignore For some reason the client sends this as a boolean, even tho docs say its a number?
 		if (typeof body.visibility === "boolean") body.visibility = body.visibility ? 1 : 0;
+		//@ts-ignore For some reason the client sends this as a boolean, even tho docs say its a number?
+		if (typeof body.show_activity === "boolean") body.show_activity = body.show_activity ? 1 : 0;
 
 		connection.assign(req.body);
 
@@ -58,7 +65,7 @@ router.delete("/", route({}), async (req: Request, res: Response) => {
 			user_id: req.user_id,
 			external_id: connection_id,
 			type: connection_name,
-		}
+		},
 	});
 
 	await Promise.all([
@@ -67,7 +74,7 @@ router.delete("/", route({}), async (req: Request, res: Response) => {
 			event: "USER_CONNECTIONS_UPDATE",
 			data: account,
 			user_id: req.user_id,
-		})
+		}),
 	]);
 
 	return res.sendStatus(200);
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,
+		});
+	}
+}
diff --git a/src/util/connections/RefreshableConnection.ts b/src/util/connections/RefreshableConnection.ts
index 0008cbc0..87f5f6dd 100644
--- a/src/util/connections/RefreshableConnection.ts
+++ b/src/util/connections/RefreshableConnection.ts
@@ -23,7 +23,7 @@ export default abstract class RefreshableConnection extends Connection {
 		connectedAccount: ConnectedAccount,
 	): Promise<ConnectedAccountCommonOAuthTokenResponse> {
 		const tokenData = await this.refreshToken(connectedAccount);
-		connectedAccount.token_data = tokenData;
+		connectedAccount.token_data = { ...tokenData, fetched_at: Date.now() };
 		await connectedAccount.save();
 		return tokenData;
 	}
diff --git a/src/util/dtos/ConnectedAccountDTO.ts b/src/util/dtos/ConnectedAccountDTO.ts
index ca15ff41..a3618fd1 100644
--- a/src/util/dtos/ConnectedAccountDTO.ts
+++ b/src/util/dtos/ConnectedAccountDTO.ts
@@ -7,7 +7,7 @@ export class ConnectedAccountDTO {
 	friend_sync?: boolean;
 	name: string;
 	revoked?: boolean;
-	show_activity?: boolean;
+	show_activity?: number;
 	type: string;
 	verified?: boolean;
 	visibility?: number;
diff --git a/src/util/entities/ConnectedAccount.ts b/src/util/entities/ConnectedAccount.ts
index beb53e41..d8a9de20 100644
--- a/src/util/entities/ConnectedAccount.ts
+++ b/src/util/entities/ConnectedAccount.ts
@@ -51,7 +51,7 @@ export class ConnectedAccount extends BaseClass {
 	revoked?: boolean = false;
 
 	@Column({ select: false })
-	show_activity?: boolean = true;
+	show_activity?: number = 0;
 
 	@Column()
 	type: string;
@@ -75,5 +75,11 @@ export class ConnectedAccount extends BaseClass {
 	two_way_link?: boolean = false;
 
 	@Column({ select: false, nullable: true, type: "simple-json" })
-	token_data?: ConnectedAccountTokenData;
+	token_data?: ConnectedAccountTokenData | null;
+
+	async revoke() {
+		this.revoked = true;
+		this.token_data = null;
+		await this.save();
+	}
 }
diff --git a/src/util/interfaces/ConnectedAccount.ts b/src/util/interfaces/ConnectedAccount.ts
index c96e5f79..ede02f6d 100644
--- a/src/util/interfaces/ConnectedAccount.ts
+++ b/src/util/interfaces/ConnectedAccount.ts
@@ -13,4 +13,5 @@ export interface ConnectedAccountTokenData {
 	refresh_token?: string;
 	expires_in?: number;
 	expires_at?: number;
+	fetched_at: number;
 }
diff --git a/src/util/schemas/ConnectedAccountSchema.ts b/src/util/schemas/ConnectedAccountSchema.ts
index e5f838d0..fa834bd6 100644
--- a/src/util/schemas/ConnectedAccountSchema.ts
+++ b/src/util/schemas/ConnectedAccountSchema.ts
@@ -7,7 +7,7 @@ export interface ConnectedAccountSchema {
 	friend_sync?: boolean;
 	name: string;
 	revoked?: boolean;
-	show_activity?: boolean;
+	show_activity?: number;
 	type: string;
 	verified?: boolean;
 	visibility?: number;
diff --git a/src/util/schemas/ConnectionUpdateSchema.ts b/src/util/schemas/ConnectionUpdateSchema.ts
index ac234e7e..eb6c0916 100644
--- a/src/util/schemas/ConnectionUpdateSchema.ts
+++ b/src/util/schemas/ConnectionUpdateSchema.ts
@@ -1,3 +1,4 @@
 export interface ConnectionUpdateSchema {
 	visibility?: boolean;
+	show_activity?: boolean;
 }
diff --git a/src/util/util/Constants.ts b/src/util/util/Constants.ts
index 3bdfcfa9..47f650f4 100644
--- a/src/util/util/Constants.ts
+++ b/src/util/util/Constants.ts
@@ -787,6 +787,11 @@ export const DiscordApiErrors = {
 		40006,
 	),
 	USER_BANNED: new ApiError("The user is banned from this guild", 40007),
+	CONNECTION_REVOKED: new ApiError(
+		"The connection has been revoked",
+		40012,
+		400,
+	),
 	TARGET_USER_IS_NOT_CONNECTED_TO_VOICE: new ApiError(
 		"Target user is not connected to voice",
 		40032,
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-09-19 16:40:26 +0000