Skip to content

Commit f4c0f99

Browse files
jcenturionjcenturion
committed
Fix anonymous behavior
1 parent 39e54fe commit f4c0f99

File tree

8 files changed

+66
-32
lines changed

8 files changed

+66
-32
lines changed

‎dist/examples/leagues.raml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ securedBy: [ basic, digest_auth, oauth_2_0, custom_scheme_1, custom_scheme_2 ]
5858
description: |
5959
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.
6060
post:
61-
securedBy: [ oauth_2_0: { scopes: [ read ] } ]
61+
securedBy: [ null, oauth_2_0: { scopes: [ read ] } ]
6262
description: Delete an item by Code.
6363
headers:
6464
header:

‎dist/scripts/api-console.js‎

Lines changed: 32 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -440,12 +440,6 @@
440440
toUIModel($scope.methodInfo.headers.plain);
441441
toUIModel($scope.resource.uriParametersForDocumentation);
442442

443-
$rootScope.$broadcast('resetData');
444-
445-
$scope.securitySchemes.anonymous = {
446-
type: 'Anonymous'
447-
};
448-
449443
Object.keys($scope.securitySchemes).map(function (key) {
450444
var type = $scope.securitySchemes[key].type;
451445

@@ -458,6 +452,8 @@
458452
}
459453
});
460454

455+
$rootScope.$broadcast('resetData');
456+
461457
/*jshint camelcase: false */
462458
// Digest Authentication is not supported
463459
delete $scope.securitySchemes.digest_auth;
@@ -927,10 +923,13 @@
927923
templateUrl: 'directives/sidebar.tpl.html',
928924
replace: true,
929925
controller: function ($scope, $location, $anchorScroll) {
930-
$scope.markedOptions = RAML.Settings.marked;
931-
$scope.currentSchemeType = 'Anonymous';
932-
$scope.currentScheme = 'Anonymous|anonymous';
933-
$scope.responseDetails = false;
926+
var defaultSchemaKey = Object.keys($scope.securitySchemes).sort()[0];
927+
var defaultSchema = $scope.securitySchemes[defaultSchemaKey];
928+
929+
$scope.markedOptions = RAML.Settings.marked;
930+
$scope.currentSchemeType = defaultSchema.type;
931+
$scope.currentScheme = defaultSchema.id;
932+
$scope.responseDetails = false;
934933

935934
function completeAnimation (element) {
936935
jQuery(element).removeAttr('style');
@@ -1094,8 +1093,11 @@
10941093
}
10951094

10961095
$scope.$on('resetData', function() {
1097-
$scope.currentSchemeType = 'Anonymous';
1098-
$scope.currentScheme = 'Anonymous|anonymous';
1096+
var defaultSchemaKey = Object.keys($scope.securitySchemes).sort()[0];
1097+
var defaultSchema = $scope.securitySchemes[defaultSchemaKey];
1098+
1099+
$scope.currentSchemeType = defaultSchema.type;
1100+
$scope.currentScheme = defaultSchema.id;
10991101
});
11001102

11011103
$scope.cancelRequest = function () {
@@ -2984,7 +2986,16 @@ RAML.Inspector = (function() {
29842986
var overwrittenSchemes = {};
29852987

29862988
securedBy.map(function(el) {
2987-
if (typeof el === 'object') {
2989+
if (el === null) {
2990+
securitySchemes.push({
2991+
anonymous: {
2992+
type: 'Anonymous'
2993+
}
2994+
});
2995+
securedBy.push('anonymous');
2996+
}
2997+
2998+
if (typeof el === 'object' && el) {
29882999
var key = Object.keys(el)[0];
29893000

29903001
overwrittenSchemes[key] = el[key];
@@ -3012,6 +3023,12 @@ RAML.Inspector = (function() {
30123023
});
30133024
});
30143025

3026+
if(Object.keys(selectedSchemes).length === 0) {
3027+
selectedSchemes.anonymous = {
3028+
type: 'Anonymous'
3029+
};
3030+
}
3031+
30153032
return selectedSchemes;
30163033
};
30173034
}
@@ -3346,7 +3363,7 @@ RAML.Inspector = (function() {
33463363
Object.keys(info).map(function (key) {
33473364
if (typeof field === 'undefined' || field === key) {
33483365
if (typeof info[key][0].enum === 'undefined') {
3349-
if (info[key][0].type === 'date') {
3366+
if (info[key][0].type === 'date' && typeof info[key][0].example === 'object') {
33503367
info[key][0].example = info[key][0].example.toUTCString();
33513368
}
33523369

@@ -5411,7 +5428,7 @@ angular.module('ramlConsoleApp').run(['$templateCache', function($templateCache)
54115428
" <div class=\"raml-console-toggle-group raml-console-sidebar-toggle-group\">\n" +
54125429
" <label class=\"raml-console-sidebar-label\">Security Scheme</label>\n" +
54135430
" <select ng-change=\"securitySchemeChanged(currentScheme)\" class=\"raml-console-sidebar-input\" ng-model=\"currentScheme\" style=\"margin-bottom: 0;\">\n" +
5414-
" <option ng-repeat=\"(key, scheme) in securitySchemes\" value=\"{{scheme.id}}\" ng-selected=\"scheme.type=='Anonymous'\">{{scheme.name}}</option>\n" +
5431+
" <option ng-repeat=\"(key, scheme) in securitySchemes\" value=\"{{scheme.id}}\">{{scheme.name}}</option>\n" +
54155432
" </select>\n" +
54165433
" </div>\n" +
54175434
" </div>\n" +

‎src/app/directives/method-list.js‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,6 @@
112112
toUIModel($scope.methodInfo.headers.plain);
113113
toUIModel($scope.resource.uriParametersForDocumentation);
114114

115-
$rootScope.$broadcast('resetData');
116-
117-
$scope.securitySchemes.anonymous = {
118-
type: 'Anonymous'
119-
};
120-
121115
Object.keys($scope.securitySchemes).map(function (key) {
122116
var type = $scope.securitySchemes[key].type;
123117

@@ -130,6 +124,8 @@
130124
}
131125
});
132126

127+
$rootScope.$broadcast('resetData');
128+
133129
/*jshint camelcase: false */
134130
// Digest Authentication is not supported
135131
delete $scope.securitySchemes.digest_auth;

‎src/app/directives/sidebar.js‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,13 @@
77
templateUrl: 'directives/sidebar.tpl.html',
88
replace: true,
99
controller: function ($scope, $location, $anchorScroll) {
10-
$scope.markedOptions = RAML.Settings.marked;
11-
$scope.currentSchemeType = 'Anonymous';
12-
$scope.currentScheme = 'Anonymous|anonymous';
13-
$scope.responseDetails = false;
10+
var defaultSchemaKey = Object.keys($scope.securitySchemes).sort()[0];
11+
var defaultSchema = $scope.securitySchemes[defaultSchemaKey];
12+
13+
$scope.markedOptions = RAML.Settings.marked;
14+
$scope.currentSchemeType = defaultSchema.type;
15+
$scope.currentScheme = defaultSchema.id;
16+
$scope.responseDetails = false;
1417

1518
function completeAnimation (element) {
1619
jQuery(element).removeAttr('style');
@@ -174,8 +177,11 @@
174177
}
175178

176179
$scope.$on('resetData', function() {
177-
$scope.currentSchemeType = 'Anonymous';
178-
$scope.currentScheme = 'Anonymous|anonymous';
180+
var defaultSchemaKey = Object.keys($scope.securitySchemes).sort()[0];
181+
var defaultSchema = $scope.securitySchemes[defaultSchemaKey];
182+
183+
$scope.currentSchemeType = defaultSchema.type;
184+
$scope.currentScheme = defaultSchema.id;
179185
});
180186

181187
$scope.cancelRequest = function () {

‎src/app/directives/sidebar.tpl.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ <h4 class="raml-console-sidebar-subhead">Authentication</h4>
2727
<div class="raml-console-toggle-group raml-console-sidebar-toggle-group">
2828
<label class="raml-console-sidebar-label">Security Scheme</label>
2929
<select ng-change="securitySchemeChanged(currentScheme)" class="raml-console-sidebar-input" ng-model="currentScheme" style="margin-bottom: 0;">
30-
<option ng-repeat="(key, scheme) in securitySchemes" value="{{scheme.id}}" ng-selected="scheme.type=='Anonymous'">{{scheme.name}}</option>
30+
<option ng-repeat="(key, scheme) in securitySchemes" value="{{scheme.id}}">{{scheme.name}}</option>
3131
</select>
3232
</div>
3333
</div>

‎src/assets/examples/leagues.raml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ securedBy: [ basic, digest_auth, oauth_2_0, custom_scheme_1, custom_scheme_2 ]
5858
description: |
5959
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.
6060
post:
61-
securedBy: [ oauth_2_0: { scopes: [ read ] } ]
61+
securedBy: [ null, oauth_2_0: { scopes: [ read ] } ]
6262
description: Delete an item by Code.
6363
headers:
6464
header:

‎src/common/inspector/method.js‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,16 @@
7575
var overwrittenSchemes = {};
7676

7777
securedBy.map(function(el) {
78-
if (typeof el === 'object') {
78+
if (el === null) {
79+
securitySchemes.push({
80+
anonymous: {
81+
type: 'Anonymous'
82+
}
83+
});
84+
securedBy.push('anonymous');
85+
}
86+
87+
if (typeof el === 'object' && el) {
7988
var key = Object.keys(el)[0];
8089

8190
overwrittenSchemes[key] = el[key];
@@ -103,6 +112,12 @@
103112
});
104113
});
105114

115+
if(Object.keys(selectedSchemes).length === 0) {
116+
selectedSchemes.anonymous = {
117+
type: 'Anonymous'
118+
};
119+
}
120+
106121
return selectedSchemes;
107122
};
108123
}

‎src/common/try_it/named_parameters.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
Object.keys(info).map(function (key) {
5656
if (typeof field === 'undefined' || field === key) {
5757
if (typeof info[key][0].enum === 'undefined') {
58-
if (info[key][0].type === 'date') {
58+
if (info[key][0].type === 'date' && typeof info[key][0].example === 'object') {
5959
info[key][0].example = info[key][0].example.toUTCString();
6060
}
6161

0 commit comments

Comments
 (0)