fixed woql.post query having multiple files with woql.and (#160)

* fixed woql.post query having multiple files with woql.and

* generated docs for getTeamUserRole

Signed-off-by: NeelParihar <[email protected]>

Author: Neelterminusdb

docs/_sidebar.md

@@ -176,6 +176,7 @@
   - [deleteOrgInvite](api/accessControl.js?id=deleteOrgInvite)
   - [updateOrgInviteStatus](api/accessControl.js?id=updateOrgInviteStatus)
   - [getOrgUsers](api/accessControl.js?id=getOrgUsers)
+  - [getTeamUserRole](api/accessControl.js?id=getTeamUserRole)
   - [removeUserFromOrg](api/accessControl.js?id=removeUserFromOrg)
   - [getDatabaseRolesOfUser](api/accessControl.js?id=getDatabaseRolesOfUser)
   - [createUserRole](api/accessControl.js?id=createUserRole)

docs/api/accessControl.js.md

@@ -241,6 +241,7 @@ accessControl.getOrgUsers().then(result=>{
 })
 
 //this function will return an array of capabilities with users and roles
+//response array example
 //[{capability: "Capability/3ea26e1d698821c570afe9cb4fe81a3......"
 //     email: {@type: "xsd:string", @value: "user@terminusdb.com"}
 //     picture: {@type: "xsd:string",…}
@@ -249,6 +250,27 @@ accessControl.getOrgUsers().then(result=>{
 //     user: "User/auth0%7C613f5dnndjdjkTTT"}]
 ```
 
+## getTeamUserRole
+##### accessControl.getTeamUserRole([orgName]) ⇒ <code>Promise</code>
+Get the user role for a given organization or the default organization,
+The user is identified by the jwt or the access token
+
+**Returns**: <code>Promise</code> - A promise that returns the call response object, or an Error if rejected.  
+
+| Param | Type | Description |
+| --- | --- | --- |
+| [orgName] | <code>string</code> | The organization name. |
+
+**Example**  
+```javascript
+accessControl.getTeamUserRole().then(result=>{
+ console.log(result)
+})
+
+//response object example
+{"userRole":"Role/admin"}
+```
+
 ## removeUserFromOrg
 ##### accessControl.removeUserFromOrg(userId, [orgName]) ⇒ <code>Promise</code>
 Remove an user from an organization, only an admin user can remove an user from an organization

lib/woqlClient.js

@@ -550,6 +550,28 @@ WOQLClient.prototype.info = function () {
   return this.dispatch(CONST.GET, url).then((response) => response);
 };
 
+// Get Resource objects from WOQL query
+function getResourceObjects(queryObject, result_array) {
+  if (queryObject instanceof Array) {
+    for (let i = 0; i < queryObject.length; i += 1) {
+      getResourceObjects(queryObject[i], result_array);
+    }
+  } else {
+    const keys = Object.keys(queryObject);
+
+    for (let i = 0; i < keys.length; i += 1) {
+      if (keys[i] === 'resource') {
+        if (queryObject[keys[i]]['@type'] && queryObject[keys[i]]['@type'] === 'QueryResource') {
+          result_array.push(queryObject[keys[i]]);
+        }
+      }
+      if (queryObject[keys[i]] instanceof Object || queryObject[keys[i]] instanceof Array) {
+        getResourceObjects(queryObject[keys[i]], result_array);
+      }
+    }
+  }
+}
+
 /**
  * Executes a WOQL query on the specified database and returns the results
  * @param {WOQLQuery} woql - an instance of the WOQLQuery class
@@ -572,13 +594,19 @@ WOQLClient.prototype.query = function (woql, commitMsg, allWitnesses, lastDataVe
     doql.query = woql.json();
 
     let postBody;
+    const resourceObjects = [];
+    getResourceObjects(doql.query, resourceObjects);
 
-    if (doql.query.resource && doql.query.resource['@type'] === 'QueryResource' && doql.query.resource.source.post) {
-      const fileName = doql.query.resource.source.post.split('/').pop();
-
+    if (resourceObjects.length > 0) {
       const formData = new FormData();
-      formData.append('file', fs.createReadStream(doql.query.resource.source.post));
-      doql.query.resource.source.post = fileName;
+
+      resourceObjects.forEach((resourceObject) => {
+        const fileName = resourceObject.source.post.split('/').pop();
+
+        formData.append('file', fs.createReadStream(resourceObject.source.post));
+        resourceObject.source.post = fileName;
+      });
+
       formData.append('payload', Buffer.from(JSON.stringify(doql)), { filename: 'body.json', contentType: 'application/json' });
       this.customHeaders(formData.getHeaders());