From 2ca550d0c9890c928502f432d2b279d977669ba9 Mon Sep 17 00:00:00 2001
From: Flam3rboy <34555296+Flam3rboy@users.noreply.github.com>
Date: Sat, 14 Aug 2021 22:25:49 +0200
Subject: [PATCH] move devDependencies to dependencies because bundle installs
 api/gateway/cdn as npm dep. and the dev packages don't get automatically
 installed

---
 api/package-lock.json      | Bin 719311 -> 719859 bytes
 api/package.json           |  10 +-
 api/src/util/Config.ts     | 372 -------------------------------------
 cdn/package.json           |   5 +-
 gateway/package.json       |   4 +-
 gateway/src/util/Config.ts |  41 ----
 util/package-lock.json     | Bin 50202 -> 55103 bytes
 util/package.json          |  12 +-
 8 files changed, 11 insertions(+), 433 deletions(-)
 delete mode 100644 api/src/util/Config.ts
 delete mode 100644 gateway/src/util/Config.ts

diff --git a/api/package-lock.json b/api/package-lock.json
index 3308a6be653448a0ab4a883a05862e2367d7b00a..6305b089df25f78252718c297eb581f4785af335 100644
GIT binary patch
delta 445
zcmX^AS^M*M?G2w9o4J{`b2Bjt=TEMV5tx3bpUH@&AT_mU@<dOS>DyG;L#N+5$tXWP
zp_5sD`_n?kna$JB&1dABo-fD2KRxe1CmUGt^o1QvD$@;QSy-pPo5?QGzTqq5_6=W|
zcI}-WQ_LoSu6W}wris%9wlT9!?~vf+o&Jo2QEa+{FO%W)1fbY<zb(v@v?rIwh@okl
z%(zXq{o8%!>EG_NXn@?h-DVyOJLB}Og)HLJZ630`oxFDey1OPfnkl#2K4Jl4*6p^B
z*wUQ9o<wteqZ6CLcA!@kN~fQh&xqk%M++{6_Lno+x4)dpp-?wHte6emY13sSIc29$
z*v7;;{UryZFv2s_fu7m5T}P7hunMY=xIsazWTjA2RGPZ|y)CE9t?8vQTvF3*CAeNs
Z-n{_B4S_mbiqq{MvBYnmEy-o_002gaq{#pP

delta 230
zcmV<C02%-D_bboyE3oqc4PkC}VRIrnAR=BeE;xhe0k`M@0UmFc_9OvXml!4oFPHeq
z0UwtzYyly+1#$tGgO@C^0~eQFn+F?{;9Mb>fDQs4heP%Ow?p;<d%c%ivjH2IfDQr&
zmv37IVwaz_0}Yqov;zjW%^3*?0h2IZ4Y!}Q1IsFxlrRAnhqmAYm$u*pD7RJ80v!RD
z3*rRslMU1qheP88heP89w?pFwW<r<iqXrU}%HRekw-_b|`gE5nd<GJSTAK&ATAK(V
gez&n13FalY%|8i5+Ls|33iX$J<p>hDUK<LP;6Qg;Z~y=R

diff --git a/api/package.json b/api/package.json
index 967c9df8..7d957ed8 100644
--- a/api/package.json
+++ b/api/package.json
@@ -41,7 +41,6 @@
 		"atomically": "^1.7.0",
 		"bcrypt": "^5.0.1",
 		"body-parser": "^1.19.0",
-		"canvas": "^2.8.0",
 		"cheerio": "^1.0.0-rc.9",
 		"dot-prop": "^6.0.1",
 		"dotenv": "^8.2.0",
@@ -61,10 +60,7 @@
 		"mongoose-long": "^0.3.2",
 		"multer": "^1.4.2",
 		"node-fetch": "^2.6.1",
-		"require_optional": "^1.0.1"
-	},
-	"devDependencies": {
-		"0x": "^4.10.2",
+		"require_optional": "^1.0.1",
 		"@types/amqplib": "^0.8.1",
 		"@types/bcrypt": "^5.0.0",
 		"@types/express": "^4.17.9",
@@ -74,10 +70,6 @@
 		"@types/node": "^14.17.9",
 		"@types/node-fetch": "^2.5.7",
 		"@zerollup/ts-transform-paths": "^1.7.18",
-		"caxa": "^2.1.0",
-		"jest": "^26.6.3",
-		"saslprep": "^1.0.3",
-		"ts-node": "^9.1.1",
 		"ts-node-dev": "^1.1.6",
 		"typescript": "^4.1.2"
 	}
diff --git a/api/src/util/Config.ts b/api/src/util/Config.ts
deleted file mode 100644
index c86afbe7..00000000
--- a/api/src/util/Config.ts
+++ /dev/null
@@ -1,372 +0,0 @@
-// @ts-nocheck
-import Ajv, { JSONSchemaType } from "ajv";
-import { getConfigPathForFile } from "@fosscord/util/dist/util/Config";
-import { Config } from "@fosscord/util";
-
-export interface RateLimitOptions {
-	count: number;
-	timespan: number;
-}
-
-export interface DefaultOptions {
-	gateway: string;
-	general: {
-		instance_id: string;
-	};
-	permissions: {
-		user: {
-			createGuilds: boolean;
-		};
-	};
-	limits: {
-		user: {
-			maxGuilds: number;
-			maxUsername: number;
-			maxFriends: number;
-		};
-		guild: {
-			maxRoles: number;
-			maxMembers: number;
-			maxChannels: number;
-			maxChannelsInCategory: number;
-			hideOfflineMember: number;
-		};
-		message: {
-			characters: number;
-			ttsCharacters: number;
-			maxReactions: number;
-			maxAttachmentSize: number;
-			maxBulkDelete: number;
-		};
-		channel: {
-			maxPins: number;
-			maxTopic: number;
-		};
-		rate: {
-			ip: {
-				enabled: boolean;
-				count: number;
-				timespan: number;
-			};
-			routes: {
-				auth?: {
-					login?: RateLimitOptions;
-					register?: RateLimitOptions;
-				};
-				channel?: string;
-				// TODO: rate limit configuration for all routes
-			};
-		};
-	};
-	security: {
-		jwtSecret: string;
-		forwadedFor: string | null;
-		captcha: {
-			enabled: boolean;
-			service: "recaptcha" | "hcaptcha" | null; // TODO: hcaptcha, custom
-			sitekey: string | null;
-			secret: string | null;
-		};
-	};
-	login: {
-		requireCaptcha: boolean;
-	};
-	register: {
-		email: {
-			necessary: boolean;
-			allowlist: boolean;
-			blocklist: boolean;
-			domains: string[];
-		};
-		dateOfBirth: {
-			necessary: boolean;
-			minimum: number; // in years
-		};
-		requireCaptcha: boolean;
-		requireInvite: boolean;
-		allowNewRegistration: boolean;
-		allowMultipleAccounts: boolean;
-		password: {
-			minLength: number;
-			minNumbers: number;
-			minUpperCase: number;
-			minSymbols: number;
-			blockInsecureCommonPasswords: boolean; // TODO: efficiently save password blocklist in database
-		};
-	};
-}
-
-const schema: JSONSchemaType<DefaultOptions> & {
-	definitions: {
-		rateLimitOptions: JSONSchemaType<RateLimitOptions>;
-	};
-} = {
-	type: "object",
-	definitions: {
-		rateLimitOptions: {
-			type: "object",
-			properties: {
-				count: { type: "number" },
-				timespan: { type: "number" }
-			},
-			required: ["count", "timespan"]
-		}
-	},
-	properties: {
-		gateway: {
-			type: "string"
-		},
-		general: {
-			type: "object",
-			properties: {
-				instance_id: {
-					type: "string"
-				}
-			},
-			required: ["instance_id"],
-			additionalProperties: false
-		},
-		permissions: {
-			type: "object",
-			properties: {
-				user: {
-					type: "object",
-					properties: {
-						createGuilds: {
-							type: "boolean"
-						}
-					},
-					required: ["createGuilds"],
-					additionalProperties: false
-				}
-			},
-			required: ["user"],
-			additionalProperties: false
-		},
-		limits: {
-			type: "object",
-			properties: {
-				user: {
-					type: "object",
-					properties: {
-						maxFriends: {
-							type: "number"
-						},
-						maxGuilds: {
-							type: "number"
-						},
-						maxUsername: {
-							type: "number"
-						}
-					},
-					required: ["maxFriends", "maxGuilds", "maxUsername"],
-					additionalProperties: false
-				},
-				guild: {
-					type: "object",
-					properties: {
-						maxRoles: {
-							type: "number"
-						},
-						maxMembers: {
-							type: "number"
-						},
-						maxChannels: {
-							type: "number"
-						},
-						maxChannelsInCategory: {
-							type: "number"
-						},
-						hideOfflineMember: {
-							type: "number"
-						}
-					},
-					required: ["maxRoles", "maxMembers", "maxChannels", "maxChannelsInCategory", "hideOfflineMember"],
-					additionalProperties: false
-				},
-				message: {
-					type: "object",
-					properties: {
-						characters: {
-							type: "number"
-						},
-						ttsCharacters: {
-							type: "number"
-						},
-						maxReactions: {
-							type: "number"
-						},
-						maxAttachmentSize: {
-							type: "number"
-						},
-						maxBulkDelete: {
-							type: "number"
-						}
-					},
-					required: ["characters", "ttsCharacters", "maxReactions", "maxAttachmentSize", "maxBulkDelete"],
-					additionalProperties: false
-				},
-				channel: {
-					type: "object",
-					properties: {
-						maxPins: {
-							type: "number"
-						},
-						maxTopic: {
-							type: "number"
-						}
-					},
-					required: ["maxPins", "maxTopic"],
-					additionalProperties: false
-				},
-				rate: {
-					type: "object",
-					properties: {
-						ip: {
-							type: "object",
-							properties: {
-								enabled: { type: "boolean" },
-								count: { type: "number" },
-								timespan: { type: "number" }
-							},
-							required: ["enabled", "count", "timespan"],
-							additionalProperties: false
-						},
-						routes: {
-							type: "object",
-							properties: {
-								auth: {
-									type: "object",
-									properties: {
-										login: { $ref: "#/definitions/rateLimitOptions" },
-										register: { $ref: "#/definitions/rateLimitOptions" }
-									},
-									nullable: true,
-									required: [],
-									additionalProperties: false
-								},
-								channel: {
-									type: "string",
-									nullable: true
-								}
-							},
-							required: [],
-							additionalProperties: false
-						}
-					},
-					required: ["ip", "routes"]
-				}
-			},
-			required: ["channel", "guild", "message", "rate", "user"],
-			additionalProperties: false
-		},
-		security: {
-			type: "object",
-			properties: {
-				jwtSecret: {
-					type: "string"
-				},
-				forwadedFor: {
-					type: "string",
-					nullable: true
-				},
-				captcha: {
-					type: "object",
-					properties: {
-						enabled: { type: "boolean" },
-						service: {
-							type: "string",
-							enum: ["hcaptcha", "recaptcha", null],
-							nullable: true
-						},
-						sitekey: {
-							type: "string",
-							nullable: true
-						},
-						secret: {
-							type: "string",
-							nullable: true
-						}
-					},
-					required: ["enabled", "secret", "service", "sitekey"],
-					additionalProperties: false
-				}
-			},
-			required: ["captcha", "forwadedFor", "jwtSecret"],
-			additionalProperties: false
-		},
-		login: {
-			type: "object",
-			properties: {
-				requireCaptcha: { type: "boolean" }
-			},
-			required: ["requireCaptcha"],
-			additionalProperties: false
-		},
-		register: {
-			type: "object",
-			properties: {
-				email: {
-					type: "object",
-					properties: {
-						necessary: { type: "boolean" },
-						allowlist: { type: "boolean" },
-						blocklist: { type: "boolean" },
-						domains: {
-							type: "array",
-							items: {
-								type: "string"
-							}
-						}
-					},
-					required: ["allowlist", "blocklist", "domains", "necessary"],
-					additionalProperties: false
-				},
-				dateOfBirth: {
-					type: "object",
-					properties: {
-						necessary: { type: "boolean" },
-						minimum: { type: "number" }
-					},
-					required: ["minimum", "necessary"],
-					additionalProperties: false
-				},
-				requireCaptcha: { type: "boolean" },
-				requireInvite: { type: "boolean" },
-				allowNewRegistration: { type: "boolean" },
-				allowMultipleAccounts: { type: "boolean" },
-				password: {
-					type: "object",
-					properties: {
-						minLength: { type: "number" },
-						minNumbers: { type: "number" },
-						minUpperCase: { type: "number" },
-						minSymbols: { type: "number" },
-						blockInsecureCommonPasswords: { type: "boolean" }
-					},
-					required: ["minLength", "minNumbers", "minUpperCase", "minSymbols", "blockInsecureCommonPasswords"],
-					additionalProperties: false
-				}
-			},
-			required: [
-				"allowMultipleAccounts",
-				"allowNewRegistration",
-				"dateOfBirth",
-				"email",
-				"password",
-				"requireCaptcha",
-				"requireInvite"
-			],
-			additionalProperties: false
-		}
-	},
-	required: ["gateway", "general", "limits", "login", "permissions", "register", "security"],
-	additionalProperties: false
-};
-
-const ajv = new Ajv();
-const validator = ajv.compile(schema);
-
-const configPath = getConfigPathForFile("fosscord", "api", ".json");
-
-export const apiConfig = new Config<DefaultOptions>({ path: configPath, schemaValidator: validator, schema: schema });
diff --git a/cdn/package.json b/cdn/package.json
index 0a34f85f..7aa188a9 100644
--- a/cdn/package.json
+++ b/cdn/package.json
@@ -37,9 +37,8 @@
 		"missing-native-js-functions": "^1.0.8",
 		"multer": "^1.4.2",
 		"node-fetch": "^2.6.1",
-		"uuid": "^8.3.2"
-	},
-	"devDependencies": {
+		"uuid": "^8.3.2",
+		"typescript": "^4.1.2",
 		"@types/body-parser": "^1.19.0",
 		"@types/btoa": "^1.2.3",
 		"@types/dotenv": "^8.2.0",
diff --git a/gateway/package.json b/gateway/package.json
index 5a401e9f..6d340351 100644
--- a/gateway/package.json
+++ b/gateway/package.json
@@ -24,9 +24,7 @@
 		"node-fetch": "^2.6.1",
 		"typescript": "^4.2.3",
 		"uuid": "^8.3.2",
-		"ws": "^7.4.2"
-	},
-	"devDependencies": {
+		"ws": "^7.4.2",
 		"@types/amqplib": "^0.8.1",
 		"@types/jsonwebtoken": "^8.5.0",
 		"@types/mongoose-autopopulate": "^0.10.1",
diff --git a/gateway/src/util/Config.ts b/gateway/src/util/Config.ts
deleted file mode 100644
index e99c89f7..00000000
--- a/gateway/src/util/Config.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-// @ts-nocheck
-import { Config } from "@fosscord/util";
-import { getConfigPathForFile } from "@fosscord/util/dist/util/Config";
-import Ajv, { JSONSchemaType } from "ajv";
-
-export interface DefaultOptions {
-	endpoint?: string;
-	security: {
-		jwtSecret: string;
-	};
-}
-
-const schema: JSONSchemaType<DefaultOptions> = {
-	type: "object",
-	properties: {
-		endpoint: {
-			type: "string",
-			nullable: true,
-		},
-		security: {
-			type: "object",
-			properties: {
-				jwtSecret: {
-					type: "string",
-				},
-			},
-			required: ["jwtSecret"],
-		},
-	},
-	required: ["security"],
-};
-
-const ajv = new Ajv();
-const validator = ajv.compile(schema);
-
-const configPath = getConfigPathForFile("fosscord", "gateway", ".json");
-export const gatewayConfig = new Config<DefaultOptions>({
-	path: configPath,
-	schemaValidator: validator,
-	schema: schema,
-});
diff --git a/util/package-lock.json b/util/package-lock.json
index 4c6785104a5df3c008e2dfa7c9c4734fd590f675..f58019b6a9aca0a1103d8121ce393ff47f3c45f3 100644
GIT binary patch
delta 2702
zcmd6p+i%-c9LJTl>z1x;%2u*=U6;#-hL*;$W9NocMx4gE)k$O5xk-Q$+ew_n@g*T~
zq75`Ou^};O+7S{0Av*ESHX`vlCjJA&+g?BuPrR(JJRs~eZPy_r9+=d(<8yvT=llEq
ze&^%!<?X4*-%Z_p1{SC1&$T6vcUSo?TX()?cfRL^{1D=tHJi=XA3ZghKw|oY<-oEJ
zLcF72On=P*a_-pd{%-InW}VU(!4uR2eiV)^?=N}Wp8XHE7aB)>Y-h++ErM|^1#70#
zWsg`?`*Nx}%#ygTfbzVL@mFbCZKmW+30H8jfVGLzdWg;Y8ZCb(-*#y-l?)8zeBC=3
zD2f_nm`JBf1IrKdVC&*}0GW@0t(n=gD@HPAXH`-~H&^bK$7!MvcwVxNem=Q9b-dge
zwArT61>3V$69&p(z>B+6y7Jwj8-_3l2KT>SKBxHtr79YP2Ut**DuY6EeYjR?a_ck-
zp5)Gehkonmr_+~Cy(U(KHqW^`U6n73VB4`^3WDt!=rSuESkVu8X~vB}FcbtgytYju
zo5o10`azP9R|70w!O0|1sHf;P#pP{=!z$hqDZIz_h^P<8k$5Rp=+Z=(UaNDhVQ82s
z_O*JjwZ^r3BAMYmE+5NDQJ~nCfNZrcaD1yg*i&d2^PzDv4D9olr|pIWWbXX8zdMf1
zy%+~><YTsjTlEwUPJpn(aUOA_L$xlJ2VED6L?en?>&TeEs>zI2*PU7f@2)IO>9&IH
z(uL8pi#KP?dqo0{v=w~6f-LUM=tu00-Kehd*Vi2k6>s9H?s}fd^|=78P>EioL`HjI
zQi?G$Twq)sJ}Z>?MgxvyhA5Rl>-i0=6X~I~Qa-=lNN#cgHP&Z4gpW^^VuApxo_YoR
zCZ03w$?TSX+%e<wJ15QbQoY6j<C^UTh=Rzwy91f;jMuynqTdYL{F_JYe#6sI?aJfR
zNA(b{qW6XM2o^HhZehHOtLUjtMtUP)Aw5^U6PQSX4K_jy)y?F>GEGFX3Br}bn+1gG
z7i5n_k{MOu1_c@~C_XBmj&`W(pn)_6s-3Ng>4F&7HY6gUWmG8@Mu#jD+HkeQ;Qpr1
zsI(tgh~?wEqQS%1qDgON)U&*w$gZk!R{AYQAU#6A#r0&YoTITA#)dX&vRL=F{d6`Q
zQzIDFt}-sJyb+8ASUMt>m2^YMNK6sV#Umt*d1bAg6>|g<%lC<TC7y5V71AQgrdSGr
z`xe+TF~M+f;=`mb$7)A!tp0iCB><WHz(K-G`?S$T?|<l`{YKjqb6B}p3x*m|DMx8k
z#am5s;aZT0_Ywg%Iw*3va6N>@<1mv*1*N3MRGW>~S~eY`Dx~JBL>n6cSFJ`01SP9<
zSAbD(Mv%4s>Z%hwN!U(ckY>Mj&HnbPe+M$QZ2zL=ow02%h&fcee12;IT$RSWwEqh)
zbu8@s7Djiv=~n?w^XO?`IC;3CdH3_v7Y>5XXwDsIPTUE7@`ve_;PTA9TPH@BZYxI*
z4JB7{|1%-I6AwSTbJKD-=xCYOf9GcN9t95p8Mi-OvHydNJI3iRo$JQ+bpqv^rP0;Z
oMbil1x^fC^ot>W9dBhpi`EQVX|CK><M<sZ0)jIm<!B_Kt12P?T>i_@%

delta 95
zcmV-l0HFWBt^=Bg1CZmB83FmTHUjnxvy~9>1G7#QBoDLlCH?`k_9%h|vm7zM60>(k
z`4h9BTX!R~Zh%Dtvu=cG4znAS-~qG9mT?8Mqn&#ZvqrI85R(H*6O$cM6SKF%h!oye
BDH;F(

diff --git a/util/package.json b/util/package.json
index a33df2ba..8f32c1e3 100644
--- a/util/package.json
+++ b/util/package.json
@@ -25,22 +25,24 @@
 		"url": "https://github.com/fosscord/fosscord-server-util/issues"
 	},
 	"homepage": "https://docs.fosscord.com/",
-	"devDependencies": {
+	"dependencies": {
 		"@types/amqplib": "^0.8.1",
 		"@types/jsonwebtoken": "^8.5.0",
 		"@types/mongodb": "^3.6.9",
 		"@types/mongoose-autopopulate": "^0.10.1",
 		"@types/mongoose-lean-virtuals": "^0.5.1",
 		"@types/node": "^14.17.9",
+		"@types/node-fetch": "^2.5.12",
 		"ajv": "^8.5.0",
-		"amqplib": "^0.8.0",
 		"dot-prop": "^6.0.1",
 		"env-paths": "^2.2.1",
+		"typescript": "^4.1.3",
+		"amqplib": "^0.8.0",
 		"jsonwebtoken": "^8.5.1",
+		"mongoose-autopopulate": "^0.12.3",
+		"mongoose": "^5.13.7",
 		"missing-native-js-functions": "^1.2.2",
 		"mongodb": "^3.6.9",
-		"mongoose": "^5.13.7",
-		"mongoose-autopopulate": "^0.12.3",
-		"typescript": "^4.1.3"
+		"node-fetch": "^2.6.1"
 	}
 }