From b23c06d443a2192a56c662fe45ea9d3e47029ebb Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Fri, 11 Nov 2016 22:30:18 +0530
Subject: [PATCH] remove oauth proxy from ui code

---
 webadmin/src/js/client.js        |  6 ++----
 webadmin/src/views/apps.html     |  6 ------
 webadmin/src/views/apps.js       | 13 ++-----------
 webadmin/src/views/appstore.html |  6 ------
 webadmin/src/views/appstore.js   |  4 ----
 5 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/webadmin/src/js/client.js b/webadmin/src/js/client.js
index 6b31c0e43..e6b923ce7 100644
--- a/webadmin/src/js/client.js
+++ b/webadmin/src/js/client.js
@@ -307,8 +307,7 @@ angular.module('Application').service('Client', ['$http', 'md5', 'Notification',
             portBindings: config.portBindings,
             accessRestriction: config.accessRestriction,
             cert: config.cert,
-            key: config.key,
-            oauthProxy: config.oauthProxy
+            key: config.key
         };
 
         post('/api/v1/apps/install', data).success(function (data, status) {
@@ -354,8 +353,7 @@ angular.module('Application').service('Client', ['$http', 'md5', 'Notification',
             key: config.key,
             memoryLimit: config.memoryLimit,
             altDomain: config.altDomain || null,
-            xFrameOptions: config.xFrameOptions,
-            oauthProxy: config.oauthProxy
+            xFrameOptions: config.xFrameOptions
         };
 
         post('/api/v1/apps/' + id + '/configure', data).success(function (data, status) {
diff --git a/webadmin/src/views/apps.html b/webadmin/src/views/apps.html
index a8d145a39..3fd4c633e 100644
--- a/webadmin/src/views/apps.html
+++ b/webadmin/src/views/apps.html
@@ -83,12 +83,6 @@
 
                         <div class="form-group" ng-hide="appConfigure.app.manifest.customAuth || appConfigure.app.manifest.addons.email">
                             <label class="control-label">Access control</label>
-                            <div class="radio" ng-show="appConfigure.needsOAuthProxy">
-                                <label>
-                                    <input type="radio" ng-model="appConfigure.accessRestrictionOption" value="unrestricted">
-                                    Unrestricted
-                                </label>
-                            </div>
                             <div class="radio">
                                 <label>
                                     <input type="radio" ng-model="appConfigure.accessRestrictionOption" value="any">
diff --git a/webadmin/src/views/apps.js b/webadmin/src/views/apps.js
index 5f3dc3e15..b18a896cc 100644
--- a/webadmin/src/views/apps.js
+++ b/webadmin/src/views/apps.js
@@ -31,7 +31,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         accessRestrictionOption: 'any',
         accessRestriction: { users: [], groups: [] },
         xFrameOptions: '',
-        needsOAuthProxy: false,
 
         isAccessRestrictionValid: function () {
             var tmp = $scope.appConfigure.accessRestriction;
@@ -95,7 +94,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         $scope.appConfigure.accessRestrictionOption = 'any';
         $scope.appConfigure.accessRestriction = { users: [], groups: [] };
         $scope.appConfigure.xFrameOptions = '';
-        $scope.appConfigure.needsOAuthProxy = false;
 
         $scope.appConfigureForm.$setPristine();
         $scope.appConfigureForm.$setUntouched();
@@ -198,13 +196,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
             $scope.appConfigure.memoryTicks.unshift(app.manifest.memoryLimit);
         }
 
-        var manifest = app.manifest;
-        $scope.appConfigure.needsOAuthProxy = !(manifest.addons['ldap'] || manifest.addons['oauth'] || manifest.addons['simpleauth'] || manifest.addons['email'] || manifest.customAuth);
-        if ($scope.appConfigure.needsOAuthProxy && !app.oauthProxy) {
-            $scope.appConfigure.accessRestrictionOption = 'unrestricted';
-        } else {
-            $scope.appConfigure.accessRestrictionOption = app.accessRestriction ? 'groups' : 'any';
-        }
+        $scope.appConfigure.accessRestrictionOption = app.accessRestriction ? 'groups' : 'any';
 
         // fill the portBinding structures. There might be holes in the app.portBindings, which signalizes a disabled port
         for (var env in $scope.appConfigure.portBindingsInfo) {
@@ -243,8 +235,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
             cert: $scope.appConfigure.certificateFile,
             key: $scope.appConfigure.keyFile,
             xFrameOptions: $scope.appConfigure.xFrameOptions ? ('ALLOW-FROM ' + $scope.appConfigure.xFrameOptions) : 'SAMEORIGIN',
-            memoryLimit: $scope.appConfigure.memoryLimit === $scope.appConfigure.memoryTicks[0] ? 0 : $scope.appConfigure.memoryLimit,
-            oauthProxy:  $scope.appConfigure.needsOAuthProxy && $scope.appConfigure.accessRestrictionOption !== 'unrestricted'
+            memoryLimit: $scope.appConfigure.memoryLimit === $scope.appConfigure.memoryTicks[0] ? 0 : $scope.appConfigure.memoryLimit
         };
 
         Client.configureApp($scope.appConfigure.app.id, $scope.appConfigure.password, data, function (error) {
diff --git a/webadmin/src/views/appstore.html b/webadmin/src/views/appstore.html
index bf2954dc7..d602eff0a 100644
--- a/webadmin/src/views/appstore.html
+++ b/webadmin/src/views/appstore.html
@@ -73,12 +73,6 @@
                                     </span>
                                 </div>
                             </div>
-                            <div class="radio" ng-show="appInstall.needsOAuthProxy">
-                                <label>
-                                    <input type="radio" ng-model="appInstall.accessRestrictionOption" value="unrestricted">
-                                    Unrestricted
-                                </label>
-                            </div>
                             <div class="radio" ng-show="appInstall.optionalSso">
                                 <label>
                                     <input type="radio" ng-model="appInstall.accessRestrictionOption" value="nosso">
diff --git a/webadmin/src/views/appstore.js b/webadmin/src/views/appstore.js
index 453150899..8389c11fa 100644
--- a/webadmin/src/views/appstore.js
+++ b/webadmin/src/views/appstore.js
@@ -36,7 +36,6 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
         keyFileName: '',
         accessRestrictionOption: 'any',
         accessRestriction: { users: [], groups: [] },
-        needsOAuthProxy: false,
         optionalSso: false,
 
         isAccessRestrictionValid: function () {
@@ -65,7 +64,6 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
             $scope.appInstall.keyFileName = '';
             $scope.appInstall.accessRestrictionOption = 'any';
             $scope.appInstall.accessRestriction = { users: [], groups: [] };
-            $scope.appInstall.needsOAuthProxy = false;
             $scope.appInstall.optionalSso = false;
 
             $('#collapseInstallForm').collapse('hide');
@@ -108,7 +106,6 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
             $scope.appInstall.accessRestriction = app.accessRestriction || { users: [], groups: [] };
 
             var manifest = app.manifest;
-            $scope.appInstall.needsOAuthProxy = !(manifest.addons['ldap'] || manifest.addons['oauth'] || manifest.addons['simpleauth'] || manifest.addons['email'] || manifest.customAuth);
             $scope.appInstall.optionalSso = !!manifest.optionalSso;
             $scope.appInstall.accessRestrictionOption = 'any';
 
@@ -144,7 +141,6 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
                 accessRestriction: accessRestriction,
                 cert: $scope.appInstall.certificateFile,
                 key: $scope.appInstall.keyFile,
-                oauthProxy:  $scope.appInstall.needsOAuthProxy && $scope.appInstall.accessRestrictionOption !== 'unrestricted',
                 sso: $scope.appInstall.optionalSso  && $scope.appInstall.accessRestriction == 'nosso'
             };