Merge pull request #12 from gotchazipc/master

fix apiClient to use callback.responseType
webida · Jul 26, 2016 · 0a96bb9 · 0a96bb9
2 parents 4ee38a7 + 91fce6a
commit 0a96bb9
Show file tree

Hide file tree

Showing 52 changed files with 91 additions and 83 deletions.
diff --git a/README-API.md b/README-API.md
@@ -2,9 +2,9 @@
 
 This SDK Contains automatically generated sources & documents with the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
-- API version: 0.7.0
-- Package version: 0.7.0
-- Build date: 2016-07-21T13:37:20.306+09:00
+- API version: 0.7.1
+- Package version: 0.7.1
+- Build date: 2016-07-26T15:37:20.836+09:00
 - Build package: class io.swagger.codegen.languages.JavascriptClientCodegen
 
 ## Getting Started

diff --git a/api-spec/swagger.json b/api-spec/swagger.json
@@ -2,7 +2,7 @@
   "swagger" : "2.0",
   "info" : {
     "description" : "Restful API for Webida clients to use server's data & features",
-    "version" : "0.7.0",
+    "version" : "0.7.1",
     "title" : "Webida Restful API",
     "license" : {
       "name" : "Apache 2.0",

diff --git a/api-spec/swagger.yaml b/api-spec/swagger.yaml
@@ -21,7 +21,7 @@
 swagger: "2.0"
 
 info:
-  version: "0.7.0"
+  version: "0.7.1"
   title: Webida Restful API
   description: Restful API for Webida clients to use server's data & features
   license:

diff --git a/builder/templates/ApiClient.mustache b/builder/templates/ApiClient.mustache
@@ -385,9 +385,13 @@
       request.accept(accept);
     }
 
-    // if api returns file, then it should be handled as blob
+    // if api returns file, caller should be able to set
+    // response type (blob, arraybuffer..) of XHR request
+    // client should not set blob/arraybuffer type if return file is json, due to superagent bugs.
     if (returnType === File) {
-        request.responseType('blob');
+        if (callback.responseType) {
+            request.responseType(callback.responseType);
+        }
     }
 
 {{#usePromises}}    return new Promise(function(resolve, reject) {

diff --git a/builder/templates/package.mustache b/builder/templates/package.mustache
@@ -1,6 +1,6 @@
 {
   "name": "webida-restful-api",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "Webida Restful API Spec & generated clients",
   "license": "Apache-2.0",
   "main": "{{sourceFolder}}{{#invokerPackage}}/{{invokerPackage}}{{/invokerPackage}}/index.js",
@@ -12,7 +12,7 @@
     "url" : "https://github.com/webida/webida-restful-api.git"
   },
   "dependencies": {
-    "superagent": "2.0.0"
+    "superagent": "2.1.0"
   },
   "devDependencies": {
     "mocha": "~2.3.4",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "webida-restful-api",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "Webida Restful API Spec & generated clients",
   "license": "Apache-2.0",
   "main": "src/index.js",
@@ -12,7 +12,7 @@
     "url" : "https://github.com/webida/webida-restful-api.git"
   },
   "dependencies": {
-    "superagent": "2.0.0"
+    "superagent": "2.1.0"
   },
   "devDependencies": {
     "mocha": "~2.3.4",

diff --git a/src/ApiClient.js b/src/ApiClient.js
@@ -2,7 +2,7 @@
  * Webida Restful API
  * Restful API for Webida clients to use server's data & features
  *
- * OpenAPI spec version: 0.7.0
+ * OpenAPI spec version: 0.7.1
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
@@ -41,7 +41,7 @@
 
   /**
    * @module ApiClient
-   * @version 0.7.0
+   * @version 0.7.1
    */
 
   /**
@@ -405,9 +405,13 @@
       request.accept(accept);
     }
 
-    // if api returns file, then it should be handled as blob
+    // if api returns file, caller should be able to set
+    // response type (blob, arraybuffer..) of XHR request
+    // client should not set blob/arraybuffer type if return file is json, due to superagent bugs.
     if (returnType === File) {
-        request.responseType('blob');
+        if (callback.responseType) {
+            request.responseType(callback.responseType);
+        }
     }
 
 

diff --git a/src/api/AliasApi.js b/src/api/AliasApi.js
@@ -2,7 +2,7 @@
  * Webida Restful API
  * Restful API for Webida clients to use server's data & features
  *
- * OpenAPI spec version: 0.7.0
+ * OpenAPI spec version: 0.7.1
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
@@ -42,7 +42,7 @@
   /**
    * Alias service.
    * @module api/AliasApi
-   * @version 0.7.0
+   * @version 0.7.1
    */
 
   /**

diff --git a/src/api/AuthApi.js b/src/api/AuthApi.js
@@ -2,7 +2,7 @@
  * Webida Restful API
  * Restful API for Webida clients to use server's data & features
  *
- * OpenAPI spec version: 0.7.0
+ * OpenAPI spec version: 0.7.1
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
@@ -42,7 +42,7 @@
   /**
    * Auth service.
    * @module api/AuthApi
-   * @version 0.7.0
+   * @version 0.7.1
    */
 
   /**

diff --git a/src/api/OpsApi.js b/src/api/OpsApi.js
@@ -2,7 +2,7 @@
  * Webida Restful API
  * Restful API for Webida clients to use server's data & features
  *
- * OpenAPI spec version: 0.7.0
+ * OpenAPI spec version: 0.7.1
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
@@ -42,7 +42,7 @@
   /**
    * Ops service.
    * @module api/OpsApi
-   * @version 0.7.0
+   * @version 0.7.1
    */
 
   /**

diff --git a/src/api/RemotesApi.js b/src/api/RemotesApi.js
@@ -2,7 +2,7 @@
  * Webida Restful API
  * Restful API for Webida clients to use server's data & features
  *
- * OpenAPI spec version: 0.7.0
+ * OpenAPI spec version: 0.7.1
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
@@ -42,7 +42,7 @@
   /**
    * Remotes service.
    * @module api/RemotesApi
-   * @version 0.7.0
+   * @version 0.7.1
    */
 
   /**

diff --git a/src/api/SessionApi.js b/src/api/SessionApi.js
@@ -2,7 +2,7 @@
  * Webida Restful API
  * Restful API for Webida clients to use server's data & features
  *
- * OpenAPI spec version: 0.7.0
+ * OpenAPI spec version: 0.7.1
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
@@ -42,7 +42,7 @@
   /**
    * Session service.
    * @module api/SessionApi
-   * @version 0.7.0
+   * @version 0.7.1
    */
 
   /**

diff --git a/src/api/WfsApi.js b/src/api/WfsApi.js
@@ -2,7 +2,7 @@
  * Webida Restful API
  * Restful API for Webida clients to use server's data & features
  *
- * OpenAPI spec version: 0.7.0
+ * OpenAPI spec version: 0.7.1
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
@@ -42,7 +42,7 @@
   /**
    * Wfs service.
    * @module api/WfsApi
-   * @version 0.7.0
+   * @version 0.7.1
    */
 
   /**

diff --git a/src/api/WorkspaceApi.js b/src/api/WorkspaceApi.js
@@ -2,7 +2,7 @@
  * Webida Restful API
  * Restful API for Webida clients to use server's data & features
  *
- * OpenAPI spec version: 0.7.0
+ * OpenAPI spec version: 0.7.1
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
@@ -42,7 +42,7 @@
   /**
    * Workspace service.
    * @module api/WorkspaceApi
-   * @version 0.7.0
+   * @version 0.7.1
    */
 
   /**

diff --git a/src/index.js b/src/index.js
@@ -2,7 +2,7 @@
  * Webida Restful API
  * Restful API for Webida clients to use server's data & features
  *
- * OpenAPI spec version: 0.7.0
+ * OpenAPI spec version: 0.7.1
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
@@ -62,7 +62,7 @@
    * </pre>
    * </p>
    * @module index
-   * @version 0.7.0
+   * @version 0.7.1
    */
   var exports = {
     /**

diff --git a/src/model/Alias.js b/src/model/Alias.js
@@ -2,7 +2,7 @@
  * Webida Restful API
  * Restful API for Webida clients to use server's data & features
  *
- * OpenAPI spec version: 0.7.0
+ * OpenAPI spec version: 0.7.1
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
@@ -45,7 +45,7 @@
   /**
    * The Alias model module.
    * @module model/Alias
-   * @version 0.7.0
+   * @version 0.7.1
    */
 
   /**

diff --git a/src/model/ChildProcess.js b/src/model/ChildProcess.js
@@ -2,7 +2,7 @@
  * Webida Restful API
  * Restful API for Webida clients to use server's data & features
  *
- * OpenAPI spec version: 0.7.0
+ * OpenAPI spec version: 0.7.1
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
@@ -45,7 +45,7 @@
   /**
    * The ChildProcess model module.
    * @module model/ChildProcess
-   * @version 0.7.0
+   * @version 0.7.1
    */
 
   /**

diff --git a/src/model/Credential.js b/src/model/Credential.js
@@ -2,7 +2,7 @@
  * Webida Restful API
  * Restful API for Webida clients to use server's data & features
  *
- * OpenAPI spec version: 0.7.0
+ * OpenAPI spec version: 0.7.1
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
@@ -45,7 +45,7 @@
   /**
    * The Credential model module.
    * @module model/Credential
-   * @version 0.7.0
+   * @version 0.7.1
    */
 
   /**

diff --git a/src/model/DirEntry.js b/src/model/DirEntry.js
@@ -2,7 +2,7 @@
  * Webida Restful API
  * Restful API for Webida clients to use server's data & features
  *
- * OpenAPI spec version: 0.7.0
+ * OpenAPI spec version: 0.7.1
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
@@ -45,7 +45,7 @@
   /**
    * The DirEntry model module.
    * @module model/DirEntry
-   * @version 0.7.0
+   * @version 0.7.1
    */
 
   /**

diff --git a/src/model/Execution.js b/src/model/Execution.js
@@ -2,7 +2,7 @@
  * Webida Restful API
  * Restful API for Webida clients to use server's data & features
  *
- * OpenAPI spec version: 0.7.0
+ * OpenAPI spec version: 0.7.1
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
@@ -45,7 +45,7 @@
   /**
    * The Execution model module.
    * @module model/Execution
-   * @version 0.7.0
+   * @version 0.7.1
    */
 
   /**

diff --git a/src/model/ExecutionResult.js b/src/model/ExecutionResult.js
@@ -2,7 +2,7 @@
  * Webida Restful API
  * Restful API for Webida clients to use server's data & features
  *
- * OpenAPI spec version: 0.7.0
+ * OpenAPI spec version: 0.7.1
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
@@ -45,7 +45,7 @@
   /**
    * The ExecutionResult model module.
    * @module model/ExecutionResult
-   * @version 0.7.0
+   * @version 0.7.1
    */
 
   /**

diff --git a/src/model/Match.js b/src/model/Match.js
@@ -2,7 +2,7 @@
  * Webida Restful API
  * Restful API for Webida clients to use server's data & features
  *
- * OpenAPI spec version: 0.7.0
+ * OpenAPI spec version: 0.7.1
  * 
  *
  * NOTE: This class is auto generated by the swagger code generator program.
@@ -45,7 +45,7 @@
   /**
    * The Match model module.
    * @module model/Match
-   * @version 0.7.0
+   * @version 0.7.1
    */
 
   /**