Skip to content

Commit da76f96

Browse files
tsurdilotsurdilo
authored
Merge pull request #149 from tsurdilo/updateschemas2
update schemas
2 parents 347cdf4 + 562ad98 commit da76f96

File tree

7 files changed

+292
-431
lines changed

7 files changed

+292
-431
lines changed

‎schemas/0.8/auth.json

Lines changed: 104 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -71,148 +71,124 @@
7171
]
7272
},
7373
"basicpropsdef": {
74-
"oneOf": [
75-
{
74+
"type": "object",
75+
"description": "Basic auth information",
76+
"properties": {
77+
"username": {
7678
"type": "string",
77-
"description": "Expression referencing a workflow secret that contains all needed basic auth info"
79+
"description": "String or a workflow expression. Contains the user name",
80+
"minLength": 1
7881
},
79-
{
80-
"type": "object",
81-
"description": "Basic auth information",
82-
"properties": {
83-
"username": {
84-
"type": "string",
85-
"description": "String or a workflow expression. Contains the user name",
86-
"minLength": 1
87-
},
88-
"password": {
89-
"type": "string",
90-
"description": "String or a workflow expression. Contains the user password",
91-
"minLength": 1
92-
},
93-
"metadata": {
94-
"$ref": "common.json#/definitions/metadata"
95-
}
96-
},
97-
"required": [
98-
"username",
99-
"password"
100-
],
101-
"additionalProperties": false
82+
"password": {
83+
"type": "string",
84+
"description": "String or a workflow expression. Contains the user password",
85+
"minLength": 1
86+
},
87+
"metadata": {
88+
"$ref": "common.json#/definitions/metadata"
10289
}
103-
]
90+
},
91+
"required": [
92+
"username",
93+
"password"
94+
],
95+
"additionalProperties": false
10496
},
10597
"bearerpropsdef": {
106-
"oneOf": [
107-
{
98+
"type": "object",
99+
"description": "Bearer auth information",
100+
"properties": {
101+
"token": {
108102
"type": "string",
109-
"description": "Expression referencing a workflow secret that contains all needed bearer auth info"
103+
"description": "String or a workflow expression. Contains the token",
104+
"minLength": 1
110105
},
111-
{
112-
"type": "object",
113-
"description": "Bearer auth information",
114-
"properties": {
115-
"token": {
116-
"type": "string",
117-
"description": "String or a workflow expression. Contains the token",
118-
"minLength": 1
119-
},
120-
"metadata": {
121-
"$ref": "common.json#/definitions/metadata"
122-
}
123-
},
124-
"required": [
125-
"token"
126-
],
127-
"additionalProperties": false
106+
"metadata": {
107+
"$ref": "common.json#/definitions/metadata"
128108
}
129-
]
109+
},
110+
"required": [
111+
"token"
112+
],
113+
"additionalProperties": false
130114
},
131115
"oauth2propsdef": {
132-
"oneOf": [
133-
{
116+
"type": "object",
117+
"description": "OAuth2 information",
118+
"properties": {
119+
"authority": {
134120
"type": "string",
135-
"description": "Expression referencing a workflow secret that contains all needed OAuth2 auth info"
121+
"description": "String or a workflow expression. Contains the authority information",
122+
"minLength": 1
136123
},
137-
{
138-
"type": "object",
139-
"description": "OAuth2 information",
140-
"properties": {
141-
"authority": {
142-
"type": "string",
143-
"description": "String or a workflow expression. Contains the authority information",
144-
"minLength": 1
145-
},
146-
"grantType": {
147-
"type": "string",
148-
"description": "Defines the grant type",
149-
"enum": [
150-
"password",
151-
"clientCredentials",
152-
"tokenExchange"
153-
],
154-
"additionalItems": false
155-
},
156-
"clientId": {
157-
"type": "string",
158-
"description": "String or a workflow expression. Contains the client identifier",
159-
"minLength": 1
160-
},
161-
"clientSecret": {
162-
"type": "string",
163-
"description": "Workflow secret or a workflow expression. Contains the client secret",
164-
"minLength": 1
165-
},
166-
"scopes": {
167-
"type": "array",
168-
"description": "Array containing strings or workflow expressions. Contains the OAuth2 scopes",
169-
"items": {
170-
"type": "string"
171-
},
172-
"minItems": 1,
173-
"additionalItems": false
174-
},
175-
"username": {
176-
"type": "string",
177-
"description": "String or a workflow expression. Contains the user name. Used only if grantType is 'resourceOwner'",
178-
"minLength": 1
179-
},
180-
"password": {
181-
"type": "string",
182-
"description": "String or a workflow expression. Contains the user password. Used only if grantType is 'resourceOwner'",
183-
"minLength": 1
184-
},
185-
"audiences": {
186-
"type": "array",
187-
"description": "Array containing strings or workflow expressions. Contains the OAuth2 audiences",
188-
"items": {
189-
"type": "string"
190-
},
191-
"minItems": 1,
192-
"additionalItems": false
193-
},
194-
"subjectToken": {
195-
"type": "string",
196-
"description": "String or a workflow expression. Contains the subject token",
197-
"minLength": 1
198-
},
199-
"requestedSubject": {
200-
"type": "string",
201-
"description": "String or a workflow expression. Contains the requested subject",
202-
"minLength": 1
203-
},
204-
"requestedIssuer": {
205-
"type": "string",
206-
"description": "String or a workflow expression. Contains the requested issuer",
207-
"minLength": 1
208-
},
209-
"metadata": {
210-
"$ref": "common.json#/definitions/metadata"
211-
}
124+
"grantType": {
125+
"type": "string",
126+
"description": "Defines the grant type",
127+
"enum": [
128+
"password",
129+
"clientCredentials",
130+
"tokenExchange"
131+
],
132+
"additionalItems": false
133+
},
134+
"clientId": {
135+
"type": "string",
136+
"description": "String or a workflow expression. Contains the client identifier",
137+
"minLength": 1
138+
},
139+
"clientSecret": {
140+
"type": "string",
141+
"description": "Workflow secret or a workflow expression. Contains the client secret",
142+
"minLength": 1
143+
},
144+
"scopes": {
145+
"type": "array",
146+
"description": "Array containing strings or workflow expressions. Contains the OAuth2 scopes",
147+
"items": {
148+
"type": "string"
212149
},
213-
"required": ["grantType", "clientId"]
150+
"minItems": 1,
151+
"additionalItems": false
152+
},
153+
"username": {
154+
"type": "string",
155+
"description": "String or a workflow expression. Contains the user name. Used only if grantType is 'resourceOwner'",
156+
"minLength": 1
157+
},
158+
"password": {
159+
"type": "string",
160+
"description": "String or a workflow expression. Contains the user password. Used only if grantType is 'resourceOwner'",
161+
"minLength": 1
162+
},
163+
"audiences": {
164+
"type": "array",
165+
"description": "Array containing strings or workflow expressions. Contains the OAuth2 audiences",
166+
"items": {
167+
"type": "string"
168+
},
169+
"minItems": 1,
170+
"additionalItems": false
171+
},
172+
"subjectToken": {
173+
"type": "string",
174+
"description": "String or a workflow expression. Contains the subject token",
175+
"minLength": 1
176+
},
177+
"requestedSubject": {
178+
"type": "string",
179+
"description": "String or a workflow expression. Contains the requested subject",
180+
"minLength": 1
181+
},
182+
"requestedIssuer": {
183+
"type": "string",
184+
"description": "String or a workflow expression. Contains the requested issuer",
185+
"minLength": 1
186+
},
187+
"metadata": {
188+
"$ref": "common.json#/definitions/metadata"
214189
}
215-
]
190+
},
191+
"required": ["grantType", "clientId"]
216192
}
217193
}
218194
}

0 commit comments

Comments
 (0)