Fix authentication options when switching methods

Author: jcenturion

dist/scripts/api-console.js

@@ -419,8 +419,6 @@
           var $inactiveElements = jQuery('.raml-console-tab').add('.raml-console-resource').add('li');
           var methodInfo        = $scope.resource.methods[$index];
 
-          console.log($scope.resource.methods);
-
           $scope.methodInfo               = methodInfo;
           $scope.responseInfo             = getResponseInfo();
           $scope.context                  = new RAML.Services.TryIt.Context($scope.raml.baseUriParameters, $scope.resource, $scope.methodInfo);
@@ -441,6 +439,8 @@
           toUIModel($scope.methodInfo.headers.plain);
           toUIModel($scope.resource.uriParametersForDocumentation);
 
+          $rootScope.$broadcast('resetData');
+
           $scope.securitySchemes.anonymous = {
             type: 'Anonymous'
           };
@@ -452,12 +452,6 @@
 
           loadExamples();
 
-          var defaultScheme = Object.keys($scope.securitySchemes).sort()[0];
-          $scope.currentScheme = {
-            type: $scope.securitySchemes[defaultScheme].type,
-            name: defaultScheme
-          };
-
           // Hack for codemirror
           setTimeout(function () {
             var editors = jQuery('.raml-console-sidebar-content-wrapper #sidebar-body .raml-console-codemirror-body-editor .CodeMirror');
@@ -1085,6 +1079,14 @@
           });
         }
 
+        $scope.$on('resetData', function(event) {
+          $scope.currentSchemeType = 'Anonymous';
+        });
+
+        $scope.securitySchemeChanged = function (value) {
+          $scope.currentSchemeType = value;
+        }
+
         $scope.cancelRequest = function () {
           $scope.showSpinner = false;
         };
@@ -5315,7 +5317,7 @@ angular.module('ramlConsoleApp').run(['$templateCache', function($templateCache)
     "            <div class=\"raml-console-sidebar-row raml-console-sidebar-securty\">\n" +
     "              <div class=\"raml-console-toggle-group raml-console-sidebar-toggle-group\">\n" +
     "                <label class=\"raml-console-sidebar-label\">Security Scheme</label>\n" +
-    "                <select class=\"raml-console-sidebar-input\" ng-model=\"currentSchemeType\" style=\"margin-bottom: 0;\">\n" +
+    "                <select class=\"raml-console-sidebar-input\" ng-model=\"currentSchemeType\" style=\"margin-bottom: 0;\" ng-change=\"securitySchemeChanged(currentSchemeType)\">\n" +
     "                 <option ng-repeat=\"(key, scheme) in securitySchemes\" value=\"{{scheme.type}}\" ng-selected=\"scheme.type=='Anonymous'\">{{scheme.type}}</option>\n" +
     "                </select>\n" +
     "              </div>\n" +

src/app/directives/method-list.js

@@ -92,8 +92,6 @@
           var $inactiveElements = jQuery('.raml-console-tab').add('.raml-console-resource').add('li');
           var methodInfo        = $scope.resource.methods[$index];
 
-          console.log($scope.resource.methods);
-
           $scope.methodInfo               = methodInfo;
           $scope.responseInfo             = getResponseInfo();
           $scope.context                  = new RAML.Services.TryIt.Context($scope.raml.baseUriParameters, $scope.resource, $scope.methodInfo);
@@ -114,6 +112,8 @@
           toUIModel($scope.methodInfo.headers.plain);
           toUIModel($scope.resource.uriParametersForDocumentation);
 
+          $rootScope.$broadcast('resetData');
+
           $scope.securitySchemes.anonymous = {
             type: 'Anonymous'
           };
@@ -125,12 +125,6 @@
 
           loadExamples();
 
-          var defaultScheme = Object.keys($scope.securitySchemes).sort()[0];
-          $scope.currentScheme = {
-            type: $scope.securitySchemes[defaultScheme].type,
-            name: defaultScheme
-          };
-
           // Hack for codemirror
           setTimeout(function () {
             var editors = jQuery('.raml-console-sidebar-content-wrapper #sidebar-body .raml-console-codemirror-body-editor .CodeMirror');

src/app/directives/sidebar.js

@@ -172,6 +172,14 @@
           });
         }
 
+        $scope.$on('resetData', function(event) {
+          $scope.currentSchemeType = 'Anonymous';
+        });
+
+        $scope.securitySchemeChanged = function (value) {
+          $scope.currentSchemeType = value;
+        }
+
         $scope.cancelRequest = function () {
           $scope.showSpinner = false;
         };

src/app/directives/sidebar.tpl.html

@@ -26,7 +26,7 @@ <h4 class="raml-console-sidebar-subhead">Authentication</h4>
             <div class="raml-console-sidebar-row raml-console-sidebar-securty">
               <div class="raml-console-toggle-group raml-console-sidebar-toggle-group">
                 <label class="raml-console-sidebar-label">Security Scheme</label>
-                <select class="raml-console-sidebar-input" ng-model="currentSchemeType" style="margin-bottom: 0;">
+                <select class="raml-console-sidebar-input" ng-model="currentSchemeType" style="margin-bottom: 0;" ng-change="securitySchemeChanged(currentSchemeType)">
                  <option ng-repeat="(key, scheme) in securitySchemes" value="{{scheme.type}}" ng-selected="scheme.type=='Anonymous'">{{scheme.type}}</option>
                 </select>
               </div>