diff --git a/src/proxyauth-login.html b/src/proxyauth-login.html new file mode 100644 index 000000000..0ee06d033 --- /dev/null +++ b/src/proxyauth-login.html @@ -0,0 +1,81 @@ + + + Cloudron Login + + + + + + +
+

Cloudron Login

+ +
+ + + + + + + + + + + + + +
Username:
Password:
+
+
+ + + diff --git a/src/views/app.js b/src/views/app.js index 6f165fc5f..dda35b3b8 100644 --- a/src/views/app.js +++ b/src/views/app.js @@ -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: [] }; diff --git a/src/views/appstore.js b/src/views/appstore.js index 35f09fd0d..2e2954460 100644 --- a/src/views/appstore.js +++ b/src/views/appstore.js @@ -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: [] }; diff --git a/src/views/profile.js b/src/views/profile.js index 972008426..4be91f036 100644 --- a/src/views/profile.js +++ b/src/views/profile.js @@ -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' : '';