Merge remote-tracking branch 'upstream/staging' into fix/sendMemberInProfile

6 files changed, 181 insertions, 0 deletions

diff --git a/src/api/routes/applications/#id/bot/index.ts b/src/api/routes/applications/#id/bot/index.ts
new file mode 100644
index 00000000..5cae5215
--- /dev/null
+++ b/src/api/routes/applications/#id/bot/index.ts
@@ -0,0 +1,83 @@
+import { Request, Response, Router } from "express";
+import { route } from "@fosscord/api";
+import { Application, Config, FieldErrors, generateToken, OrmUtils, Snowflake, trimSpecial, User, handleFile } from "@fosscord/util";
+import { HTTPError } from "lambert-server";
+import { verifyToken } from "node-2fa";
+
+const router: Router = Router();
+
+router.post("/", route({}), async (req: Request, res: Response) => {
+	const app = await Application.findOne({where: {id: req.params.id}});
+	if(!app) return res.status(404);
+	const username = trimSpecial(app.name);
+	const discriminator = await User.generateDiscriminator(username);
+	if (!discriminator) {
+		// We've failed to generate a valid and unused discriminator
+		throw FieldErrors({
+			username: {
+				code: "USERNAME_TOO_MANY_USERS",
+				message: req?.t("auth:register.USERNAME_TOO_MANY_USERS"),
+			},
+		});
+	}
+
+	const user = OrmUtils.mergeDeep(new User(), {
+		created_at: new Date(),
+		username: username,
+		discriminator,
+		id: app.id,
+		bot: true,
+		system: false,
+		premium_since: null,
+		desktop: false,
+		mobile: false,
+		premium: false,
+		premium_type: 0,
+		bio: app.description,
+		mfa_enabled: true,
+		totp_secret: "",
+		totp_backup_codes: [],
+		verified: true,
+		disabled: false,
+		deleted: false,
+		email: null,
+		rights: Config.get().register.defaultRights,
+		nsfw_allowed: true,
+		public_flags: "0",
+		flags: "0",
+		data: {
+			hash: null,
+			valid_tokens_since: new Date(),
+		},
+		settings: {},
+		extended_settings: {},
+		fingerprints: [],
+		notes: {},
+	});
+	await user.save();
+	app.bot = user;
+	await app.save();
+	res.send().status(204)
+});
+
+router.post("/reset", route({}), async (req: Request, res: Response) => {
+	let bot = await User.findOne({where: {id: req.params.id}});
+	let owner = await User.findOne({where: {id: req.user_id}});
+	if(!bot) return res.status(404);
+	if(owner?.totp_secret && (!req.body.code || verifyToken(owner.totp_secret, req.body.code))) {
+		throw new HTTPError(req.t("auth:login.INVALID_TOTP_CODE"), 60008);
+	}
+	bot.data = { hash: undefined, valid_tokens_since: new Date() };
+	await bot.save();
+	let token = await generateToken(bot.id);
+	res.json({token}).status(200);
+});
+
+router.patch("/", route({}), async (req: Request, res: Response) => {
+	if (req.body.avatar) req.body.avatar = await handleFile(`/avatars/${req.params.id}`, req.body.avatar as string);
+	let app = OrmUtils.mergeDeep(await User.findOne({where: {id: req.params.id}}), req.body);
+	await app.save();
+	res.json(app).status(200);
+});
+
+export default router;
\ No newline at end of file
diff --git a/src/api/routes/applications/#id/entitlements.ts b/src/api/routes/applications/#id/entitlements.ts
new file mode 100644
index 00000000..cfcfe40f
--- /dev/null
+++ b/src/api/routes/applications/#id/entitlements.ts
@@ -0,0 +1,12 @@
+import { Router, Response, Request } from "express";
+import { route } from "@fosscord/api";
+
+const router = Router();
+
+router.get("/", route({}), (req: Request, res: Response) => {
+	// TODO:
+	//const { exclude_consumed } = req.query;
+	res.status(200).send([]);
+});
+
+export default router;
diff --git a/src/api/routes/applications/#id/index.ts b/src/api/routes/applications/#id/index.ts
new file mode 100644
index 00000000..0aced582
--- /dev/null
+++ b/src/api/routes/applications/#id/index.ts
@@ -0,0 +1,30 @@
+import { Request, Response, Router } from "express";
+import { route } from "@fosscord/api";
+import { Application, OrmUtils, Team, trimSpecial, User } from "@fosscord/util";
+
+const router: Router = Router();
+
+router.get("/", route({}), async (req: Request, res: Response) => {
+	let results = await Application.findOne({where: {id: req.params.id}, relations: ["owner", "bot"] });
+	res.json(results).status(200);
+});
+
+router.patch("/", route({}), async (req: Request, res: Response) => {
+	delete req.body.icon;
+	let app = OrmUtils.mergeDeep(await Application.findOne({where: {id: req.params.id}, relations: ["owner", "bot"]}), req.body);
+	if(app.bot) {
+		app.bot.bio = req.body.description
+		app.bot?.save();
+	}
+	if(req.body.tags) app.tags = req.body.tags;
+	await app.save();
+	res.json(app).status(200);
+});
+
+router.post("/delete", route({}), async (req: Request, res: Response) => {
+	await Application.delete(req.params.id);
+	res.send().status(200);
+});
+
+
+export default router;
\ No newline at end of file
diff --git a/src/api/routes/applications/#id/skus.ts b/src/api/routes/applications/#id/skus.ts
new file mode 100644
index 00000000..5b667f36
--- /dev/null
+++ b/src/api/routes/applications/#id/skus.ts
@@ -0,0 +1,11 @@
+import { Request, Response, Router } from "express";
+import { route } from "@fosscord/api";
+import { Application, OrmUtils, Team, trimSpecial, User } from "@fosscord/util";
+
+const router: Router = Router();
+
+router.get("/", route({}), async (req: Request, res: Response) => {
+	res.json([]).status(200);
+});
+
+export default router;
\ No newline at end of file
diff --git a/src/api/routes/applications/detectable.ts b/src/api/routes/applications/detectable.ts
new file mode 100644
index 00000000..28ce42da
--- /dev/null
+++ b/src/api/routes/applications/detectable.ts
@@ -0,0 +1,11 @@
+import { Request, Response, Router } from "express";
+import { route } from "@fosscord/api";
+
+const router: Router = Router();
+
+router.get("/", route({}), async (req: Request, res: Response) => {
+	//TODO
+	res.send([]).status(200);
+});
+
+export default router;
diff --git a/src/api/routes/applications/index.ts b/src/api/routes/applications/index.ts
new file mode 100644
index 00000000..033dcc51
--- /dev/null
+++ b/src/api/routes/applications/index.ts
@@ -0,0 +1,34 @@
+import { Request, Response, Router } from "express";
+import { route } from "@fosscord/api";
+import { Application, OrmUtils, Team, trimSpecial, User } from "@fosscord/util";
+
+const router: Router = Router();
+
+export interface ApplicationCreateSchema {
+	name: string;
+	team_id?: string | number;
+}
+
+router.get("/", route({}), async (req: Request, res: Response) => {
+	//TODO
+	let results = await Application.find({where: {owner: {id: req.user_id}}, relations: ["owner", "bot"] });
+	res.json(results).status(200);
+});
+
+router.post("/", route({}), async (req: Request, res: Response) => {
+	const body = req.body as ApplicationCreateSchema;
+	const user = await User.findOne({where: {id: req.user_id}})
+	if(!user) res.status(420);
+	let app = OrmUtils.mergeDeep(new Application(), {
+		name: trimSpecial(body.name),
+		description: "",
+		bot_public: true,
+		owner: user,
+		verify_key: "IMPLEMENTME",
+		flags: 0
+	});
+	await app.save();
+	res.json(app).status(200);
+});
+
+export default router;
\ No newline at end of file