[security] combine root and operation level securities

Related to #302
swagger-api · Feb 17, 2015 · 49b5ce8 · 49b5ce8
1 parent 417cbff
commit 49b5ce8
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/app/scripts/directives/tryoperation.js b/app/scripts/directives/tryoperation.js
@@ -357,18 +357,18 @@ SwaggerEditor.controller('TryOperation', function ($scope, formdataFilter,
   }
 
   $scope.getSecurityOptions = function () {
-    var none = [NONE_SECURITY];
+    var securityOptions = [NONE_SECURITY];
     if (Array.isArray($scope.operation.security)) {
-      return none.concat($scope.operation.security.map(function (security) {
+      securityOptions = securityOptions.concat($scope.operation.security.map(function (security) {
         return Object.keys(security)[0];
       }));
     }
     if (Array.isArray($scope.specs.security)) {
-      return none.concat($scope.specs.security.map(function (security) {
+      securityOptions = securityOptions.concat($scope.specs.security.map(function (security) {
         return Object.keys(security)[0];
       }));
     }
-    return none;
+    return _.unique(securityOptions);
   };
   $scope.securityIsAuthenticated = function (securityName) {
     if (securityName === NONE_SECURITY) {