From 5d6170c8277da4771e84bdb1128f6ff7b48115e1 Mon Sep 17 00:00:00 2001 From: Joo-Chul Lee Date: Tue, 9 Feb 2021 17:13:03 +0900 Subject: [PATCH 1/2] Bugzilla-3398 (Extension of Account Resource for Cloud Proxy) - new Property ("proxied_dis") was added --- swagger2.0/oic.sec.account.swagger.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/swagger2.0/oic.sec.account.swagger.json b/swagger2.0/oic.sec.account.swagger.json index da4982b..521b87c 100755 --- a/swagger2.0/oic.sec.account.swagger.json +++ b/swagger2.0/oic.sec.account.swagger.json @@ -49,7 +49,7 @@ } }, "delete": { - "description": "Delete a device. This also removes all resources in the device on cloud side.\nexample: /oic/account?di=9cfbeb8e-5a1e-4d1c-9d01-00c04fd430c8&accesstoken=0f3d9f7fe5491d54077d\n", + "description": "Delete a device. This also removes all resources in the device on cloud side.\nexample-1: /oic/account?di=9cfbeb8e-5a1e-4d1c-9d01-00c04fd430c8&accesstoken=0f3d9f7fe5491d54077d\n \nexample-2: /oic/account?di=9cfbeb8e-5a1e-4d1c-9d01-00c04fd430c8&proxied_dis=c4108bba-6a7e-11eb-84d1-0c9d928536d7&accesstoken=0f3d9f7fe5491d54077d", "parameters": [ {"$ref": "#/parameters/interface"} ], @@ -84,6 +84,11 @@ "description": "Unique Device identifier. Format pattern according to IETF RFC 4122.", "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$", "type": "string" + }, + "proxied_dis": { + "description": "This Property stores Device IDs of the D2D Devices which connect to OCF Cloud through the Cloud Proxy whose Device ID is '/oic/sec/account:di'", + "type": "string", + "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$" } }, "type" : "object", From ff41436620795cdf2cc6d48640e8c1c89123447d Mon Sep 17 00:00:00 2001 From: Joo-Chul Lee Date: Tue, 9 Feb 2021 21:52:25 +0900 Subject: [PATCH 2/2] Bugzilla-3398 (Extension of Account Resource for Cloud Proxy) - "proxied_dis" was added in "Account-request", "Account-response" definitions - add in query parameter definitions in DELETE operation --- swagger2.0/oic.sec.account.swagger.json | 52 ++++++++++++++++++++++--- 1 file changed, 47 insertions(+), 5 deletions(-) diff --git a/swagger2.0/oic.sec.account.swagger.json b/swagger2.0/oic.sec.account.swagger.json index 521b87c..e0a90ad 100755 --- a/swagger2.0/oic.sec.account.swagger.json +++ b/swagger2.0/oic.sec.account.swagger.json @@ -49,9 +49,38 @@ } }, "delete": { - "description": "Delete a device. This also removes all resources in the device on cloud side.\nexample-1: /oic/account?di=9cfbeb8e-5a1e-4d1c-9d01-00c04fd430c8&accesstoken=0f3d9f7fe5491d54077d\n \nexample-2: /oic/account?di=9cfbeb8e-5a1e-4d1c-9d01-00c04fd430c8&proxied_dis=c4108bba-6a7e-11eb-84d1-0c9d928536d7&accesstoken=0f3d9f7fe5491d54077d", + "description": "Delete a device. This also removes all resources in the device on cloud side.\nexample: /oic/account?di=9cfbeb8e-5a1e-4d1c-9d01-00c04fd430c8&accesstoken=0f3d9f7fe5491d54077d\n", "parameters": [ - {"$ref": "#/parameters/interface"} + {"$ref": "#/parameters/interface"}, + { + "in": "query", + "name": "di", + "type": "string", + "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$", + "required": true, + "x-example": { + "di": "9cfbeb8e-5a1e-4d1c-9d01-00c04fd430c8" + } + }, + { + "in": "query", + "name": "proxied_di", + "type": "string", + "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$", + "required": false, + "x-example": { + "proxied_di": "c4108bba-6a7e-11eb-84d1-0c9d928536d7" + } + }, + { + "in": "query", + "name": "accesstoken", + "type": "string", + "required": true, + "x-example": { + "accesstoken": "0f3d9f7fe5491d54077d" + } + } ], "responses": { "202": { @@ -86,9 +115,13 @@ "type": "string" }, "proxied_dis": { - "description": "This Property stores Device IDs of the D2D Devices which connect to OCF Cloud through the Cloud Proxy whose Device ID is '/oic/sec/account:di'", - "type": "string", - "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$" + "description": "Device IDs of the D2D Devices which connect to OCF Cloud through the Cloud Proxy whose Device ID is '/oic/sec/account:di'", + "type": "array", + "uniqueItems": true, + "items": { + "type": "string", + "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$" + } } }, "type" : "object", @@ -140,6 +173,15 @@ "readOnly": true, "type": "string" }, + "proxied_dis": { + "description": "Device IDs of the D2D Devices which connect to OCF Cloud through the Cloud Proxy whose Device ID is '/oic/sec/account:di'", + "type": "array", + "uniqueItems": true, + "items": { + "type": "string", + "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$" + } + }, "if": { "description": "The interface set supported by this resource", "items": {