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

activation: move registration into provision model code

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

15
src/routes/provision.js
View File

@@ -12,11 +12,9 @@ exports = module.exports = {
detectIP
};
const appstore = require('../appstore.js'),
assert = require('assert'),
const assert = require('assert'),
AuditSource = require('../auditsource.js'),
BoxError = require('../boxerror.js'),
dashboard = require('../dashboard.js'),
HttpError = require('connect-lastmile').HttpError,
HttpSuccess = require('connect-lastmile').HttpSuccess,
network = require('../network.js'),
@@ -113,16 +111,7 @@ async function activate(req, res, next) {
const ip = req.headers['x-forwarded-for'] || req.socket.remoteAddress;
let [error, result] = await safe(dashboard.getConfig());
if (error) return next(new HttpError(500, 'internal error'));
const version = result.version;
const domain = result.adminDomain;
[error, result] = await safe(appstore.registerCloudron3(domain, version));
if (error) return next(new HttpError(409, 'appstore not reachable'));
[error, result] = await safe(provision.activate(username, password, email, displayName, ip, AuditSource.fromRequest(req)));
const [error, result] = await safe(provision.activate(username, password, email, displayName, ip, AuditSource.fromRequest(req)));
if (error) return next(BoxError.toHttpError(error));
next(new HttpSuccess(201, result));