From 4f6e59e936dd9dfc10bebe7ac10dea8c0d96e6ec Mon Sep 17 00:00:00 2001 From: ChrisChrome Date: Wed, 10 Aug 2022 02:53:29 -0600 Subject: Add basic developer panel functionality - doesn't work yet > > > Co-authored-by: TheArcaneBrony --- api/src/routes/applications/index.ts | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) (limited to 'api/src/routes/applications/index.ts') diff --git a/api/src/routes/applications/index.ts b/api/src/routes/applications/index.ts index 28ce42da..c9be1131 100644 --- a/api/src/routes/applications/index.ts +++ b/api/src/routes/applications/index.ts @@ -1,11 +1,35 @@ 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 - res.send([]).status(200); + let results = await Application.find({where: {owner: {id: req.user_id}}, relations: ["owner"] }); + 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, + bot_require_code_grant: false, + owner: user, + verify_key: "IMPLEMENTME", + flags: "" + }); + await app.save(); + res.json(app).status(200); }); -export default router; +export default router; \ No newline at end of file -- cgit 1.5.1 From 4fe40c2a2016cce4278fbb40093c38145b36e0ea Mon Sep 17 00:00:00 2001 From: ChrisChrome Date: Wed, 10 Aug 2022 03:52:03 -0600 Subject: It works now... I guess Co-authored-by: TheArcaneBrony --- api/src/routes/applications/#id/index.ts | 1 - api/src/routes/applications/index.ts | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'api/src/routes/applications/index.ts') diff --git a/api/src/routes/applications/#id/index.ts b/api/src/routes/applications/#id/index.ts index be8c3ba4..a16b18a9 100644 --- a/api/src/routes/applications/#id/index.ts +++ b/api/src/routes/applications/#id/index.ts @@ -7,7 +7,6 @@ const router: Router = Router(); router.get("/", route({}), async (req: Request, res: Response) => { //TODO let results = await Application.findOne({where: {id: req.params.id}, relations: ["owner", "bot"] }); - //debugger; res.json(results).status(200); }); diff --git a/api/src/routes/applications/index.ts b/api/src/routes/applications/index.ts index c9be1131..41ce35b5 100644 --- a/api/src/routes/applications/index.ts +++ b/api/src/routes/applications/index.ts @@ -11,7 +11,7 @@ export interface ApplicationCreateSchema { router.get("/", route({}), async (req: Request, res: Response) => { //TODO - let results = await Application.find({where: {owner: {id: req.user_id}}, relations: ["owner"] }); + let results = await Application.find({where: {owner: {id: req.user_id}}, relations: ["owner", "bot"] }); res.json(results).status(200); }); -- cgit 1.5.1 From d20a42af18ff641f365bcee2069cb660cc6dbe35 Mon Sep 17 00:00:00 2001 From: TheArcaneBrony Date: Wed, 10 Aug 2022 16:07:01 +0200 Subject: Make teams nullable --- api/src/routes/applications/index.ts | 3 +-- util/src/entities/Application.ts | 1 + .../mariadb/1660131942703-apps_nullable_team.ts | 18 ++++++++++++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 util/src/migrations/mariadb/1660131942703-apps_nullable_team.ts (limited to 'api/src/routes/applications/index.ts') diff --git a/api/src/routes/applications/index.ts b/api/src/routes/applications/index.ts index 41ce35b5..033dcc51 100644 --- a/api/src/routes/applications/index.ts +++ b/api/src/routes/applications/index.ts @@ -23,10 +23,9 @@ router.post("/", route({}), async (req: Request, res: Response) => { name: trimSpecial(body.name), description: "", bot_public: true, - bot_require_code_grant: false, owner: user, verify_key: "IMPLEMENTME", - flags: "" + flags: 0 }); await app.save(); res.json(app).status(200); diff --git a/util/src/entities/Application.ts b/util/src/entities/Application.ts index 28381579..103f8e84 100644 --- a/util/src/entities/Application.ts +++ b/util/src/entities/Application.ts @@ -104,6 +104,7 @@ export class Application extends BaseClass { @JoinColumn({ name: "team_id" }) @ManyToOne(() => Team, { onDelete: "CASCADE", + nullable: true }) team?: Team; diff --git a/util/src/migrations/mariadb/1660131942703-apps_nullable_team.ts b/util/src/migrations/mariadb/1660131942703-apps_nullable_team.ts new file mode 100644 index 00000000..ac445772 --- /dev/null +++ b/util/src/migrations/mariadb/1660131942703-apps_nullable_team.ts @@ -0,0 +1,18 @@ +import { MigrationInterface, QueryRunner } from "typeorm"; + +export class appsNullableTeam1660131942703 implements MigrationInterface { + name = 'appsNullableTeam1660131942703' + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(` + DROP INDEX \`IDX_2ce5a55796fe4c2f77ece57a64\` ON \`applications\` + `); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(` + CREATE UNIQUE INDEX \`IDX_2ce5a55796fe4c2f77ece57a64\` ON \`applications\` (\`bot_user_id\`) + `); + } + +} -- cgit 1.5.1