From 78548a2ebe057be22e128cdf5041c7045e701f4d Mon Sep 17 00:00:00 2001 From: Ordis <134585663+OrdisPrime@users.noreply.github.com> Date: Thu, 20 Feb 2025 06:16:40 -0800 Subject: [PATCH] chore: cleanup config (#979) Reviewed-on: https://onlyg.it/OpenWF/SpaceNinjaServer/pulls/979 Co-authored-by: Ordis <134585663+OrdisPrime@users.noreply.github.com> Co-committed-by: Ordis <134585663+OrdisPrime@users.noreply.github.com> --- config.json.example | 3 +++ src/controllers/api/loginController.ts | 11 +++++------ src/services/configService.ts | 3 +++ static/fixed_responses/login_static.ts | 27 -------------------------- 4 files changed, 11 insertions(+), 33 deletions(-) delete mode 100644 static/fixed_responses/login_static.ts diff --git a/config.json.example b/config.json.example index 2bdc035a..ec776374 100644 --- a/config.json.example +++ b/config.json.example @@ -5,6 +5,9 @@ "level": "trace" }, "myAddress": "localhost", + "hubAddress": "https://localhost/api/", + "platformCDNs": ["https://localhost/"], + "NRS": ["localhost"], "httpPort": 80, "httpsPort": 443, "administratorNames": [], diff --git a/src/controllers/api/loginController.ts b/src/controllers/api/loginController.ts index 00f1380c..d57fd7e1 100644 --- a/src/controllers/api/loginController.ts +++ b/src/controllers/api/loginController.ts @@ -6,7 +6,6 @@ import { buildConfig } from "@/src/services/buildConfigService"; import { Account } from "@/src/models/loginModel"; import { createAccount, isCorrectPassword, isNameTaken } from "@/src/services/loginService"; import { IDatabaseAccountJson, ILoginRequest, ILoginResponse } from "@/src/types/loginTypes"; -import { DTLS, groups, HUB, platformCDNs } from "@/static/fixed_responses/login_static"; import { logger } from "@/src/utils/logger"; export const loginController: RequestHandler = async (request, response) => { @@ -84,12 +83,12 @@ const createLoginResponse = (account: IDatabaseAccountJson, buildLabel: string): ConsentNeeded: account.ConsentNeeded, TrackedSettings: account.TrackedSettings, Nonce: account.Nonce, - Groups: groups, - platformCDNs: platformCDNs, - NRS: [config.myAddress], - DTLS: DTLS, + Groups: [], IRC: config.myIrcAddresses ?? [config.myAddress], - HUB: HUB, + platformCDNs: config.platformCDNs, + HUB: config.hubAddress, + NRS: config.NRS, + DTLS: 99, BuildLabel: buildLabel, MatchmakingBuildId: buildConfig.matchmakingBuildId }; diff --git a/src/services/configService.ts b/src/services/configService.ts index 2312727b..d046a1ee 100644 --- a/src/services/configService.ts +++ b/src/services/configService.ts @@ -33,6 +33,9 @@ interface IConfig { httpPort?: number; httpsPort?: number; myIrcAddresses?: string[]; + platformCDNs: string[]; + hubAddress: string; + NRS: string[]; administratorNames?: string[] | string; autoCreateAccount?: boolean; skipTutorial?: boolean; diff --git a/static/fixed_responses/login_static.ts b/static/fixed_responses/login_static.ts deleted file mode 100644 index d5e5ea1a..00000000 --- a/static/fixed_responses/login_static.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { IGroup } from "@/src/types/loginTypes"; - -export const groups: IGroup[] = [ - { - experiment: "InitiatePage", - experimentGroup: "initiate_page_no_video" - }, - { experiment: "ChatQAChannel", experimentGroup: "control" }, - { - experiment: "MarketSearchRecommendations", - experimentGroup: "premium_credit_purchases_14_days" - }, - { experiment: "SurveyLocation", experimentGroup: "EXIT" }, - { experiment: "GamesightAB", experimentGroup: "a" } -]; - -export const platformCDNs = [ - "https://content.warframe.com/", - "https://content-xb1.warframe.com/", - "https://content-ps4.warframe.com/", - "https://content-swi.warframe.com/", - "https://content-mob.warframe.com/" -]; - -export const DTLS = 99; - -export const HUB = "https://arbiter.warframe.com/api/";