diff --git a/src/routes/test/oidc-test.js b/src/routes/test/oidc-test.js index bdb80ad97..9a11bda14 100644 --- a/src/routes/test/oidc-test.js +++ b/src/routes/test/oidc-test.js @@ -23,8 +23,7 @@ const CLIENT_1 = { name: 'test client 1', secret: 'secret1', tokenSignatureAlgorithm: 'EdDSA', - loginRedirectUri: 'https://cloudron.io/login', - logoutRedirectUri: 'https://cloudron.io/logout' + loginRedirectUri: 'https://cloudron.io/login' }; describe('OpenID connect clients API', function () { @@ -41,7 +40,7 @@ describe('OpenID connect clients API', function () { expect(response.statusCode).to.equal(401); }); - it('create succeeds without logoutRedirectUri', async function () { + it('create succeeds', async function () { const response = await superagent.post(`${serverUrl}/api/v1/oidc/clients`) .query({ access_token: owner.token }) .send(CLIENT_0); @@ -58,7 +57,7 @@ describe('OpenID connect clients API', function () { expect(response.statusCode).to.equal(409); }); - it('can create another client with logoutRedirectUri', async function () { + it('can create another client', async function () { const response = await superagent.post(`${serverUrl}/api/v1/oidc/clients`) .query({ access_token: owner.token }) .send(CLIENT_1); @@ -90,7 +89,6 @@ describe('OpenID connect clients API', function () { expect(response.body.id).to.equal(CLIENT_1.id); expect(response.body.secret).to.equal(CLIENT_1.secret); expect(response.body.loginRedirectUri).to.equal(CLIENT_1.loginRedirectUri); - expect(response.body.logoutRedirectUri).to.equal(CLIENT_1.logoutRedirectUri); expect(response.body.tokenSignatureAlgorithm).to.equal(CLIENT_1.tokenSignatureAlgorithm); }); @@ -147,40 +145,6 @@ describe('OpenID connect clients API', function () { expect(response.statusCode).to.equal(400); }); - it('can update client without logoutRedirectUri', async function () { - const response = await superagent.post(`${serverUrl}/api/v1/oidc/clients/${CLIENT_0.id}`) - .query({ access_token: owner.token }) - .send({ secret: 'newsecret', name: 'new name', loginRedirectUri: CLIENT_0.loginRedirectUri, tokenSignatureAlgorithm: CLIENT_0.tokenSignatureAlgorithm }) - .ok(() => true); - - expect(response.statusCode).to.equal(201); - - const response2 = await superagent.get(`${serverUrl}/api/v1/oidc/clients/${CLIENT_0.id}`) - .query({ access_token: owner.token }); - - expect(response2.statusCode).to.equal(200); - expect(response2.body.secret).to.equal('newsecret'); - expect(response2.body.name).to.equal('new name'); - }); - - it('can update client with logoutRedirectUri', async function () { - const response = await superagent.post(`${serverUrl}/api/v1/oidc/clients/${CLIENT_0.id}`) - .query({ access_token: owner.token }) - .send({ secret: 'newsecret', name: CLIENT_1.name, loginRedirectUri: CLIENT_0.loginRedirectUri, logoutRedirectUri: CLIENT_1.logoutRedirectUri, tokenSignatureAlgorithm: CLIENT_1.tokenSignatureAlgorithm }) - .ok(() => true); - - expect(response.statusCode).to.equal(201); - - const response2 = await superagent.get(`${serverUrl}/api/v1/oidc/clients/${CLIENT_0.id}`) - .query({ access_token: owner.token }); - - expect(response2.statusCode).to.equal(200); - expect(response2.body.secret).to.equal('newsecret'); - expect(response2.body.loginRedirectUri).to.equal(CLIENT_0.loginRedirectUri); - expect(response2.body.logoutRedirectUri).to.equal(CLIENT_1.logoutRedirectUri); - expect(response2.body.tokenSignatureAlgorithm).to.equal(CLIENT_1.tokenSignatureAlgorithm); - }); - it('cannot remove without token', async function () { const response = await superagent.del(`${serverUrl}/api/v1/oidc/clients/${CLIENT_0.id}`) .ok(() => true); diff --git a/src/tasks.js b/src/tasks.js index 515fb94d8..552410d12 100644 --- a/src/tasks.js +++ b/src/tasks.js @@ -174,6 +174,8 @@ function startTask(id, options, callback) { gTasks[id] = shell.sudo('startTask', [ START_TASK_CMD, id, logFile, options.nice || 0, options.memoryLimit || 400 ], sudoOptions, async function (sudoError) { if (!gTasks[id]) return; // ignore task exit since we are shutting down. see stopAllTasks + console.log(sudoError) + const code = sudoError ? sudoError.code : 0; debug(`startTask: ${id} completed with code ${code}`);