Merge pull request #91 from Alfresco/development

0.3.8 release
Alfresco · Nov 8, 2016 · 8754891 · 8754891
2 parents c3f5b97 + 36a5916
commit 8754891
Show file tree

Hide file tree

Showing 11 changed files with 276 additions and 44 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,14 +6,29 @@ Alfresco JS API
 
 _This project provides a JavaScript client API into the v1 Alfresco REST API_
 
+<a name="0.3.8"></a>
+# [0.3.8](https://github.com/Alfresco/alfresco-js-api/releases/tag/0.3.8) (04-11-2016)
+
+## Fix
+- [Activiti API processApi.getProcessDefinitionStartForm() does not take a process def ID #76](https://github.com/Alfresco/alfresco-js-api/issues/76)
+
+```javascript
+
+var processDefinitionId = "pprocessDefinitionId_example"; // String | processDefinitionId
+
+this.alfrescoJsApi.activiti.processApi.getProcessDefinitionStartForm(processDefinitionId);
+```
+- [cookies are missing #86](https://github.com/Alfresco/alfresco-js-api/issues/86)
+
+
 <a name="0.3.7"></a>
-# [0.3.7](https://github.com/Alfresco/alfresco-js-api/releases/tag/0.3.7) (2016-10-29)
+# [0.3.7](https://github.com/Alfresco/alfresco-js-api/releases/tag/0.3.7) (29-10-2016)
 
 ## Fix
 - [Latest version no longer works due to .d.ts errors #78](https://github.com/Alfresco/alfresco-js-api/issues/78)
 
 <a name="0.3.6"></a>
-# [0.3.6](https://github.com/Alfresco/alfresco-js-api/releases/tag/0.3.6) (2016-10-28)
+# [0.3.6](https://github.com/Alfresco/alfresco-js-api/releases/tag/0.3.6) (28-10-2016)
 
 ## Fix
 - [separate getRestFieldValues in getRestFieldValues and getRestFieldValuesColumn #71](https://github.com/Alfresco/alfresco-js-api/issues/71)
@@ -53,20 +68,20 @@ this.alfrescoJsApi.activiti.modelJsonBpmnApi.getHistoricEditorDisplayJsonClient(
 
 
 <a name="0.3.5"></a>
-# [0.3.5](https://github.com/Alfresco/alfresco-js-api/releases/tag/0.3.5) (2016-09-26)
+# [0.3.5](https://github.com/Alfresco/alfresco-js-api/releases/tag/0.3.5) (26-09-2016)
 
 ## Fix
 - [Library no longer works with ECM](https://github.com/Alfresco/alfresco-js-api/issues/63)
 - [Flag to enable/disable CSRF behaviour](https://github.com/Alfresco/alfresco-js-api/issues/62)
 
 <a name="0.3.4"></a>
-# [0.3.4](https://github.com/Alfresco/alfresco-js-api/releases/tag/0.3.4) (2016-09-26)
+# [0.3.4](https://github.com/Alfresco/alfresco-js-api/releases/tag/0.3.4) (26-09-2016)
 
 ## Fix
 - [csrf token for activiti doesn't work with Node.js](https://github.com/Alfresco/alfresco-js-api/issues/61)
 
 <a name="0.3.3"></a>
-# [0.3.3](https://github.com/Alfresco/alfresco-js-api/releases/tag/0.3.3) (2016-09-26)
+# [0.3.3](https://github.com/Alfresco/alfresco-js-api/releases/tag/0.3.3) (26-09-2016)
 
 ## Fix
 - [Add csrf token for activiti](https://github.com/Alfresco/alfresco-js-api/issues/59)
@@ -76,7 +91,7 @@ this.alfrescoJsApi.activiti.modelJsonBpmnApi.getHistoricEditorDisplayJsonClient(
 - Various improvements for TypeScript declaration files
 
 <a name="0.3.2"></a>
-# [0.3.2](https://github.com/Alfresco/alfresco-js-api/releases/tag/0.3.2) (2016-09-21)
+# [0.3.2](https://github.com/Alfresco/alfresco-js-api/releases/tag/0.3.2) (21-09-2016)
 
 ## Fix
 - [Null date fields parsed as invalid dates](https://github.com/Alfresco/alfresco-js-api/issues/50)
@@ -88,7 +103,7 @@ this.alfrescoJsApi.activiti.modelJsonBpmnApi.getHistoricEditorDisplayJsonClient(
 - Various improvements for TypeScript declaration files
 
 <a name="0.3.1"></a>
-# [0.3.1](https://github.com/Alfresco/alfresco-js-api/releases/tag/0.3.1) (2016-08-29)
+# [0.3.1](https://github.com/Alfresco/alfresco-js-api/releases/tag/0.3.1) (29-08-2016)
 
 ## Fix
 - [Date parser error with Safari](https://github.com/Alfresco/alfresco-js-api/issues/43)
@@ -98,7 +113,7 @@ this.alfrescoJsApi.activiti.modelJsonBpmnApi.getHistoricEditorDisplayJsonClient(
 - Various improvements for TypeScript declaration files
 
 <a name="0.3.0"></a>
-# [0.3.0](https://github.com/Alfresco/alfresco-js-api/releases/tag/0.3.0) (2016-08-22)
+# [0.3.0](https://github.com/Alfresco/alfresco-js-api/releases/tag/0.3.0) (22-08-2016)
 
 ## Features
 - [Integration Activiti Api #19](https://github.com/Alfresco/alfresco-js-api/issues/19)
@@ -192,12 +207,12 @@ this.alfrescoJsApi = new AlfrescoApi({ ticketEcm:'TICKET_4479f4d3bb155195879bfbb
 ```
 
 <a name="0.2.2"></a>
-# [0.2.2](https://github.com/Alfresco/alfresco-js-api/releases/tag/0.2.2) (2016-07-21)
+# [0.2.2](https://github.com/Alfresco/alfresco-js-api/releases/tag/0.2.2) (21-07-2016)
 - [Cannot find module mockAlfrescoApi #29](https://github.com/Alfresco/alfresco-js-api/issues/29)
 - [ChangesAPI doesn't refer to any real API and duplicates other APIs #26](https://github.com/Alfresco/alfresco-js-api/issues/26)
 
 <a name="0.2.1"></a>
-# [0.2.1](https://github.com/Alfresco/alfresco-js-api/releases/tag/0.2.1) (2016-07-15)
+# [0.2.1](https://github.com/Alfresco/alfresco-js-api/releases/tag/0.2.1) (15-07-2016)
 
 ## Features
 
@@ -229,7 +244,7 @@ After:
 ```
 
 <a name="0.2.0"></a>
-# [0.2.0](https://github.com/Alfresco/alfresco-js-api/releases/tag/0.2.0) (2016-07-08)
+# [0.2.0](https://github.com/Alfresco/alfresco-js-api/releases/tag/0.2.0) (08-07-2016)
 
 ## BREAKING CHANGES
 

diff --git a/dist/alfresco-js-api.js b/dist/alfresco-js-api.js
@@ -60358,11 +60358,20 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
 
     /**
      * Retrieve the start form for a process definition
+     * @param {String} processDefinitionId processDefinitionId
      */
-    this.getProcessDefinitionStartForm = function () {
+    this.getProcessDefinitionStartForm = function (processDefinitionId) {
       var postBody = null;
 
-      var pathParams = {};
+      // verify the required parameter 'processInstanceId' is set
+      if (processDefinitionId == undefined || processDefinitionId == null) {
+        throw "Missing the required parameter 'processDefinitionId' when calling getProcessInstanceContent";
+      }
+
+      var pathParams = {
+        'processDefinitionId': processDefinitionId
+      };
+
       var queryParams = {};
       var headerParams = {};
       var formParams = {};
@@ -89827,8 +89836,11 @@ var AlfrescoApiClient = function (_ApiClient) {
             }
 
             // add cookie for activiti
-            if (this.isBpmRequest() && this.cookie) {
-                request.set('Cookie', this.cookie);
+            if (this.isBpmRequest()) {
+                request._withCredentials = true;
+                if (this.cookie) {
+                    request.set('Cookie', this.cookie);
+                }
             }
 
             // set request timeout
@@ -91106,6 +91118,78 @@ var ProcessMock = function (_BaseMock) {
                 }]
             });
         }
+    }, {
+        key: 'get200getProcessDefinitionStartForm',
+        value: function get200getProcessDefinitionStartForm() {
+            nock(this.host, { 'encodedQueryParams': true }).get('/activiti-app/api/enterprise/process-definitions/testProcess%3A1%3A7504/start-form').reply(200, {
+                'id': 2002,
+                'processDefinitionId': 'testProcess:1:7504',
+                'processDefinitionName': 'test process',
+                'processDefinitionKey': 'testProcess',
+                'tabs': [],
+                'fields': [{
+                    'fieldType': 'DynamicTableRepresentation',
+                    'id': 'label',
+                    'name': 'Label',
+                    'type': 'dynamic-table',
+                    'value': null,
+                    'required': false,
+                    'readOnly': false,
+                    'overrideId': false,
+                    'colspan': 1,
+                    'placeholder': null,
+                    'minLength': 0,
+                    'maxLength': 0,
+                    'minValue': null,
+                    'maxValue': null,
+                    'regexPattern': null,
+                    'optionType': null,
+                    'hasEmptyValue': null,
+                    'options': null,
+                    'restUrl': null,
+                    'restResponsePath': null,
+                    'restIdProperty': null,
+                    'restLabelProperty': null,
+                    'tab': null,
+                    'className': null,
+                    'params': { 'existingColspan': 1, 'maxColspan': 1 },
+                    'layout': { 'row': -1, 'column': -1, 'colspan': 2 },
+                    'sizeX': 2,
+                    'sizeY': 2,
+                    'row': -1,
+                    'col': -1,
+                    'visibilityCondition': null,
+                    'columnDefinitions': [{
+                        'id': 'user',
+                        'name': 'User',
+                        'type': 'Dropdown',
+                        'value': null,
+                        'optionType': 'rest',
+                        'options': [{ 'id': null, 'name': 'Option 1' }],
+                        'restResponsePath': null,
+                        'restUrl': 'https://jsonplaceholder.typicode.com/users',
+                        'restIdProperty': 'id',
+                        'restLabelProperty': 'name',
+                        'amountCurrency': null,
+                        'amountEnableFractions': false,
+                        'required': true,
+                        'editable': true,
+                        'sortable': true,
+                        'visible': true,
+                        'endpoint': null,
+                        'requestHeaders': null
+                    }]
+                }],
+                'outcomes': [],
+                'javascriptEvents': [],
+                'className': '',
+                'style': '',
+                'customFieldTemplates': {},
+                'metadata': {},
+                'variables': [],
+                'gridsterForm': false
+            });
+        }
     }]);
 
     return ProcessMock;
@@ -91243,7 +91327,7 @@ var TaskFormMock = function (_BaseMock) {
     _createClass(TaskFormMock, [{
         key: 'get200getTaskFormVariables',
         value: function get200getTaskFormVariables() {
-            nock(this.host, { 'encodedQueryParams': true }).get('/activiti-app/app/rest/task-forms/5028/variables').reply(200, [{ 'id': 'initiator', 'type': 'string', 'value': '1001' }]);
+            nock(this.host, { 'encodedQueryParams': true }).get('/activiti-app/app/rest/task-forms/5028/variables').reply(200, [{ 'id': 'initiator', 'type': 'string', 'value': '1001' }], ['Server', 'Apache-Coyote/1.1', 'set-cookie', 'ACTIVITI_REMEMBER_ME=NjdOdGwvcUtFTkVEczQyMGh4WFp5QT09OmpUL1UwdFVBTC94QTJMTFFUVFgvdFE9PQ', 'X-Content-Type-Options', 'nosniff', 'X-XSS-Protection', '1; mode=block', 'Cache-Control', 'no-cache, no-store, max-age=0, must-revalidate', 'Pragma', 'no-cache', 'Expires', '0', 'X-Frame-Options', 'SAMEORIGIN', 'Content-Type', 'application/json', 'Transfer-Encoding', 'chunked', 'Date', 'Tue, 01 Nov 2016 19:43:36 GMT', 'Connection', 'close']);
         }
     }]);
 

diff --git a/dist/alfresco-js-api.min.js b/dist/alfresco-js-api.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "alfresco-js-api",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "description": "JavaScript client library for the Alfresco REST API",
   "main": "main.js",
   "typings": "index.d.ts",

diff --git a/src/alfresco-activiti-rest-api/docs/ProcessApi.md b/src/alfresco-activiti-rest-api/docs/ProcessApi.md
@@ -92,12 +92,16 @@ Retrieve the start form for a process definition
 ### Example
 ```javascript
 
-this.alfrescoJsApi.activiti.processApi.getProcessDefinitionStartForm();
+var processDefinitionId = "pprocessDefinitionId_example"; // String | processDefinitionId
+
+this.alfrescoJsApi.activiti.processApi.getProcessDefinitionStartForm(processDefinitionId);
 ```
 
 ### Parameters
-This endpoint does not need any parameter.
-
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **processDefinitionId** | **String**| processDefinitionId | 
+
 ### Return type
 
 [**FormDefinitionRepresentation**](FormDefinitionRepresentation.md)

diff --git a/src/alfresco-activiti-rest-api/src/api/ProcessApi.js b/src/alfresco-activiti-rest-api/src/api/ProcessApi.js
@@ -124,13 +124,21 @@
 
     /**
      * Retrieve the start form for a process definition
+     * @param {String} processDefinitionId processDefinitionId
      */
-    this.getProcessDefinitionStartForm = function() {
+    this.getProcessDefinitionStartForm = function(processDefinitionId) {
       var postBody = null;
 
+      // verify the required parameter 'processInstanceId' is set
+      if (processDefinitionId == undefined || processDefinitionId == null) {
+        throw "Missing the required parameter 'processDefinitionId' when calling getProcessInstanceContent";
+      }
+
 
       var pathParams = {
+        'processDefinitionId': processDefinitionId
       };
+
       var queryParams = {
       };
       var headerParams = {

diff --git a/src/alfrescoApiClient.js b/src/alfrescoApiClient.js
@@ -63,8 +63,11 @@ class AlfrescoApiClient extends ApiClient {
         }
 
         // add cookie for activiti
-        if (this.isBpmRequest() && this.cookie) {
-            request.set('Cookie', this.cookie);
+        if (this.isBpmRequest()) {
+            request._withCredentials = true;
+            if (this.cookie) {
+                request.set('Cookie', this.cookie);
+            }
         }
 
         // set request timeout

diff --git a/test/activitProcessApi.spec.js b/test/activitProcessApi.spec.js
@@ -53,4 +53,14 @@ describe('Activiti Process Api', function () {
         });
     });
 
+    it('get process definition startForm', function (done) {
+        this.processMock.get200getProcessDefinitionStartForm();
+        var processDefinitionId = 'testProcess:1:7504';
+
+        this.alfrescoJsApi.activiti.processApi.getProcessDefinitionStartForm(processDefinitionId).then((data)=> {
+            expect(data.processDefinitionId).equal('testProcess:1:7504');
+            done();
+        });
+    });
+
 });
diff --git a/test/activitiTaskFormApi.spec.js b/test/activitiTaskFormApi.spec.js
@@ -34,4 +34,14 @@ describe('Activiti Task Api', function () {
         });
     });
 
+    it('Check cookie settings', function (done) {
+        this.taskFormMock.get200getTaskFormVariables();
+
+        var taskId = 5028;
+        this.alfrescoJsApi.activiti.taskFormsApi.getTaskFormVariables(taskId).then((data)=> {
+            expect(this.alfrescoJsApi.activiti.taskFormsApi.apiClient.cookie).equal('ACTIVITI_REMEMBER_ME=NjdOdGwvcUtFTkVEczQyMGh4WFp5QT09OmpUL1UwdFVBTC94QTJMTFFUVFgvdFE9PQ');
+            done();
+        });
+    });
+
 });