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

remove redundant domain arg to domains.fqdn

Browse Source
This commit is contained in:
Girish Ramakrishnan
2018-08-30 19:57:12 -07:00
parent ca16072d90
commit 068113bd5d
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/apps.js
View File

@@ -411,7 +411,7 @@ function get(appId, callback) {
if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
app.iconUrl = getIconUrlSync(app);
app.fqdn = domains.fqdn(app.location, app.domain, domainObject);
app.fqdn = domains.fqdn(app.location, domainObject);
mailboxdb.getByOwnerId(app.id, function (error, mailboxes) {
if (error && error.reason !== DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
@@ -441,7 +441,7 @@ function getByIpAddress(ip, callback) {
if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
app.iconUrl = getIconUrlSync(app);
app.fqdn = domains.fqdn(app.location, app.domain, domainObject);
app.fqdn = domains.fqdn(app.location, domainObject);
mailboxdb.getByOwnerId(app.id, function (error, mailboxes) {
if (error && error.reason !== DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
@@ -468,7 +468,7 @@ function getAll(callback) {
if (error) return iteratorDone(new AppsError(AppsError.INTERNAL_ERROR, error));
app.iconUrl = getIconUrlSync(app);
app.fqdn = domains.fqdn(app.location, app.domain, domainObject);
app.fqdn = domains.fqdn(app.location, domainObject);
mailboxdb.getByOwnerId(app.id, function (error, mailboxes) {
if (error && error.reason !== DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
@@ -595,7 +595,7 @@ function install(data, auditSource, callback) {
if (error && error.reason === DomainsError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND, 'No such domain'));
if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, 'Could not get domain info:' + error.message));
var fqdn = domains.fqdn(location, domain, domainObject);
var fqdn = domains.fqdn(location, domainObject);
error = validateHostname(location, domain, fqdn);
if (error) return callback(error);
@@ -731,7 +731,7 @@ function configure(appId, data, auditSource, callback) {
if (error && error.reason === DomainsError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND, 'No such domain'));
if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, 'Could not get domain info:' + error.message));
var fqdn = domains.fqdn(location, domain, domainObject);
var fqdn = domains.fqdn(location, domainObject);
error = validateHostname(location, domain, fqdn);
if (error) return callback(error);
@@ -994,7 +994,7 @@ function clone(appId, data, auditSource, callback) {
if (error && error.reason === DomainsError.NOT_FOUND) return callback(new AppsError(AppsError.EXTERNAL_ERROR, 'No such domain'));
if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, 'Could not get domain info:' + error.message));
error = validateHostname(location, domain, domains.fqdn(location, domain, domainObject));
error = validateHostname(location, domain, domains.fqdn(location, domainObject));
if (error) return callback(error);
var newAppId = uuid.v4(), manifest = backupInfo.manifest;