Skip to content

Commit 6ec231a

Browse files
committed
chore: changed the order of classes to match the specification
1 parent 1e327a4 commit 6ec231a

File tree

1 file changed

+45
-50
lines changed

1 file changed

+45
-50
lines changed

resources/schemas/wot_security.yaml

Lines changed: 45 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -43,25 +43,18 @@ classes:
4343
description: Can be used to support (human-readable) information in different languages
4444
range: MultiLanguage
4545

46-
APIKeySecurityScheme:
46+
NoSecurityScheme:
4747
is_a: SecurityScheme
4848
description: >-
49-
API key authentication security configuration identified by the term apikey. This scheme is to be used when the
50-
access token is opaque, for example when a key in an unknown or proprietary format is provided by a cloud service provider.
49+
A security configuration indicating there is no authentication or other mechanism required to access the resource.
5150
annotations:
5251
jsonschema_config:
5352
tag: jsonschema_config
5453
value:
5554
additionalProperties: true
56-
slots:
57-
- in
58-
- name
5955
slot_usage:
6056
scheme:
61-
pattern: ^apikey$
62-
in:
63-
required: true
64-
range: SecurityLocationType
57+
pattern: ^nosec$
6558

6659
AutoSecurityScheme:
6760
is_a: SecurityScheme
@@ -90,22 +83,6 @@ classes:
9083
- in
9184
- name
9285

93-
BearerSecurityScheme:
94-
is_a: SecurityScheme
95-
description: >-
96-
Bearer Token security configuration for situations where bearer tokens are used independently of OAuth2.
97-
annotations:
98-
jsonschema_config:
99-
tag: jsonschema_config
100-
value:
101-
additionalProperties: true
102-
slots:
103-
- alg
104-
- format
105-
- in
106-
- name
107-
- authorization
108-
10986
ComboSecurityScheme:
11087
is_a: SecurityScheme
11188
description: >-
@@ -145,18 +122,56 @@ classes:
145122
- name
146123
- qop
147124

148-
NoSecurityScheme:
125+
126+
APIKeySecurityScheme:
149127
is_a: SecurityScheme
150128
description: >-
151-
A security configuration indicating there is no authentication or other mechanism required to access the resource.
129+
API key authentication security configuration identified by the term apikey. This scheme is to be used when the
130+
access token is opaque, for example when a key in an unknown or proprietary format is provided by a cloud service provider.
152131
annotations:
153132
jsonschema_config:
154133
tag: jsonschema_config
155134
value:
156135
additionalProperties: true
136+
slots:
137+
- in
138+
- name
157139
slot_usage:
158140
scheme:
159-
pattern: ^nosec$
141+
pattern: ^apikey$
142+
in:
143+
required: true
144+
range: SecurityLocationType
145+
146+
BearerSecurityScheme:
147+
is_a: SecurityScheme
148+
description: >-
149+
Bearer Token security configuration for situations where bearer tokens are used independently of OAuth2.
150+
annotations:
151+
jsonschema_config:
152+
tag: jsonschema_config
153+
value:
154+
additionalProperties: true
155+
slots:
156+
- alg
157+
- format
158+
- in
159+
- name
160+
- authorization
161+
162+
PSKSecurityScheme:
163+
is_a: SecurityScheme
164+
description: >-
165+
Pre-shared key authentication security configuration. This is meant to identify that a standard is used for
166+
pre-shared keys such as TLS-PSK.
167+
annotations:
168+
jsonschema_config:
169+
tag: jsonschema_config
170+
value:
171+
additionalProperties: true
172+
slots:
173+
- identity
174+
160175

161176
OAuth2SecurityScheme:
162177
is_a: SecurityScheme
@@ -185,19 +200,6 @@ classes:
185200
comments:
186201
- Mandatory for both code and client flows
187202

188-
PSKSecurityScheme:
189-
is_a: SecurityScheme
190-
description: >-
191-
Pre-shared key authentication security configuration. This is meant to identify that a standard is used for
192-
pre-shared keys such as TLS-PSK.
193-
annotations:
194-
jsonschema_config:
195-
tag: jsonschema_config
196-
value:
197-
additionalProperties: true
198-
slots:
199-
- identity
200-
201203
enums:
202204
SecurityLocationType:
203205
description: Specifies the location where security authentication information should be provided
@@ -257,7 +259,7 @@ slots:
257259
description: Authorization flow.
258260
range: OAuth2Flow
259261

260-
format:
262+
TODO_format:
261263
description: Specifies format of security authentication information.
262264
range: BearerFormat
263265

@@ -311,13 +313,6 @@ slots:
311313
description: URI of the token server.
312314
range: uriorcurie
313315

314-
oneOf:
315-
description: >-
316-
Array of two or more strings identifying other named security scheme definitions, any one of which, when
317-
satisfied, will allow access. Only one may be chosen for use.
318-
range: SecurityScheme
319-
multivalued: true
320-
minimum_value: 2
321316

322317
allOf:
323318
description: >-

0 commit comments

Comments
 (0)