Fix securityScheme overwrite options

Author: jcenturion

dist/examples/leagues.raml

@@ -58,6 +58,7 @@ securedBy: [ basic, digest_auth, oauth_2_0, custom_scheme_1, custom_scheme_2 ]
   description: |
     Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent sagittis ipsum felis, sed aliquam massa egestas vel. Sed scelerisque leo lorem, a gravida enim congue eget. Sed rutrum quis odio vitae sollicitudin. Interdum et malesuada fames ac ante ipsum primis in faucibus. Nunc pulvinar arcu at diam pharetra finibus. Curabitur malesuada hendrerit odio id consectetur. Etiam felis augue, malesuada ut turpis vel, tincidunt sodales justo. Donec quam eros, accumsan ut elementum et, euismod placerat ligula. Phasellus consequat velit lacus. Aenean vel massa et sapien molestie imperdiet et id ex. Nulla quis suscipit libero.
   post:
+    securedBy: [ oauth_2_0: { scopes: [ read ] } ]
     description: Delete an item by Code.
     headers:
       header:

dist/scripts/api-console.js

@@ -1095,6 +1095,7 @@
 
         $scope.$on('resetData', function() {
           $scope.currentSchemeType = 'Anonymous';
+          $scope.currentScheme = 'Anonymous|anonymous';
         });
 
         $scope.cancelRequest = function () {
@@ -2989,14 +2990,33 @@ RAML.Inspector = (function() {
       var securedBy = this.securedBy || [],
           selectedSchemes = {};
 
+      var overwrittenSchemes = {};
+
+      securedBy.map(function(el) {
+        if (typeof el === 'object') {
+          var key = Object.keys(el)[0];
+
+          overwrittenSchemes[key] = el[key];
+          securedBy.push(key);
+        }
+      });
+
       securedBy = securedBy.filter(function(name) {
         return name !== null && typeof name !== 'object';
       });
 
       securitySchemes.forEach(function(scheme) {
         securedBy.forEach(function(name) {
           if (scheme[name]) {
-            selectedSchemes[name] = scheme[name];
+            selectedSchemes[name] = jQuery.extend(true, {}, scheme[name]);
+          }
+        });
+      });
+
+      Object.keys(overwrittenSchemes).map(function (key) {
+        Object.keys(overwrittenSchemes[key]).map(function (prop) {
+          if (selectedSchemes[key].settings) {
+            selectedSchemes[key].settings[prop] = overwrittenSchemes[key][prop];
           }
         });
       });

src/app/directives/sidebar.js

@@ -175,6 +175,7 @@
 
         $scope.$on('resetData', function() {
           $scope.currentSchemeType = 'Anonymous';
+          $scope.currentScheme = 'Anonymous|anonymous';
         });
 
         $scope.cancelRequest = function () {

src/assets/examples/leagues.raml

@@ -58,6 +58,7 @@ securedBy: [ basic, digest_auth, oauth_2_0, custom_scheme_1, custom_scheme_2 ]
   description: |
     Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent sagittis ipsum felis, sed aliquam massa egestas vel. Sed scelerisque leo lorem, a gravida enim congue eget. Sed rutrum quis odio vitae sollicitudin. Interdum et malesuada fames ac ante ipsum primis in faucibus. Nunc pulvinar arcu at diam pharetra finibus. Curabitur malesuada hendrerit odio id consectetur. Etiam felis augue, malesuada ut turpis vel, tincidunt sodales justo. Donec quam eros, accumsan ut elementum et, euismod placerat ligula. Phasellus consequat velit lacus. Aenean vel massa et sapien molestie imperdiet et id ex. Nulla quis suscipit libero.
   post:
+    securedBy: [ oauth_2_0: { scopes: [ read ] } ]
     description: Delete an item by Code.
     headers:
       header:

src/common/inspector/method.js

@@ -72,14 +72,33 @@
       var securedBy = this.securedBy || [],
           selectedSchemes = {};
 
+      var overwrittenSchemes = {};
+
+      securedBy.map(function(el) {
+        if (typeof el === 'object') {
+          var key = Object.keys(el)[0];
+
+          overwrittenSchemes[key] = el[key];
+          securedBy.push(key);
+        }
+      });
+
       securedBy = securedBy.filter(function(name) {
         return name !== null && typeof name !== 'object';
       });
 
       securitySchemes.forEach(function(scheme) {
         securedBy.forEach(function(name) {
           if (scheme[name]) {
-            selectedSchemes[name] = scheme[name];
+            selectedSchemes[name] = jQuery.extend(true, {}, scheme[name]);
+          }
+        });
+      });
+
+      Object.keys(overwrittenSchemes).map(function (key) {
+        Object.keys(overwrittenSchemes[key]).map(function (prop) {
+          if (selectedSchemes[key].settings) {
+            selectedSchemes[key].settings[prop] = overwrittenSchemes[key][prop];
           }
         });
       });