remote project manager afford token auth

TAMULib · Aug 13, 2018 · 8006590 · 8006590
1 parent 4afeb3b
commit 8006590
Show file tree

Hide file tree

Showing 5 changed files with 78 additions and 14 deletions.
diff --git a/app/controllers/projectController.js b/app/controllers/projectController.js
@@ -1,4 +1,4 @@
-app.controller('ProjectController', function ($controller, $scope, ProjectRepo, RemoteProjectManagerRepo, RemoteProjectsService) {
+app.controller('ProjectController', function ($controller, $scope, ApiResponseActions, ProjectRepo, RemoteProjectManagerRepo, RemoteProjectsService) {
 
     angular.extend(this, $controller('AbstractController', {
         $scope: $scope
@@ -95,12 +95,19 @@ app.controller('ProjectController', function ($controller, $scope, ProjectRepo,
             });
         };
 
-        RemoteProjectManagerRepo.ready().then(function () {
+        var enhanceRemoteProjects = function () {
             for (var i in $scope.remoteProjectManagers) {
-                if (i !== 'visibleColumnCount') {
-                    getRemoteProjectManagerById($scope.remoteProjectManagers[i].id);
-                }
+                getRemoteProjectManagerById($scope.remoteProjectManagers[i].id);
             }
+        };
+
+        RemoteProjectManagerRepo.ready().then(function () {
+            enhanceRemoteProjects();
+        });
+
+        RemoteProjectManagerRepo.listen([ApiResponseActions.CREATE, ApiResponseActions.DELETE, ApiResponseActions.UPDATE], function () {
+            $scope.remoteProjectManagers = RemoteProjectManagerRepo.getAll();
+            enhanceRemoteProjects();
         });
     }
 

diff --git a/app/controllers/remoteProjectManagerController.js b/app/controllers/remoteProjectManagerController.js
@@ -1,4 +1,4 @@
-app.controller('RemoteProjectManagerController', function ($controller, $scope, RemoteProjectManagerRepo) {
+app.controller('RemoteProjectManagerController', function ($controller, $scope, ApiResponseActions, RemoteProjectManagerRepo) {
 
     angular.extend(this, $controller('AbstractController', {
         $scope: $scope
@@ -13,6 +13,7 @@ app.controller('RemoteProjectManagerController', function ($controller, $scope,
 
     RemoteProjectManagerRepo.getTypes().then(function (types) {
         $scope.serviceTypes = types;
+        $scope.resetRemoteProjectManagerForms();
     });
 
     $scope.remoteProjectManagerForms = {
@@ -30,8 +31,6 @@ app.controller('RemoteProjectManagerController', function ($controller, $scope,
         $scope.closeModal();
     };
 
-    $scope.resetRemoteProjectManagerForms();
-
     $scope.createRemoteProjectManager = function () {
         RemoteProjectManagerRepo.create($scope.remoteProjectManagerToCreate).then(function (res) {
             if (angular.fromJson(res.body).meta.status === 'SUCCESS') {
@@ -89,4 +88,8 @@ app.controller('RemoteProjectManagerController', function ($controller, $scope,
         return [];
     };
 
+    RemoteProjectManagerRepo.listen([ApiResponseActions.CREATE, ApiResponseActions.DELETE, ApiResponseActions.UPDATE], function () {
+        $scope.remoteProjectManagers = RemoteProjectManagerRepo.getAll();
+    });
+
 });
diff --git a/app/directives/remoteProjectManagerFormDirective.js b/app/directives/remoteProjectManagerFormDirective.js
@@ -7,6 +7,52 @@ app.directive('remoteProjectManagerForm', function () {
             'managementSettings': '=',
             'model': '='
         },
-        link: function ($scope) {}
+        link: function ($scope) {
+
+            var isAuthRequired = function () {
+                for (var i in $scope.managementSettings) {
+                    var key = $scope.managementSettings[i].key;
+                    if (key === 'password' || key === 'token') {
+                        return true;
+                    }
+                }
+            };
+
+            var hasToken = function () {
+                for (var key in $scope.model.settings) {
+                    var value = $scope.model.settings[key];
+                    if (key === 'token' && value !== undefined && value.length > 0) {
+                        return true;
+                    }
+                }
+            };
+
+            $scope.auth = {
+                useToken: hasToken(),
+                required: isAuthRequired()
+            };
+
+            $scope.inputSetting = function (setting) {
+                var display = true;
+                if ($scope.auth.useToken) {
+                    if (setting.key === 'username' || setting.key === 'password') {
+                        display = false;
+                    }
+                } else {
+                    if (setting.key === 'token') {
+                        display = false;
+                    }
+                }
+                return display;
+            };
+
+            $scope.clearAuthSettings = function () {
+                for (var key in $scope.model.settings) {
+                    if (key === 'token' || key === 'username' || key === 'password') {
+                        $scope.model.settings[key] = '';
+                    }
+                }
+            };
+        }
     };
 });
diff --git a/app/views/directives/remoteProjectManagerForm.html b/app/views/directives/remoteProjectManagerForm.html
@@ -1,5 +1,13 @@
-<div ng-repeat="setting in managementSettings" class=form-group>
+<div ng-repeat="setting in managementSettings" class="form-group" ng-show="inputSetting(setting)">
   <label for="{{setting.key}}-input">{{setting.gloss}}</label>
-  <input class="form-control" id="{{setting.key}}" type="{{setting.key === 'password' ? 'password' : 'text'}}" ng-model="model.settings[setting.key]"
-    placeholder="{{setting.gloss}} for Remote Project Manager" />
+  <input class="form-control" id="{{setting.key}}" type="{{setting.type}}" ng-model="model.settings[setting.key]" placeholder="{{setting.gloss}} for Remote Project Manager" />
+</div>
+<div class="form-group" ng-if="auth.required">
+  <label for="toggle-auth">Auth</label>
+  <div class="checkbox">
+    <label>
+      &nbsp;
+      <input id="toggle-auth" name="toggle-auth" type="checkbox" ng-model="auth.useToken" ng-changed="clearAuthSettings()" />Use token auth
+    </label>
+  </div>
 </div>
diff --git a/app/views/management/remoteProjectManager.html b/app/views/management/remoteProjectManager.html
@@ -9,13 +9,13 @@
       <th>Settings</th>
       <th class="actions-column text-center">Actions</th>
     </tr>
-    <tr ng-repeat="remoteProjectManager in remoteProjectManagers | orderBy: 'name'">
+    <tr ng-repeat="remoteProjectManager in remoteProjectManagers">
       <td title="'Remote Project Manager'">{{remoteProjectManager.name}}</td>
       <td title="'Settings'">
         <ul class="list-unstyled">
           <li ng-repeat="setting in typeSettings(remoteProjectManager.type) | filter:{visible:true}">
             <label>{{setting.gloss}}:</label>
-            <span>&nbsp{{remoteProjectManager.settings[setting.key]}}</span>
+            <span>&nbsp;{{remoteProjectManager.settings[setting.key]}}</span>
           </li>
         </ul>
       </td>