Merge pull request #24 from TAMULib/sprint3-staging-optional-token-auth

remote project manager afford token auth
TAMULib · Aug 14, 2018 · 02c26d6 · 02c26d6
2 parents 4afeb3b + 9596f16
commit 02c26d6
Show file tree

Hide file tree

Showing 9 changed files with 109 additions and 39 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
@@ -79,28 +79,14 @@ app.controller('ProjectController', function ($controller, $scope, ProjectRepo,
     if ($scope.isManager() || $scope.isAdmin()) {
         $scope.remoteProjectManagers = RemoteProjectManagerRepo.getAll();
 
-        $scope.remoteProjects = {};
+        $scope.remoteProjects = RemoteProjectsService.getRemoteProjects();
 
         $scope.getRemoteProjectManagerRemoteProjects = function (remoteProjectManagerId) {
             return $scope.remoteProjects[remoteProjectManagerId];
         };
 
-        $scope.getRemoteProjectManagerRemoteProjects = function (remoteProjectManagerId) {
-            return $scope.remoteProjects[remoteProjectManagerId];
-        };
-
-        var getRemoteProjectManagerById = function (id) {
-            RemoteProjectsService.getAll(id).then(function (remoteProjects) {
-                $scope.remoteProjects[id] = remoteProjects;
-            });
-        };
-
-        RemoteProjectManagerRepo.ready().then(function () {
-            for (var i in $scope.remoteProjectManagers) {
-                if (i !== 'visibleColumnCount') {
-                    getRemoteProjectManagerById($scope.remoteProjectManagers[i].id);
-                }
-            }
+        RemoteProjectManagerRepo.listen([ApiResponseActions.CREATE, ApiResponseActions.DELETE, ApiResponseActions.UPDATE], function () {
+            $scope.remoteProjectManagers = RemoteProjectManagerRepo.getAll();
         });
     }
 

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/services/remoteProjectsService.js b/app/services/remoteProjectsService.js
@@ -33,14 +33,6 @@ app.service('RemoteProjectsService', function ($q, ProjectRepo, WsApi) {
         return remoteProjects;
     };
 
-    this.getAll = function (remoteProjectManagerId) {
-        return $q(function (resolve, reject) {
-            this.ready.then(function () {
-                resolve(remoteProjects[remoteProjectManagerId]);
-            });
-        }.bind(this));
-    };
-
     this.getByScopeId = function (remoteProjectManagerId, scopeId) {
         return $q(function (resolve, reject) {
             this.ready.then(function () {

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>

diff --git a/app/views/modals/addProjectModal.html b/app/views/modals/addProjectModal.html
@@ -22,8 +22,8 @@ <h4 class="modal-title">Create Project</h4>
 
     <div class="form-group" ng-if="projectToCreate.remoteProjectManager">
       <label for="remoteProjectManager">Associate Version Project</label>
-      <select class="form-control" ng-options="vp.scopeId as vp.name for vp in getRemoteProjectManagerRemoteProjects(projectToCreate.remoteProjectManager.id) | orderBy:'name'" ng-model="projectToCreate.scopeId"
-        name="remoteProjectManager">
+      <select class="form-control" ng-options="remoteProjectManager.id as remoteProjectManager.name for remoteProjectManager in getRemoteProjectManagerRemoteProjects(projectToCreate.remoteProjectManager.id) | orderBy:'name'"
+        ng-model="projectToCreate.scopeId" name="remoteProjectManager">
         <option value="" selected>None</option>
       </select>
     </div>

diff --git a/app/views/modals/editProjectModal.html b/app/views/modals/editProjectModal.html
@@ -24,8 +24,8 @@ <h4 class="modal-title">Edit Project</h4>
 
     <div class="form-group" ng-if="projectToEdit.remoteProjectManager">
       <label for="remoteProjectManager">Associate Version Project</label>
-      <select class="form-control" ng-options="vp.scopeId as vp.name for vp in getRemoteProjectManagerRemoteProjects(projectToEdit.remoteProjectManager.id) | orderBy:'name'" ng-model="projectToEdit.scopeId"
-        name="remoteProjectManager">
+      <select class="form-control" ng-options="remoteProjectManager.id as remoteProjectManager.name for remoteProjectManager in getRemoteProjectManagerRemoteProjects(projectToEdit.remoteProjectManager.id) | orderBy:'name'"
+        ng-model="projectToEdit.scopeId" name="remoteProjectManager">
         <option value="" selected>None</option>
       </select>
     </div>

diff --git a/tests/unit/controllers/remoteProjectManagerControllerTest.js b/tests/unit/controllers/remoteProjectManagerControllerTest.js
@@ -69,6 +69,10 @@ describe('controller: RemoteProjectManagerController', function () {
             expect(scope.deleteRemoteProjectManager).toBeDefined();
             expect(typeof scope.deleteRemoteProjectManager).toEqual('function');
         });
+        it('typeSettings should be defined', function () {
+            expect(scope.typeSettings).toBeDefined();
+            expect(typeof scope.typeSettings).toEqual('function');
+        });
     });
 
     describe('Do the scope methods work as expected', function () {
@@ -205,6 +209,37 @@ describe('controller: RemoteProjectManagerController', function () {
             expect(scope.cancelDeleteRemoteProjectManager).toHaveBeenCalled();
         });
 
+        it('typeSettings should return appropriate scaffold', function () {
+            var scaffold = [{
+                "type": "text",
+                "key": "url",
+                "gloss": "URL",
+                "visible": true
+            }, {
+                "type": "text",
+                "key": "username",
+                "gloss": "Username",
+                "visible": false
+            }, {
+                "type": "password",
+                "key": "password",
+                "gloss": "Password",
+                "visible": false
+            }, {
+                "type": "password",
+                "key": "token",
+                "gloss": "Token",
+                "visible": false
+            }];
+            scope.serviceTypes = [{
+                "gloss": "Version One",
+                "scaffold": scaffold,
+                "value": "VERSION_ONE"
+            }];
+            var typeSettings = scope.typeSettings('VERSION_ONE');
+            expect(typeSettings).toEqual(scaffold);
+        });
+
     });
 
 });