Skip to content

Commit 59cce45

Browse files
zhangzhengmingzhangzhengming
authored
OIC-67269: Remove depreciated Oauth policies from public facing schema. (#54)
1 parent 21b33aa commit 59cce45

File tree

5 files changed

+70
-139
lines changed

5 files changed

+70
-139
lines changed

‎schemas/actions_v01.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"$refOpenapi": {
6262
"type": "string",
6363
"description":"The OpenAPI path referencing the specific path of used for generating input and output schemas as well the endpoint invoked by the action. This value should following the following format: '{method}:{resource path}'. For example: 'GET:/pet/findByStatus'. The header, query parameter, request structure as defined in the OpenAPI defines the input schema and output schema. If this property is set, the input and output is not required because they are driven by the OpenAPI.",
64-
"maxLength": 100
64+
"maxLength": 200
6565
}
6666
},
6767
"additionalProperties": false,

‎schemas/categories_v01.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"type": "array",
2323
"description":"The list of group definition.",
2424
"minItems": 0,
25-
"maxItems": 20,
25+
"maxItems": 40,
2626
"items": {
2727
"$ref": "#/definitions/Group"
2828
},

‎schemas/commons_v01.json‎

Lines changed: 39 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -324,9 +324,7 @@
324324
"type": "string",
325325
"enum": [
326326
"GET",
327-
"PUT",
328-
"POST",
329-
"PATCH"
327+
"POST"
330328
]
331329
},
332330
"params_type": {
@@ -339,9 +337,10 @@
339337
"query": {
340338
"$ref": "#/definitions/singleValueMap"
341339
}
342-
}
340+
},
341+
"additionalProperties": false
343342
},
344-
"httpRequest": {
343+
"oauthHttpRequest": {
345344
"description": "A JSON representation of an http request.",
346345
"type": "object",
347346
"properties": {
@@ -356,12 +355,44 @@
356355
"$ref": "#/definitions/params_type"
357356
},
358357
"headers": {
359-
"$ref": "#/definitions/httpHeaders"
358+
"$ref": "#/definitions/oauthHttpHeaders"
360359
},
361360
"body": {
362-
"$ref": "#/definitions/httpBody"
361+
"$ref": "#/definitions/oauthHttpBody"
363362
}
364-
}
363+
},
364+
"additionalProperties": false
365+
},
366+
"oauthHttpHeaders": {
367+
"description": "Oauth http header",
368+
"type": "object",
369+
"patternProperties": {
370+
"^[a-zA-Z0-9\\.\\-_]+$": {
371+
"$ref": "#/definitions/stringOrArgumentJQPattern"
372+
}
373+
},
374+
"minProperties": 0,
375+
"maxProperties": 100
376+
},
377+
"oauthHttpBody": {
378+
"oneOf": [
379+
{
380+
"$ref": "#/definitions/stringOrArgumentJQPattern",
381+
"examples": [
382+
"dummyBody",
383+
"${.input.body}"
384+
]
385+
},
386+
{
387+
"$ref": "#/definitions/singleValueMap",
388+
"examples": [
389+
{
390+
"key1": "dummyBody",
391+
"key2": "${.input.bodyKey2}"
392+
}
393+
]
394+
}
395+
]
365396
}
366397
}
367398
}

‎schemas/connection_v01.json‎

Lines changed: 13 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -253,15 +253,12 @@
253253
"OAUTH_INBOUND", "OAUTH2.0_TOKEN_VALIDATION",
254254
"MULTI_TOKEN_INBOUND", "OAUTH2.0_OR_BASIC_AUTH_VALIDATION",
255255
"DIGITAL_SIGNATURE", "HMAC_SIGNATURE_VALIDATION", "RSA_SIGNATURE_VALIDATION", "JWT_VALIDATION","API_KEY_VALIDATION",
256-
"CUSTOM_SINGLE_TOKEN", "API_KEY_AUTHENTICATION",
256+
"API_KEY_AUTHENTICATION",
257257
"OAUTH_AUTHORIZATION_CODE_CREDENTIALS",
258258
"OAUTH_CLIENT_CREDENTIALS",
259259
"OAUTH_RESOURCE_OWNER_PASSWORD_CREDENTIALS",
260260
"OCI_SIGNATURE_VERSION1",
261261
"OAUTH_ONE_TOKEN_BASED", "OAUTH1.0A_ONE_LEGGED_TOKEN_AUTHENTICATION",
262-
"ADD_OAUTH_AUTHORIZATION_CODE_CREDENTIALS", "OAUTH2.0_AUTHORIZATION_CODE_CREDENTIALS",
263-
"ADD_OAUTH_CLIENT_CREDENTIALS", "OAUTH2.0_CLIENT_CREDENTIALS",
264-
"ADD_OAUTH_RESOURCE_OWNER_PASSWORD_CREDENTIALS", "OAUTH2.0_RESOURCE_OWNER_PASSWORD_CREDENTIALS",
265262
"AWS_SIGNATURE_VERSION4","CAREAWARE_MILLENNIUM_OAUTH_USER_FLOW","CAREAWARE_MILLENNIUM_OAUTH_SYSTEM_FLOW",
266263
"JWT_CLIENT_CREDENTIALS_ASSERTION_FOR_OAUTH","JWT_USER_ASSERTION_FOR_OAUTH","OCI_SERVICE_INVOCATION"
267264
]
@@ -425,7 +422,6 @@
425422
"properties": {
426423
"policy": {
427424
"oneOf": [
428-
{ "const": "CUSTOM_SINGLE_TOKEN" },
429425
{ "const": "API_KEY_AUTHENTICATION" }
430426
]
431427
}
@@ -523,61 +519,6 @@
523519
}
524520
}
525521
},
526-
{
527-
"if": {
528-
"properties": {
529-
"policy": {
530-
"oneOf": [
531-
{ "const": "OAUTH2.0_AUTHORIZATION_CODE_CREDENTIALS" }
532-
]
533-
}
534-
}
535-
},
536-
"then": {
537-
"properties": {
538-
"securityProperties": {
539-
"$ref": "#/definitions/OAuth2.0AuthorizationSecurityProperties_type"
540-
}
541-
}
542-
}
543-
},
544-
{
545-
"if": {
546-
"properties": {
547-
"policy": {
548-
"oneOf": [
549-
550-
{ "const": "OAUTH2.0_CLIENT_CREDENTIALS" }
551-
]
552-
}
553-
}
554-
},
555-
"then": {
556-
"properties": {
557-
"securityProperties": {
558-
"$ref": "#/definitions/OAuth2.0ClientCredentialsSecurityProperties_type"
559-
}
560-
}
561-
}
562-
},
563-
{
564-
"if": {
565-
"properties": {
566-
"policy": {
567-
"oneOf": [
568-
{ "const": "OAUTH2.0_RESOURCE_OWNER_PASSWORD_CREDENTIALS" }
569-
]
570-
}
571-
}
572-
},
573-
"then": {
574-
"properties": {
575-
"securityProperties": {
576-
"$ref": "#/definitions/OAuth2.0ROPCSecurityProperties_type"
577-
}
578-
}
579-
}
580-
},
581522
{
582523
"if": {
583524
"properties": {
@@ -2005,15 +1946,12 @@
20051946
"enum": [
20061947
"NONE",
20071948
"BASIC_AUTH",
2008-
"CUSTOM_SINGLE_TOKEN", "API_KEY_AUTHENTICATION",
1949+
"API_KEY_AUTHENTICATION",
20091950
"OAUTH_AUTHORIZATION_CODE_CREDENTIALS",
20101951
"OAUTH_CLIENT_CREDENTIALS",
20111952
"OAUTH_RESOURCE_OWNER_PASSWORD_CREDENTIALS",
20121953
"OCI_SIGNATURE_VERSION1",
20131954
"OAUTH_ONE_TOKEN_BASED", "OAUTH1.0A_ONE_LEGGED_TOKEN_AUTHENTICATION",
2014-
"ADD_OAUTH_AUTHORIZATION_CODE_CREDENTIALS", "OAUTH2.0_AUTHORIZATION_CODE_CREDENTIALS",
2015-
"ADD_OAUTH_CLIENT_CREDENTIALS", "OAUTH2.0_CLIENT_CREDENTIALS",
2016-
"ADD_OAUTH_RESOURCE_OWNER_PASSWORD_CREDENTIALS", "OAUTH2.0_RESOURCE_OWNER_PASSWORD_CREDENTIALS",
20171955
"AWS_SIGNATURE_VERSION4", "CAREAWARE_MILLENNIUM_OAUTH_USER_FLOW","CAREAWARE_MILLENNIUM_OAUTH_SYSTEM_FLOW",
20181956
"JWT_CLIENT_CREDENTIALS_ASSERTION_FOR_OAUTH","JWT_USER_ASSERTION_FOR_OAUTH","OCI_SERVICE_INVOCATION"
20191957
]
@@ -2044,7 +1982,6 @@
20441982
"properties": {
20451983
"policy": {
20461984
"oneOf": [
2047-
{ "const": "CUSTOM_SINGLE_TOKEN" },
20481985
{ "const": "API_KEY_AUTHENTICATION" }
20491986
]
20501987
}
@@ -2142,60 +2079,6 @@
21422079
}
21432080
}
21442081
},
2145-
{
2146-
"if": {
2147-
"properties": {
2148-
"policy": {
2149-
"oneOf": [
2150-
{ "const": "OAUTH2.0_AUTHORIZATION_CODE_CREDENTIALS" }
2151-
]
2152-
}
2153-
}
2154-
},
2155-
"then": {
2156-
"properties": {
2157-
"securityProperties": {
2158-
"$ref": "#/definitions/OAuth2.0AuthorizationSecurityProperties_type"
2159-
}
2160-
}
2161-
}
2162-
},
2163-
{
2164-
"if": {
2165-
"properties": {
2166-
"policy": {
2167-
"oneOf": [
2168-
{ "const": "OAUTH2.0_RESOURCE_OWNER_PASSWORD_CREDENTIALS" }
2169-
]
2170-
}
2171-
}
2172-
},
2173-
"then": {
2174-
"properties": {
2175-
"securityProperties": {
2176-
"$ref": "#/definitions/OAuth2.0ROPCSecurityProperties_type"
2177-
}
2178-
}
2179-
}
2180-
},
2181-
{
2182-
"if": {
2183-
"properties": {
2184-
"policy": {
2185-
"oneOf": [
2186-
{ "const": "OAUTH2.0_CLIENT_CREDENTIALS" }
2187-
]
2188-
}
2189-
}
2190-
},
2191-
"then": {
2192-
"properties": {
2193-
"securityProperties": {
2194-
"$ref": "#/definitions/OAuth2.0ClientCredentialsSecurityProperties_type"
2195-
}
2196-
}
2197-
}
2198-
},
21992082
{
22002083
"if": {
22012084
"properties": {
@@ -2254,12 +2137,13 @@
22542137
"type": "object",
22552138
"properties": {
22562139
"headers": {
2257-
"$ref": "commons_v01.json#/definitions/httpHeaders"
2140+
"$ref": "commons_v01.json#/definitions/oauthHttpHeaders"
22582141
},
22592142
"params": {
22602143
"$ref": "commons_v01.json#/definitions/singleValueMap"
22612144
}
2262-
}
2145+
},
2146+
"additionalProperties": false
22632147
},
22642148
"fetchRules_type": {
22652149
"type": "object",
@@ -2289,7 +2173,8 @@
22892173
"type": "string",
22902174
"description": "Regex that identifies the access token type."
22912175
}
2292-
}
2176+
},
2177+
"additionalProperties": false
22932178
},
22942179
"authExtension_type": {
22952180
"type": "object",
@@ -2306,15 +2191,16 @@
23062191
"description": "This object is used to define an authorization url where the user will be redirected to provide consent.",
23072192
"$ref": "commons_v01.json#/definitions/params_type"
23082193
}
2309-
}
2194+
},
2195+
"additionalProperties": false
23102196
},
23112197
"accessTokenRequest": {
23122198
"description": "HTTP request that should be used to fetch the access token.",
2313-
"$ref": "commons_v01.json#/definitions/httpRequest"
2199+
"$ref": "commons_v01.json#/definitions/oauthHttpRequest"
23142200
},
23152201
"refreshTokenRequest": {
23162202
"description": "HTTP request that should be used to refresh the access token.",
2317-
"$ref": "commons_v01.json#/definitions/httpRequest"
2203+
"$ref": "commons_v01.json#/definitions/oauthHttpRequest"
23182204
},
23192205
"fetchRules": {
23202206
"description": "How to retrieve information from the various steps of an oauth flow.",
@@ -2323,7 +2209,8 @@
23232209
"accessTokenUsage": {
23242210
"$ref": "#/definitions/accessTokenUsage_type"
23252211
}
2326-
}
2212+
},
2213+
"additionalProperties": false
23272214
},
23282215

23292216
"OAuth2.0AuthorizationSecurityProperties_type": {

‎schemas/flows_v01.json‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,10 +219,10 @@
219219
"connectivity::sampleXmlToJson",
220220
"connectivity::updateSecurityProperty",
221221
"connectivity::getSecurityProperty",
222-
"connectivity::getRuntimeSessionProperties",
223-
"connectivity::setRuntimeSessionProperties"
222+
"connectivity::getPersistentState",
223+
"connectivity::setPersistentState"
224224
],
225-
"description": "`connectivity::rest` -> Makes outbound HTTP call, Enforces policy in connection. `connectivity::log` -> Logs message to activity stream when in debug mode. `connectivity::Oauth` -> Deprecated. To be replaced by expressions. `connectivity::avroSchemaToJsonSchema` -> Converts AVRO Schema to JSON Schema. `connectivity::avroEncode` -> Does AVRO Binary Encoding of JSON data valid against AVRO Schema. `connectivity::avroDecode` -> Decodes AVRO Binary Encoded Data `connectivity::jsonPayloadToXMLPayload` -> Makes json payload to xml payload conversion `connectivity::xmlPayloadToJsonPayload` -> Makes xml payload to json payload conversion `connectivity::xmlPayloadToJsonSchema` -> Makes xml payload to json schema conversion. 'connectivity::sampleXmlToJson' -> Makes xml payload to json payload conversion at designtime.`connectivity::updateSecurityProperty` -> Updates the value for specified security property. `connectivity::getSecurityProperty` -> Gets the value for specified security property. `connectivity::getRuntimeSessionProperties` -> Gets the Runtime Session properties for OIC activity. `connectivity::setRuntimeSessionProperties` -> Sets the Runtime Session properties for OIC activity."
225+
"description": "`connectivity::rest` -> Makes outbound HTTP call, Enforces policy in connection. `connectivity::log` -> Logs message to activity stream when in debug mode. `connectivity::Oauth` -> Deprecated. To be replaced by expressions. `connectivity::avroSchemaToJsonSchema` -> Converts AVRO Schema to JSON Schema. `connectivity::avroEncode` -> Does AVRO Binary Encoding of JSON data valid against AVRO Schema. `connectivity::avroDecode` -> Decodes AVRO Binary Encoded Data `connectivity::jsonPayloadToXMLPayload` -> Makes json payload to xml payload conversion `connectivity::xmlPayloadToJsonPayload` -> Makes xml payload to json payload conversion `connectivity::xmlPayloadToJsonSchema` -> Makes xml payload to json schema conversion. 'connectivity::sampleXmlToJson' -> Makes xml payload to json payload conversion at designtime.`connectivity::updateSecurityProperty` -> Updates the value for specified security property. `connectivity::getSecurityProperty` -> Gets the value for specified security property. `connectivity::getPersistentState` -> Gets the Runtime Session properties for OIC activity. `connectivity::setPersistentState` -> Sets the Runtime Session properties for OIC activity."
226226
}
227227
}
228228
}
@@ -695,6 +695,19 @@
695695
]
696696
}
697697
},
698+
"additionalProperties": false
699+
},
700+
{
701+
"required": [
702+
"properties"
703+
],
704+
"properties": {
705+
"properties": {
706+
"$ref": "#/definitions/stringOrArgumentJQPattern",
707+
"description": "JSON properties"
708+
}
709+
},
710+
698711
"additionalProperties": false
699712
}
700713
]

0 commit comments

Comments
 (0)