From c7277efbad5d3979222518ae543366ba8a08ca77 Mon Sep 17 00:00:00 2001
From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com>
Date: Tue, 24 Jan 2023 18:15:26 +1100
Subject: Move redirect uri generation to getRedirectUri function of Connection
 class. Use api_endpointPublic instead of cdn_endpointPublic

---
 src/util/config/types/ApiConfiguration.ts |  2 +-
 src/util/connections/Connection.ts        | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'src/util')

diff --git a/src/util/config/types/ApiConfiguration.ts b/src/util/config/types/ApiConfiguration.ts
index 0389ed3e..579b1f2d 100644
--- a/src/util/config/types/ApiConfiguration.ts
+++ b/src/util/config/types/ApiConfiguration.ts
@@ -20,5 +20,5 @@ export class ApiConfiguration {
 	defaultVersion: string = "9";
 	activeVersions: string[] = ["6", "7", "8", "9"];
 	useFosscordEnhancements: boolean = true;
-	endpointPublic: string = "/api";
+	endpointPublic: string | null = null;
 }
diff --git a/src/util/connections/Connection.ts b/src/util/connections/Connection.ts
index 8b60b0d2..26279299 100644
--- a/src/util/connections/Connection.ts
+++ b/src/util/connections/Connection.ts
@@ -1,7 +1,7 @@
 import crypto from "crypto";
 import { ConnectedAccount } from "../entities";
 import { ConnectedAccountSchema, ConnectionCallbackSchema } from "../schemas";
-import { DiscordApiErrors } from "../util";
+import { Config, DiscordApiErrors } from "../util";
 
 /**
  * A connection that can be used to connect to an external service.
@@ -19,6 +19,16 @@ export default abstract class Connection {
 	 */
 	abstract getAuthorizationUrl(userId: string): string;
 
+	/**
+	 * Returns the redirect_uri for a connection type
+	 * @returns redirect_uri for this connection
+	 */
+	getRedirectUri() {
+		const endpointPublic =
+			Config.get().api.endpointPublic ?? "http://localhost:3001";
+		return `${endpointPublic}/connections/${this.id}/callback`;
+	}
+
 	/**
 	 * Processes the callback
 	 * @param args Callback arguments
-- 
cgit 1.4.1