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

customAuth is obsolete

Browse Source
This commit is contained in:
Girish Ramakrishnan
2016-12-09 18:43:26 -08:00
parent 1df47b7c05
commit 2cf0d6db9d
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps.js
+2 -11
View File
@@ -504,6 +504,8 @@ function install(data, auditSource, callback) {
if (error) return callback(error); if (error) return callback(error);
if ('sso' in data && !('optionalSso' in manifest)) return callback(new AppsError(AppsError.BAD_FIELD, 'sso can only be specified for apps with optionalSso')); if ('sso' in data && !('optionalSso' in manifest)) return callback(new AppsError(AppsError.BAD_FIELD, 'sso can only be specified for apps with optionalSso'));
// if sso was unspecified, enable it by default if possible
if (sso === null) sso = manifest.addons['simpleauth'] || manifest.addons['ldap'] || manifest.addons['oauth'];
if (altDomain !== null && !validator.isFQDN(altDomain)) return callback(new AppsError(AppsError.BAD_FIELD, 'Invalid alt domain')); if (altDomain !== null && !validator.isFQDN(altDomain)) return callback(new AppsError(AppsError.BAD_FIELD, 'Invalid alt domain'));
@@ -525,17 +527,6 @@ function install(data, auditSource, callback) {
purchase(appId, appStoreId, function (error) { purchase(appId, appStoreId, function (error) {
if (error) return callback(error); if (error) return callback(error);
// FIXME revise this once customAuth is gone
if (sso === null) {
if (manifest.customAuth) {
sso = false;
} else if (manifest.addons['simpleauth'] || manifest.addons['ldap'] || manifest.addons['oauth']) {
sso = true;
} else {
sso = false;
}
}
var data = { var data = {
accessRestriction: accessRestriction, accessRestriction: accessRestriction,
memoryLimit: memoryLimit, memoryLimit: memoryLimit,