Skip to content

Node.js based forum software built for the modern web

refactor(acp/tokens): move token management page out from under and into , this makes it administrator only

Julian Lam3feae91e4c30
diff --git a/public/src/admin/settings/api.js b/public/src/admin/manage/api.js
similarity index 96%
rename from public/src/admin/settings/api.js
rename to public/src/admin/manage/api.js
index b8c709c722..d97ff95499 100644
--- a/public/src/admin/settings/api.js
+++ b/public/src/admin/manage/api.js
@@ -1,6 +1,6 @@
'use strict';
-define('admin/settings/api', ['settings', 'clipboard', 'bootbox', 'benchpress', 'api', 'alerts'], function (settings, clipboard, bootbox, Benchpress, api, alerts) {
+define('admin/manage/api', ['settings', 'clipboard', 'bootbox', 'benchpress', 'api', 'alerts'], function (settings, clipboard, bootbox, Benchpress, api, alerts) {
const ACP = {};
ACP.init = function () {
diff --git a/src/controllers/admin.js b/src/controllers/admin.js
index 00988e3906..5aee69c4dd 100644
--- a/src/controllers/admin.js
+++ b/src/controllers/admin.js
@@ -13,6 +13,7 @@ const adminController = {
tags: require('./admin/tags'),
groups: require('./admin/groups'),
digest: require('./admin/digest'),
+ api: require('./admin/api'),
appearance: require('./admin/appearance'),
federation: require('./admin/federation'),
extend: {
diff --git a/src/controllers/admin/api.js b/src/controllers/admin/api.js
new file mode 100644
index 0000000000..24de2df15b
--- /dev/null
+++ b/src/controllers/admin/api.js
@@ -0,0 +1,23 @@
+'use strict';
+
+const api = require('../../api');
+const pagination = require('../../pagination');
+
+const controller = module.exports;
+
+controller.get = async (req, res) => {
+ const page = parseInt(req.query.page, 10) || 1;
+ const resultsPerPage = 50;
+ const start = Math.max(0, page - 1) * resultsPerPage;
+ const stop = start + resultsPerPage - 1;
+ const [tokens, count] = await Promise.all([
+ api.utils.tokens.list(start, stop),
+ api.utils.tokens.count(),
+ ]);
+ const pageCount = Math.ceil(count / resultsPerPage);
+ res.render('admin/manage/api', {
+ title: '[[admin/menu:settings/api]]',
+ tokens,
+ pagination: pagination.create(page, pageCount, req.query),
+ });
+};
\ No newline at end of file
diff --git a/src/controllers/admin/settings.js b/src/controllers/admin/settings.js
index 98ff39d972..d5469fa97f 100644
--- a/src/controllers/admin/settings.js
+++ b/src/controllers/admin/settings.js
@@ -9,8 +9,6 @@ const groups = require('../../groups');
const languages = require('../../languages');
const navigationAdmin = require('../../navigation/admin');
const social = require('../../social');
-const api = require('../../api');
-const pagination = require('../../pagination');
const helpers = require('../helpers');
const translator = require('../../translator');
const plugins = require('../../plugins');
@@ -146,23 +144,6 @@ settingsController.notifications = async (req, res) => {
});
};
-settingsController.api = async (req, res) => {
- const page = parseInt(req.query.page, 10) || 1;
- const resultsPerPage = 50;
- const start = Math.max(0, page - 1) * resultsPerPage;
- const stop = start + resultsPerPage - 1;
- const [tokens, count] = await Promise.all([
- api.utils.tokens.list(start, stop),
- api.utils.tokens.count(),
- ]);
- const pageCount = Math.ceil(count / resultsPerPage);
- res.render('admin/settings/api', {
- title: '[[admin/menu:settings/api]]',
- tokens,
- pagination: pagination.create(page, pageCount, req.query),
- });
-};
-
settingsController.cookies = async (req, res) => {
res.render(`admin/settings/cookies`, {
title: `[[admin/menu:settings/cookies]]`,
diff --git a/src/routes/admin.js b/src/routes/admin.js
index 241e0138ee..364d627970 100644
--- a/src/routes/admin.js
+++ b/src/routes/admin.js
@@ -33,6 +33,7 @@ module.exports = function (app, name, middleware, controllers) {
helpers.setupAdminPageRoute(app, `/${name}/manage/uploads`, middlewares, controllers.admin.uploads.get);
helpers.setupAdminPageRoute(app, `/${name}/manage/digest`, middlewares, controllers.admin.digest.get);
+ helpers.setupAdminPageRoute(app, `/${name}/manage/api`, middlewares, controllers.admin.api.get);
helpers.setupAdminPageRoute(app, `/${name}/settings/general`, middlewares, controllers.admin.settings.general);
helpers.setupAdminPageRoute(app, `/${name}/settings/navigation`, middlewares, controllers.admin.settings.navigation);
@@ -46,7 +47,6 @@ module.exports = function (app, name, middleware, controllers) {
helpers.setupAdminPageRoute(app, `/${name}/settings/chat`, middlewares, controllers.admin.settings.chat);
helpers.setupAdminPageRoute(app, `/${name}/settings/pagination`, middlewares, controllers.admin.settings.pagination);
helpers.setupAdminPageRoute(app, `/${name}/settings/notifications`, middlewares, controllers.admin.settings.notifications);
- helpers.setupAdminPageRoute(app, `/${name}/settings/api`, middlewares, controllers.admin.settings.api);
helpers.setupAdminPageRoute(app, `/${name}/settings/cookies`, middlewares, controllers.admin.settings.cookies);
helpers.setupAdminPageRoute(app, `/${name}/settings/web-crawler`, middlewares, controllers.admin.settings.webCrawler);
helpers.setupAdminPageRoute(app, `/${name}/settings/advanced`, middlewares, controllers.admin.settings.advanced);
diff --git a/src/views/admin/settings/api.tpl b/src/views/admin/manage/api.tpl
similarity index 100%
rename from src/views/admin/settings/api.tpl
rename to src/views/admin/manage/api.tpl
diff --git a/src/views/admin/partials/navigation.tpl b/src/views/admin/partials/navigation.tpl
index 3f12256c05..29465797f8 100644
--- a/src/views/admin/partials/navigation.tpl
+++ b/src/views/admin/partials/navigation.tpl
@@ -45,6 +45,7 @@
{{{ if user.privileges.admin:admins-mods }}}
<a class="btn btn-ghost btn-sm text-start" href="{relative_path}/admin/manage/admins-mods">[[admin/menu:manage/admins-mods]]</a>
{{{ end }}}
+ <a class="btn btn-ghost btn-sm text-start" href="{relative_path}/admin/manage/api">[[admin/menu:settings/api]]</a>
{{{ if user.privileges.admin:tags }}}
<a class="btn btn-ghost btn-sm text-start" href="{relative_path}/admin/manage/tags">[[admin/menu:manage/tags]]</a>
{{{ end }}}
@@ -85,7 +86,6 @@
<a class="btn btn-ghost btn-sm text-start" href="{relative_path}/admin/settings/chat">[[admin/menu:settings/chat]]</a>
<a class="btn btn-ghost btn-sm text-start" href="{relative_path}/admin/settings/pagination">[[admin/menu:settings/pagination]]</a>
<a class="btn btn-ghost btn-sm text-start" href="{relative_path}/admin/settings/notifications">[[admin/menu:settings/notifications]]</a>
- <a class="btn btn-ghost btn-sm text-start" href="{relative_path}/admin/settings/api">[[admin/menu:settings/api]]</a>
<a class="btn btn-ghost btn-sm text-start" href="{relative_path}/admin/settings/cookies">[[admin/menu:settings/cookies]]</a>
<a class="btn btn-ghost btn-sm text-start" href="{relative_path}/admin/settings/web-crawler">[[admin/menu:settings/web-crawler]]</a>
<a class="btn btn-ghost btn-sm text-start" href="{relative_path}/admin/settings/advanced">[[admin/menu:settings/advanced]]</a>