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

Handle proxyAuth addon

Browse Source
This commit is contained in:
Girish Ramakrishnan
2020-11-10 09:56:57 -08:00
parent a80ddc17a7
commit 4cebc58576
4 changed files with 84 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/app.js
+1 -1
View File
@@ -412,7 +412,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
$scope.access.error = {};
$scope.access.ftp = app.manifest.addons.localstorage && app.manifest.addons.localstorage.ftp;
$scope.access.ssoAuth = (app.manifest.addons['ldap'] || app.manifest.addons['oauth']) && app.sso;
$scope.access.ssoAuth = (app.manifest.addons['ldap'] || app.manifest.addons['proxyAuth']) && app.sso;
$scope.access.accessRestrictionOption = app.accessRestriction ? 'groups' : 'any';
$scope.access.accessRestriction = { users: [], groups: [] };
src/views/appstore.js
+1 -1
View File
@@ -169,7 +169,7 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
var manifest = app.manifest;
$scope.appInstall.optionalSso = !!manifest.optionalSso;
$scope.appInstall.customAuth = !(manifest.addons['ldap'] || manifest.addons['oauth']);
$scope.appInstall.customAuth = !(manifest.addons['ldap'] || manifest.addons['proxyAuth']);
$scope.appInstall.accessRestrictionOption = 'any';
$scope.appInstall.accessRestriction = { users: [], groups: [] };
src/views/profile.js
+1 -1
View File
@@ -447,7 +447,7 @@ angular.module('Application').controller('ProfileController', ['$scope', '$trans
var ftp = app.manifest.addons.localstorage && app.manifest.addons.localstorage.ftp;
// ignore apps without ftp and ldap or email
if (!ftp && (!app.manifest.addons.ldap || app.manifest.addons.email || !app.sso)) return;
if (!ftp && (!app.manifest.addons.ldap || !app.manifest.addons.proxyAuth || app.manifest.addons.email || !app.sso)) return;
appsById[app.id] = app;
var labelSuffix = ftp ? ' - SFTP' : '';