Skip to content

Vocab ids with context #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 38 commits into from
Mar 7, 2019
Merged

Vocab ids with context #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
b4f8c87
rename vocab terms to include context; test, with alg
mmccool Mar 4, 2019
eff5a37
fix titles in test assertions
mmccool Mar 4, 2019
77cbad3
a few more updates... still testing
mmccool Mar 4, 2019
7234613
cancellation, const, contentType
mmccool Mar 4, 2019
db16670
contentType schema really only for forms, not ExpectedResponse
mmccool Mar 4, 2019
7a79004
break up td-vocab-description definitions by context
mmccool Mar 4, 2019
8dcb0b7
fix bugs in td-vocab-description schemas
mmccool Mar 4, 2019
e72c4fc
updated schemas for descriptions
mmccool Mar 4, 2019
dabc5fc
enum
mmccool Mar 4, 2019
5b99aa6
flow
mmccool Mar 4, 2019
92c7793
temporary...
mmccool Mar 4, 2019
9bc78c3
format in SecuritySchemes
mmccool Mar 4, 2019
8a9d41a
forms
mmccool Mar 4, 2019
d17590c
idempotent
mmccool Mar 4, 2019
cbc7925
identity
mmccool Mar 4, 2019
5b6e018
in
mmccool Mar 4, 2019
0eef1e3
fix identity
mmccool Mar 4, 2019
1cd3297
fix format
mmccool Mar 4, 2019
74670cd
mark format rule as complex
mmccool Mar 4, 2019
47c494f
minimum and maximum
mmccool Mar 4, 2019
2a20100
name in SecurityScheme
mmccool Mar 4, 2019
f6103e3
observable, oneOf
mmccool Mar 4, 2019
0a1fb45
op
mmccool Mar 4, 2019
4e5a013
output
mmccool Mar 4, 2019
e0d17a4
properties--ObjectSchema
mmccool Mar 4, 2019
bca95e5
proxy
mmccool Mar 4, 2019
19fec00
qop, readOnly, refresh
mmccool Mar 4, 2019
f4dea1a
rel, required, response
mmccool Mar 4, 2019
06399ff
safe, subprotocol, subscription, support, token, type
mmccool Mar 4, 2019
a6e3f64
unit, uriVariables, writeOnly
mmccool Mar 4, 2019
cb4b0c9
Update td-vocab-cancellation--EventAffordance.json
egekorkan Mar 4, 2019
bdc4655
Update td-vocab-data--EventAffordance.json
egekorkan Mar 4, 2019
7b8cfac
Update td-vocab-description--InteractionAffordance.json
egekorkan Mar 4, 2019
18fd03b
updates to input, items, lastModified, maxItems, minItems
mmccool Mar 4, 2019
23c4c09
scopes, authorization fixes
mmccool Mar 4, 2019
abee59e
security
mmccool Mar 4, 2019
605251a
title
mmccool Mar 4, 2019
e029ea6
titles
mmccool Mar 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 69 additions & 0 deletions AssertionTester/Assertions/td-vocab-alg--BearerSecurityScheme.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
{
"title": "td-vocab-alg--BearerSecurityScheme",
"description": "alg: Encoding, encryption, or digest algorithm (one of MD5, ES256, or ES512-256). MUST be included. Type: string.",
"$schema ": "http://json-schema.org/draft-06/schema#",
"is-complex": true,
"type": "object",
"properties": {
"securityDefinitions": {
"type": "object",
"minProperties": 1,
"additionalProperties": {
"$ref": "#/definitions/securityScheme"
}
}
},
"required": [
"securityDefinitions"
],
"additionalProperties": true,
"definitions": {
"securityScheme": {
"if": {
"type": "object",
"properties": {
"description": {
"type": "string"
},
"proxy": {
"$ref": "#/definitions/url"
},
"scheme": {
"type": "string",
"enum": [
"bearer"
]
},
"authorization": {
"$ref": "#/definitions/url"
},
"alg": {
"type": "string",
"enum": ["MD5", "ES256", "ES512-256"]
},
"format": {
"type": "string",
"enum": ["jwt", "jwe", "jws"]
},
"in": {
"type": "string",
"enum": ["header", "query", "body", "cookie"]
},
"name": {
"type": "string"
}
},
"required": [
"scheme","alg"
]
},
"then": {
"const": "td-vocab-alg--BearerSecurityScheme=pass"
}
},
"url": {
"type": "string",
"format": "uri-reference"
}
}
}
69 changes: 69 additions & 0 deletions AssertionTester/Assertions/td-vocab-alg--PoPSecurityScheme.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
{
"title": "td-vocab-alg--PoPSecurityScheme",
"description": "alg: Encoding, encryption, or digest algorithm (one of MD5, ES256, or ES512-256). MUST be included. Type: string.",
"$schema ": "http://json-schema.org/draft-06/schema#",
"is-complex": true,
"type": "object",
"properties": {
"securityDefinitions": {
"type": "object",
"minProperties": 1,
"additionalProperties": {
"$ref": "#/definitions/securityScheme"
}
}
},
"required": [
"securityDefinitions"
],
"additionalProperties": true,
"definitions": {
"securityScheme": {
"if": {
"type": "object",
"properties": {
"description": {
"type": "string"
},
"proxy": {
"$ref": "#/definitions/url"
},
"scheme": {
"type": "string",
"enum": [
"pop"
]
},
"authorization": {
"$ref": "#/definitions/url"
},
"alg": {
"type": "string",
"enum": ["MD5", "ES256", "ES512-256"]
},
"format": {
"type": "string",
"enum": ["jwt", "jwe", "jws"]
},
"in": {
"type": "string",
"enum": ["header", "query", "body", "cookie"]
},
"name": {
"type": "string"
}
},
"required": [
"scheme","alg"
]
},
"then": {
"const": "td-vocab-alg--PoPSecurityScheme=pass"
}
},
"url": {
"type": "string",
"format": "uri-reference"
}
}
}
108 changes: 0 additions & 108 deletions AssertionTester/Assertions/td-vocab-alg.json
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions ...ionTester/Assertions/td-vocab-anchor.json → ...ter/Assertions/td-vocab-anchor--Link.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"title": "td-vocab-anchor",
"title": "td-vocab-anchor--Link",
"description": "anchor: By default, the context of a link is the URL of the representation it is associated with, and is serialised as a URI. When present, the anchor parameter overrides this with another URI, such as a fragment of this resource, or a third resource (i.e., when the anchor value is an absolute URI).",
"$schema ": "http://json-schema.org/draft-06/schema#",
"is-complex": true,
Expand Down Expand Up @@ -27,12 +27,12 @@
]
},
"then": {
"const": "td-vocab-anchor=pass"
"const": "td-vocab-anchor--Link=pass"
}
},
"url": {
"type": "string",
"format": "uri-reference"
}
}
}
}
69 changes: 69 additions & 0 deletions AssertionTester/Assertions/td-vocab-authorization--BearerSecurityScheme.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
{
"title": "td-vocab-authorization--BearerSecurityScheme",
"description": "authorization: URI of the authorization server. MAY be included. Type: anyURI.",
"$schema ": "http://json-schema.org/draft-06/schema#",
"is-complex": true,
"type": "object",
"properties": {
"securityDefinitions": {
"type": "object",
"minProperties": 1,
"additionalProperties": {
"$ref": "#/definitions/securityScheme"
}
}
},
"required": [
"securityDefinitions"
],
"additionalProperties": true,
"definitions": {
"securityScheme": {
"if": {
"type": "object",
"properties": {
"description": {
"type": "string"
},
"proxy": {
"$ref": "#/definitions/url"
},
"scheme": {
"type": "string",
"enum": [
"bearer"
]
},
"authorization": {
"$ref": "#/definitions/url"
},
"alg": {
"type": "string",
"enum": ["MD5", "ES256", "ES512-256"]
},
"format": {
"type": "string",
"enum": ["jwt", "jwe", "jws"]
},
"in": {
"type": "string",
"enum": ["header", "query", "body", "cookie"]
},
"name": {
"type": "string"
}
},
"required": [
"scheme", "authorization"
]
},
"then": {
"const": "td-vocab-authorization--BearerSecurityScheme=pass"
}
},
"url": {
"type": "string",
"format": "uri-reference"
}
}
}
Loading