From 10c19af2ad8623514ab29be09aecd92bf1b7a37b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 6 Dec 2021 20:06:15 -0500 Subject: [PATCH] breaking: remove deprecated socket.emit('admin.categories.getAll') --- src/privileges/admin.js | 1 - src/socket.io/admin/categories.js | 15 --------------- test/categories.js | 8 -------- 3 files changed, 24 deletions(-) diff --git a/src/privileges/admin.js b/src/privileges/admin.js index e6139f2203..dcf7cfa947 100644 --- a/src/privileges/admin.js +++ b/src/privileges/admin.js @@ -76,7 +76,6 @@ privsAdmin.socketMap = { 'admin.rooms.getAll': 'admin:dashboard', 'admin.analytics.get': 'admin:dashboard', - 'admin.categories.getAll': 'admin:categories', 'admin.categories.create': 'admin:categories', 'admin.categories.update': 'admin:categories', 'admin.categories.purge': 'admin:categories', diff --git a/src/socket.io/admin/categories.js b/src/socket.io/admin/categories.js index 5f1e9cb219..af45e1643d 100644 --- a/src/socket.io/admin/categories.js +++ b/src/socket.io/admin/categories.js @@ -1,9 +1,7 @@ 'use strict'; -const winston = require('winston'); const categories = require('../../categories'); -const plugins = require('../../plugins'); const api = require('../../api'); const sockets = require('..'); @@ -18,19 +16,6 @@ Categories.create = async function (socket, data) { return await api.categories.create(socket, data); }; -// DEPRECATED: @1.14.3, remove in version >=1.16 -Categories.getAll = async function () { - winston.warn('[deprecated] admin.categories.getAll deprecated, data is returned in the api route'); - const cids = await categories.getAllCidsFromSet('categories:cid'); - const fields = [ - 'cid', 'name', 'icon', 'parentCid', 'disabled', 'link', - 'color', 'bgColor', 'backgroundImage', 'imageClass', - ]; - const categoriesData = await categories.getCategoriesFields(cids, fields); - const result = await plugins.hooks.fire('filter:admin.categories.get', { categories: categoriesData, fields: fields }); - return categories.getTree(result.categories, 0); -}; - Categories.getNames = async function () { return await categories.getAllCategoryFields(['cid', 'name']); }; diff --git a/test/categories.js b/test/categories.js index e91a51f619..0f9c4d7c9c 100644 --- a/test/categories.js +++ b/test/categories.js @@ -473,14 +473,6 @@ describe('Categories', () => { }); }); - it('should get all categories', (done) => { - socketCategories.getAll({ uid: adminUid }, {}, (err, data) => { - assert.ifError(err); - assert(data); - done(); - }); - }); - it('should get all category names', (done) => { socketCategories.getNames({ uid: adminUid }, {}, (err, data) => { assert.ifError(err);