activation: move registration into provision model code

This commit is contained in:
Girish Ramakrishnan
2025-06-06 09:31:31 +02:00
parent 203ad6b565
commit 28a1c254d9
5 changed files with 14 additions and 17 deletions

View File

@@ -8,6 +8,7 @@ const apps = require('../../apps.js'),
expect = require('expect.js'),
fs = require('fs'),
mailer = require('../../mailer.js'),
nock = require('nock'),
oidc = require('../../oidc.js'),
safe = require('safetydance'),
server = require('../../server.js'),
@@ -135,12 +136,16 @@ async function setup() {
await timers.setTimeout(2000);
// create owner
const scope1 = nock(await appstore.getApiServerOrigin())
.post('/api/v1/register_cloudron3', (body) => typeof body.domain === 'string' && typeof body.version === 'string')
.reply(201, { id: 'cid', token: 'CLOUDRON_TOKEN' });
response = await superagent.post(`${serverUrl}/api/v1/provision/activate`)
.query({ setupToken: 'somesetuptoken' })
.send({ username: owner.username, password: owner.password, email: owner.email });
expect(response.status).to.eql(201);
owner.token = response.body.token;
owner.id = response.body.userId;
expect(scope1.isDone()).to.be.ok();
// create an admin
response = await superagent.post(`${serverUrl}/api/v1/users`)
@@ -191,7 +196,6 @@ async function checkMails(number) {
async function waitForTask(taskId) {
debug(`Waiting for task: ${taskId}`);
// eslint-disable-next-line no-constant-condition
for (let i = 0; i < 30; i++) {
const result = await tasks.get(taskId);
expect(result).to.not.be(null);