Skip to content

Commit 089754c

Browse files
authored
Merge pull request #13 from gotchazipc/master
updated version to 0.8.0
2 parents 0a96bb9 + a47b8ba commit 089754c

File tree

14 files changed

+38
-92
lines changed

14 files changed

+38
-92
lines changed

README-API.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This SDK Contains automatically generated sources & documents with the [Swagger
44

55
- API version: 0.7.1
66
- Package version: 0.7.1
7-
- Build date: 2016-07-26T15:37:20.836+09:00
7+
- Build date: 2016-08-09T17:23:32.460+09:00
88
- Build package: class io.swagger.codegen.languages.JavascriptClientCodegen
99

1010
## Getting Started

api-spec/swagger.json

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@
205205
"/auth/token" : {
206206
"post" : {
207207
"tags" : [ "auth" ],
208-
"description" : "Creates new token from current access token, inheriting workspace id & session id. The duration of generated token is (and should not be) parameterizable. Server should set proper duration, respecting \"reconnect\" period of socket.io clients. Remember that most of socket.io client implementations (including official js client) do not provide any ways to change connection parameters (header or query) while reconnecting to server.\n\nLike login API, this endpoint does not provide any encryption. Server should not set any data to harm security in the token & should provide some signinig/encryption mechanism to protect token. Simple JSON Web Token with HMAC-SHA will do.\n",
208+
"description" : "Creates new token from current access token, inheriting workspace id & session id. The duration of generated token is not (and should not be) parameterizable. Server should set proper duration, respecting \"reconnect\" period of socket.io clients. Remember that most of socket.io client implementations (including official js client) do not provide any ways to change connection parameters (header or query) while reconnecting to server.\n\nLike login API, this endpoint does not provide any encryption. Server should not set any data to harm security in the token & should provide some signinig/encryption mechanism to protect token. Simple JSON Web Token with HMAC-SHA will do.\n",
209209
"operationId" : "issueToken",
210210
"parameters" : [ {
211211
"name" : "type",
@@ -724,7 +724,7 @@
724724
}, {
725725
"name" : "If-None-Match",
726726
"in" : "header",
727-
"description" : "Usual if-non-match header, allowing only 1 e-tag value from previous readFile response, including weak prefix and quotation chars. This header value precedes if-modified-since, and server should ignore if-modified-since header when if-none-match header exists, as RFC-2616 declines.",
727+
"description" : "Usual if-non-match header, allowing only 1 e-tag value from previous readFile response. The value of this header can have weak prefix and quotation chars. This header value precedes the value of if-modified-since header. Server should ignore if-modified-since header when if-none-match header exists, as RFC-2616.",
728728
"required" : false,
729729
"type" : "string"
730730
} ],
@@ -1478,7 +1478,7 @@
14781478
},
14791479
"Session" : {
14801480
"type" : "object",
1481-
"required" : [ "clientAddress", "connectedAt", "disconnectedAt", "id", "name", "state" ],
1481+
"required" : [ "clientAddress", "connectedAt", "id", "name", "state" ],
14821482
"properties" : {
14831483
"id" : {
14841484
"type" : "string",
@@ -1490,8 +1490,8 @@
14901490
},
14911491
"state" : {
14921492
"type" : "string",
1493-
"description" : "NORMAL = connected, normally working\nLOSING = disconnected, waiting reconnection. still accessible with api\nCLOSING = socket connection will close connection by server (clinet will be notified)\n\nThere\"s no \"CLOSED\" / \"LOST\" state, for server will remove session object in registry when the server closes connection or stops waiting for reconnection for timeout.\n",
1494-
"enum" : [ "NORMAL", "LOSING", "CLOSING" ]
1493+
"description" : "NORMAL = connected, normally working.\nCLOSING = server requested client to disconnect. Connection will be closed soon.\nTERMINATED = disconnected. server will remove this session from registry ASAP.\n",
1494+
"enum" : [ "NORMAL", "CLOSING", "TERMINATED" ]
14951495
},
14961496
"workspaceId" : {
14971497
"type" : "string",
@@ -1506,20 +1506,10 @@
15061506
"format" : "date-time",
15071507
"description" : "the time when socket connection is established"
15081508
},
1509-
"disconnectedAt" : {
1510-
"type" : "string",
1511-
"format" : "date-time",
1512-
"description" : "the time when socket is closed."
1513-
},
15141509
"willCloseAt" : {
15151510
"type" : "string",
15161511
"format" : "date-time",
1517-
"description" : "when state becomes CLOSING, actual closing time will be updated by server."
1518-
},
1519-
"willLoseAt" : {
1520-
"type" : "string",
1521-
"format" : "date-time",
1522-
"description" : "when state becomes LOSING, server will not wait for reconnection after this time."
1512+
"description" : "when state becomes CLOSING, server sets this time as deadline."
15231513
}
15241514
},
15251515
"description" : "an application session per ide instance. bound to access token"
@@ -1631,7 +1621,7 @@
16311621
"properties" : {
16321622
"id" : {
16331623
"type" : "string",
1634-
"description" : "id, and the path-fragment to access. Since this id is a path-fragment, any unsafe chars for file system path should not be included. Windows OS prohibits following characters to be used in a file name.\n < (less than)\n > (greater than)\n : (colon)\n \" (double quote)\n / (forward slash)\n \\ (backslash)\n | (vertical bar or pipe)\n ? (question mark)\n * (asterisk)\n"
1624+
"description" : "id, and the path-fragment to access. Since this id is a path-fragment, any unsafe chars for file system path should not be included. Windows OS prohibits following characters.\n < (less than)\n > (greater than)\n : (colon)\n \" (double quote)\n / (forward slash)\n \\ (backslash)\n | (vertical bar or pipe)\n ? (question mark)\n * (asterisk)\n"
16351625
},
16361626
"workspaceId" : {
16371627
"type" : "string",

api-spec/swagger.yaml

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ paths:
102102
x-handler: handlers/auth/issueToken.js
103103
tags: ["auth"]
104104
description: |
105-
Creates new token from current access token, inheriting workspace id & session id. The duration of generated token is (and should not be) parameterizable. Server should set proper duration, respecting "reconnect" period of socket.io clients. Remember that most of socket.io client implementations (including official js client) do not provide any ways to change connection parameters (header or query) while reconnecting to server.
105+
Creates new token from current access token, inheriting workspace id & session id. The duration of generated token is not (and should not be) parameterizable. Server should set proper duration, respecting "reconnect" period of socket.io clients. Remember that most of socket.io client implementations (including official js client) do not provide any ways to change connection parameters (header or query) while reconnecting to server.
106106
107107
Like login API, this endpoint does not provide any encryption. Server should not set any data to harm security in the token & should provide some signinig/encryption mechanism to protect token. Simple JSON Web Token with HMAC-SHA will do.
108108
@@ -168,7 +168,7 @@ paths:
168168
- name: If-None-Match
169169
in: header
170170
required: false
171-
description: Usual if-non-match header, allowing only 1 e-tag value from previous readFile response, including weak prefix and quotation chars. This header value precedes if-modified-since, and server should ignore if-modified-since header when if-none-match header exists, as RFC-2616 declines.
171+
description: Usual if-non-match header, allowing only 1 e-tag value from previous readFile response. The value of this header can have weak prefix and quotation chars. This header value precedes the value of if-modified-since header. Server should ignore if-modified-since header when if-none-match header exists, as RFC-2616.
172172
type: string
173173
responses:
174174
"200":
@@ -1237,16 +1237,14 @@ definitions:
12371237
type: string
12381238
state:
12391239
description: |
1240-
NORMAL = connected, normally working
1241-
LOSING = disconnected, waiting reconnection. still accessible with api
1242-
CLOSING = socket connection will close connection by server (clinet will be notified)
1243-
1244-
There"s no "CLOSED" / "LOST" state, for server will remove session object in registry when the server closes connection or stops waiting for reconnection for timeout.
1240+
NORMAL = connected, normally working.
1241+
CLOSING = server requested client to disconnect. Connection will be closed soon.
1242+
TERMINATED = disconnected. server will remove this session from registry ASAP.
12451243
type: string
12461244
enum:
12471245
- NORMAL
1248-
- LOSING
12491246
- CLOSING
1247+
- TERMINATED
12501248
workspaceId:
12511249
description: the id of workspace that this sessions is working on. If falsy, then this session is not belonged to any workpsace. Usually, dashboard / monitoring app will create a session without workspace id.
12521250
type: string
@@ -1257,16 +1255,8 @@ definitions:
12571255
description: the time when socket connection is established
12581256
type: string
12591257
format: date-time
1260-
disconnectedAt:
1261-
description: the time when socket is closed.
1262-
type: string
1263-
format: date-time
12641258
willCloseAt:
1265-
description: when state becomes CLOSING, actual closing time will be updated by server.
1266-
type: string
1267-
format: date-time
1268-
willLoseAt:
1269-
description: when state becomes LOSING, server will not wait for reconnection after this time.
1259+
description: when state becomes CLOSING, server sets this time as deadline.
12701260
type: string
12711261
format: date-time
12721262
required:
@@ -1275,7 +1265,6 @@ definitions:
12751265
- state
12761266
- clientAddress
12771267
- connectedAt
1278-
- disconnectedAt
12791268

12801269
Execution:
12811270
type: object
@@ -1398,7 +1387,7 @@ definitions:
13981387
properties:
13991388
id:
14001389
description: |
1401-
id, and the path-fragment to access. Since this id is a path-fragment, any unsafe chars for file system path should not be included. Windows OS prohibits following characters to be used in a file name.
1390+
id, and the path-fragment to access. Since this id is a path-fragment, any unsafe chars for file system path should not be included. Windows OS prohibits following characters.
14021391
< (less than)
14031392
> (greater than)
14041393
: (colon)

builder/templates/package.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "webida-restful-api",
3-
"version": "0.7.1",
3+
"version": "0.8.0",
44
"description": "Webida Restful API Spec & generated clients",
55
"license": "Apache-2.0",
66
"main": "{{sourceFolder}}{{#invokerPackage}}/{{invokerPackage}}{{/invokerPackage}}/index.js",

docs/Alias.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## Properties
44
Name | Type | Description | Notes
55
------------ | ------------- | ------------- | -------------
6-
**id** | **String** | id, and the path-fragment to access. Since this id is a path-fragment, any unsafe chars for file system path should not be included. Windows OS prohibits following characters to be used in a file name. &lt; (less than) &gt; (greater than) : (colon) \&quot; (double quote) / (forward slash) \\ (backslash) | (vertical bar or pipe) ? (question mark) * (asterisk) |
6+
**id** | **String** | id, and the path-fragment to access. Since this id is a path-fragment, any unsafe chars for file system path should not be included. Windows OS prohibits following characters. &lt; (less than) &gt; (greater than) : (colon) \&quot; (double quote) / (forward slash) \\ (backslash) | (vertical bar or pipe) ? (question mark) * (asterisk) |
77
**workspaceId** | **String** | id of the workspace that contains source of alias |
88
**sourcePath** | **String** | the source of alias, relative path to workspace root directory. |
99

docs/AuthApi.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ This endpoint does not need any parameter.
6262
6363

6464

65-
Creates new token from current access token, inheriting workspace id &amp; session id. The duration of generated token is (and should not be) parameterizable. Server should set proper duration, respecting \&quot;reconnect\&quot; period of socket.io clients. Remember that most of socket.io client implementations (including official js client) do not provide any ways to change connection parameters (header or query) while reconnecting to server. Like login API, this endpoint does not provide any encryption. Server should not set any data to harm security in the token &amp; should provide some signinig/encryption mechanism to protect token. Simple JSON Web Token with HMAC-SHA will do.
65+
Creates new token from current access token, inheriting workspace id &amp; session id. The duration of generated token is not (and should not be) parameterizable. Server should set proper duration, respecting \&quot;reconnect\&quot; period of socket.io clients. Remember that most of socket.io client implementations (including official js client) do not provide any ways to change connection parameters (header or query) while reconnecting to server. Like login API, this endpoint does not provide any encryption. Server should not set any data to harm security in the token &amp; should provide some signinig/encryption mechanism to protect token. Simple JSON Web Token with HMAC-SHA will do.
6666

6767
### Example
6868
```javascript

docs/Session.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,11 @@ Name | Type | Description | Notes
55
------------ | ------------- | ------------- | -------------
66
**id** | **String** | the id of a session. usually same to socket id. |
77
**name** | **String** | human readable name, usually derived from workspace name. |
8-
**state** | **String** | NORMAL &#x3D; connected, normally working LOSING &#x3D; disconnected, waiting reconnection. still accessible with api CLOSING &#x3D; socket connection will close connection by server (clinet will be notified) There\&quot;s no \&quot;CLOSED\&quot; / \&quot;LOST\&quot; state, for server will remove session object in registry when the server closes connection or stops waiting for reconnection for timeout. |
8+
**state** | **String** | NORMAL &#x3D; connected, normally working. CLOSING &#x3D; server requested client to disconnect. Connection will be closed soon. TERMINATED &#x3D; disconnected. server will remove this session from registry ASAP. |
99
**workspaceId** | **String** | the id of workspace that this sessions is working on. If falsy, then this session is not belonged to any workpsace. Usually, dashboard / monitoring app will create a session without workspace id. | [optional]
1010
**clientAddress** | **String** | the peer address of session connection. not always |
1111
**connectedAt** | **Date** | the time when socket connection is established |
12-
**disconnectedAt** | **Date** | the time when socket is closed. |
13-
**willCloseAt** | **Date** | when state becomes CLOSING, actual closing time will be updated by server. | [optional]
14-
**willLoseAt** | **Date** | when state becomes LOSING, server will not wait for reconnection after this time. | [optional]
12+
**willCloseAt** | **Date** | when state becomes CLOSING, server sets this time as deadline. | [optional]
1513

1614

1715
<a name="StateEnum"></a>
@@ -20,10 +18,10 @@ Name | Type | Description | Notes
2018

2119
* `NORMAL` (value: `"NORMAL"`)
2220

23-
* `LOSING` (value: `"LOSING"`)
24-
2521
* `CLOSING` (value: `"CLOSING"`)
2622

23+
* `TERMINATED` (value: `"TERMINATED"`)
24+
2725

2826

2927

docs/WfsApi.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ var wfsPath = "wfsPath_example"; // String | webida file system path to access.
286286

287287
var opts = {
288288
'ifModifiedSince': "ifModifiedSince_example", // String | Usual if-modified-since header. So, should be RFC-1123(same to RFC-822) format, not RFC-3339 (same to ISO-8601).
289-
'ifNoneMatch': "ifNoneMatch_example" // String | Usual if-non-match header, allowing only 1 e-tag value from previous readFile response, including weak prefix and quotation chars. This header value precedes if-modified-since, and server should ignore if-modified-since header when if-none-match header exists, as RFC-2616 declines.
289+
'ifNoneMatch': "ifNoneMatch_example" // String | Usual if-non-match header, allowing only 1 e-tag value from previous readFile response. The value of this header can have weak prefix and quotation chars. This header value precedes the value of if-modified-since header. Server should ignore if-modified-since header when if-none-match header exists, as RFC-2616.
290290
};
291291

292292
var callback = function(error, data, response) {
@@ -306,7 +306,7 @@ Name | Type | Description | Notes
306306
**wfsId** | **String**| webida file system id (same to workspace id) to access. |
307307
**wfsPath** | **String**| webida file system path to access. without heading /. should be placed at the end of path arguments |
308308
**ifModifiedSince** | **String**| Usual if-modified-since header. So, should be RFC-1123(same to RFC-822) format, not RFC-3339 (same to ISO-8601). | [optional]
309-
**ifNoneMatch** | **String**| Usual if-non-match header, allowing only 1 e-tag value from previous readFile response, including weak prefix and quotation chars. This header value precedes if-modified-since, and server should ignore if-modified-since header when if-none-match header exists, as RFC-2616 declines. | [optional]
309+
**ifNoneMatch** | **String**| Usual if-non-match header, allowing only 1 e-tag value from previous readFile response. The value of this header can have weak prefix and quotation chars. This header value precedes the value of if-modified-since header. Server should ignore if-modified-since header when if-none-match header exists, as RFC-2616. | [optional]
310310

311311
### Return type
312312

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "webida-restful-api",
3-
"version": "0.7.1",
3+
"version": "0.8.0",
44
"description": "Webida Restful API Spec & generated clients",
55
"license": "Apache-2.0",
66
"main": "src/index.js",

src/api/AuthApi.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
*/
104104

105105
/**
106-
* Creates new token from current access token, inheriting workspace id &amp; session id. The duration of generated token is (and should not be) parameterizable. Server should set proper duration, respecting \&quot;reconnect\&quot; period of socket.io clients. Remember that most of socket.io client implementations (including official js client) do not provide any ways to change connection parameters (header or query) while reconnecting to server. Like login API, this endpoint does not provide any encryption. Server should not set any data to harm security in the token &amp; should provide some signinig/encryption mechanism to protect token. Simple JSON Web Token with HMAC-SHA will do.
106+
* Creates new token from current access token, inheriting workspace id &amp; session id. The duration of generated token is not (and should not be) parameterizable. Server should set proper duration, respecting \&quot;reconnect\&quot; period of socket.io clients. Remember that most of socket.io client implementations (including official js client) do not provide any ways to change connection parameters (header or query) while reconnecting to server. Like login API, this endpoint does not provide any encryption. Server should not set any data to harm security in the token &amp; should provide some signinig/encryption mechanism to protect token. Simple JSON Web Token with HMAC-SHA will do.
107107
* @param {module:model/String} type
108108
* @param {Object} opts Optional parameters
109109
* @param {String} opts.workspaceId Clients to save some remote access info should issue a MASTER type token restricted to specific workspace id.

0 commit comments

Comments
 (0)