quickaction api

sogebot · Apr 12, 2024 · 9819a8c · 9819a8c
1 parent 2b02fc7
commit 9819a8c
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 29 deletions.
diff --git a/d.ts/src/helpers/socket.d.ts b/d.ts/src/helpers/socket.d.ts
@@ -377,12 +377,6 @@ export type ClientToServerEventsWithNamespace = {
     'generic::save': generic<WidgetCustomInterface>['save'];
     'generic::deleteById': generic<WidgetCustomInterface>['deleteById'];
   },
-  '/widgets/quickaction': GenericEvents & {
-    'generic::deleteById': generic<QuickActions>['deleteById'],
-    'generic::save': generic<QuickActions>['save'],
-    'generic::getAll': (userId: string, cb: (error: Error | string | null | unknown, items: Readonly<Required<QuickActions>>[]) => void) => void,
-    'trigger': (data: { user: { userId: string, userName: string }, id: string, value?: any}) => void,
-  },
   '/widgets/social': GenericEvents & {
     'generic::getAll': generic<WidgetSocialInterface>['getAll'];
   },

diff --git a/src/helpers/socket.ts b/src/helpers/socket.ts
@@ -156,11 +156,12 @@ const withScope = (allowedScopes: string[], isPublic: boolean = false) => {
       }
 
       const token = jwt.verify(authToken, socket.JWTKey) as {
-        userId: string; username: string; privileges: Unpacked<ReturnType<typeof getPrivileges>>;
+        userId: string; userName: string; privileges: Unpacked<ReturnType<typeof getPrivileges>>;
       };
 
       token.privileges.scopes = token.privileges.scopes || [];
       req.headers.scopes = token.privileges.scopes.sort();
+      req.headers.authUser = { userId: token.userId, userName: token.userName };
 
       if (!token.privileges.scopes.some(scope => allowedScopes.includes(scope))) {
         req.headers.private = false;

diff --git a/src/widgets/quickaction.ts b/src/widgets/quickaction.ts
@@ -7,7 +7,7 @@ import { setValueOf } from '../helpers/customvariables/index.js';
 import { info } from '../helpers/log.js';
 
 import { AppDataSource } from '~/database.js';
-import { adminEndpoint } from '~/helpers/socket.js';
+import { Delete, Get, Post } from '~/decorators/endpoint.js';
 
 const trigger = async (item: QuickActions.Item, user: { userId: string, userName: string }, value?: string) => {
   info(`Quick Action ${item.id} triggered by ${user.userName}#${user.userId}`);
@@ -47,27 +47,28 @@ const trigger = async (item: QuickActions.Item, user: { userId: string, userName
 };
 
 class QuickAction extends Widget {
-  public sockets() {
-    adminEndpoint('/widgets/quickaction', 'generic::deleteById', async (id, cb) => {
-      try {
-        const item = await AppDataSource.getRepository(QuickActionEntity).findOneByOrFail({ id });
-        await AppDataSource.getRepository(QuickActionEntity).remove(item);
-        cb(null);
-      } catch (e) {
-        cb(e as Error);
-      }
-    });
-    adminEndpoint('/widgets/quickaction', 'generic::save', async (item, cb) => {
-      cb(null, await AppDataSource.getRepository(QuickActionEntity).save(item));
-    });
-    adminEndpoint('/widgets/quickaction', 'generic::getAll', async (userId, cb) => {
-      const items = await AppDataSource.getRepository(QuickActionEntity).find({ where: { userId } });
-      cb(null, items);
-    });
-    adminEndpoint('/widgets/quickaction', 'trigger', async ({ user, id, value }) => {
-      const item = await AppDataSource.getRepository(QuickActionEntity).findOneByOrFail({ id, userId: user.userId });
-      trigger(item, { userId: user.userId, userName: user.userName }, value);
-    });
+  @Get('/', 'read')
+  getAll(req: any) {
+    return AppDataSource.getRepository(QuickActionEntity).findBy({ userId: req.headers.authUser.userId });
+  }
+
+  @Delete('/:id')
+  async deleteOne(req: any) {
+    const it = await AppDataSource.getRepository(QuickActionEntity).delete({ id: req.params.id, userId: req.headers.authUser.userId });
+    if (it.affected === 0) {
+      throw new Error();
+    }
+  }
+
+  @Post('/')
+  saveOne(req: any) {
+    return AppDataSource.getRepository(QuickActionEntity).save(req.body);
+  }
+
+  @Post('/:id', { action: 'trigger' })
+  async trigger(req: any) {
+    const item = await AppDataSource.getRepository(QuickActionEntity).findOneByOrFail({ id: req.params.id, userId: req.headers.authUser.userId });
+    trigger(item, { userId: req.headers.authUser.userId, userName: req.headers.authUser.userName }, req.body.value);
   }
 }