diff --git a/dashboard/src/js/client.js b/dashboard/src/js/client.js index 44c861377..a45b61846 100644 --- a/dashboard/src/js/client.js +++ b/dashboard/src/js/client.js @@ -1488,7 +1488,7 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout }; Client.prototype.getEvent = function (eventId, callback) { - get('/api/v1/cloudron/eventlog/' + eventId, {}, function (error, data, status) { + get('/api/v1/eventlog/' + eventId, {}, function (error, data, status) { if (error) return callback(error); if (status !== 200) return callback(new ClientError(status, data)); @@ -1506,7 +1506,7 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout } }; - get('/api/v1/cloudron/eventlog', config, function (error, data, status) { + get('/api/v1/eventlog', config, function (error, data, status) { if (error) return callback(error); if (status !== 200) return callback(new ClientError(status, data)); diff --git a/src/routes/test/eventlog-test.js b/src/routes/test/eventlog-test.js index 35ae57403..1fcbea782 100644 --- a/src/routes/test/eventlog-test.js +++ b/src/routes/test/eventlog-test.js @@ -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); diff --git a/src/server.js b/src/server.js index af721aa92..b4d30d837 100644 --- a/src/server.js +++ b/src/server.js @@ -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);