jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix eventlog route

Browse Source
This commit is contained in:
Girish Ramakrishnan
2023-08-04 12:46:54 +05:30
parent da73067315
commit a4c3d39cc3
3 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/routes/test/eventlog-test.js
+11 -11
View File
@@ -32,21 +32,21 @@ describe('Eventlog API', function () {
describe('get', function () {
it('fails due to wrong token', async function () {
const response = await superagent.get(`${serverUrl}/api/v1/cloudron/eventlog/someid`)
const response = await superagent.get(`${serverUrl}/api/v1/eventlog/someid`)
.query({ access_token: 'badtoken' })
.ok(() => true);
expect(response.statusCode).to.be(401);
});
it('fails for non-admin', async function () {
const response = await superagent.get(`${serverUrl}/api/v1/cloudron/eventlog/someid`)
const response = await superagent.get(`${serverUrl}/api/v1/eventlog/someid`)
.query({ access_token: user.token })
.ok(() => true);
expect(response.statusCode).to.equal(403);
});
it('fails if not exists', async function () {
const response = await superagent.get(`${serverUrl}/api/v1/cloudron/eventlog/someid`)
const response = await superagent.get(`${serverUrl}/api/v1/eventlog/someid`)
.query({ access_token: owner.token })
.ok(() => true);
@@ -54,7 +54,7 @@ describe('Eventlog API', function () {
});
it('succeeds for admin', async function () {
const response = await superagent.get(`${serverUrl}/api/v1/cloudron/eventlog/${EVENT_0.id}`)
const response = await superagent.get(`${serverUrl}/api/v1/eventlog/${EVENT_0.id}`)
.query({ access_token: owner.token })
.ok(() => true);
@@ -66,14 +66,14 @@ describe('Eventlog API', function () {
describe('list', function () {
it('fails due to wrong token', async function () {
const response = await superagent.get(`${serverUrl}/api/v1/cloudron/eventlog`)
const response = await superagent.get(`${serverUrl}/api/v1/eventlog`)
.query({ access_token: 'badtoken' })
.ok(() => true);
expect(response.statusCode).to.equal(401);
});
it('fails for non-admin', async function () {
const response = await superagent.get(`${serverUrl}/api/v1/cloudron/eventlog`)
const response = await superagent.get(`${serverUrl}/api/v1/eventlog`)
.query({ access_token: user.token, page: 1, per_page: 10 })
.ok(() => true);
@@ -81,7 +81,7 @@ describe('Eventlog API', function () {
});
it('succeeds for admin', async function () {
const response = await superagent.get(`${serverUrl}/api/v1/cloudron/eventlog`)
const response = await superagent.get(`${serverUrl}/api/v1/eventlog`)
.query({ access_token: owner.token, page: 1, per_page: 10 });
expect(response.statusCode).to.equal(200);
@@ -89,7 +89,7 @@ describe('Eventlog API', function () {
});
it('succeeds with action', async function () {
const response = await superagent.get(`${serverUrl}/api/v1/cloudron/eventlog`)
const response = await superagent.get(`${serverUrl}/api/v1/eventlog`)
.query({ access_token: owner.token, page: 1, per_page: 10, action: 'cloudron.activate' });
expect(response.statusCode).to.equal(200);
@@ -97,7 +97,7 @@ describe('Eventlog API', function () {
});
it('succeeds with actions', async function () {
const response = await superagent.get(`${serverUrl}/api/v1/cloudron/eventlog`)
const response = await superagent.get(`${serverUrl}/api/v1/eventlog`)
.query({ access_token: owner.token, page: 1, per_page: 10, actions: 'cloudron.activate, user.add' });
expect(response.statusCode).to.equal(200);
@@ -105,7 +105,7 @@ describe('Eventlog API', function () {
});
it('succeeds with search', async function () {
const response = await superagent.get(`${serverUrl}/api/v1/cloudron/eventlog`)
const response = await superagent.get(`${serverUrl}/api/v1/eventlog`)
.query({ access_token: owner.token, page: 1, per_page: 10, search: owner.email });
expect(response.statusCode).to.equal(200);
@@ -113,7 +113,7 @@ describe('Eventlog API', function () {
});
it('succeeds with search and actions', async function () {
const response = await superagent.get(`${serverUrl}/api/v1/cloudron/eventlog`)
const response = await superagent.get(`${serverUrl}/api/v1/eventlog`)
.query({ access_token: owner.token, page: 1, per_page: 10, search: owner.email, actions: 'cloudron.activate' });
expect(response.statusCode).to.equal(200);
src/server.js
+4 -2
View File
@@ -127,8 +127,10 @@ async function initializeExpressSync() {
router.get ('/api/v1/cloudron/memory', token, authorizeAdmin, routes.cloudron.getMemory);
router.get ('/api/v1/cloudron/logs/:unit', token, authorizeAdmin, routes.cloudron.getLogs);
router.get ('/api/v1/cloudron/logstream/:unit', token, authorizeAdmin, routes.cloudron.getLogStream);
router.get ('/api/v1/cloudron/eventlog', token, authorizeAdmin, routes.eventlog.list);
router.get ('/api/v1/cloudron/eventlog/:eventId', token, authorizeAdmin, routes.eventlog.get);
// eventlog
router.get ('/api/v1/eventlog', token, authorizeAdmin, routes.eventlog.list);
router.get ('/api/v1/eventlog/:eventId', token, authorizeAdmin, routes.eventlog.get);
// updater
router.get ('/api/v1/updater/updates', token, authorizeAdmin, routes.updater.getUpdateInfo);