Merge pull request #131 from terminusdb/getDatabases

fixes update_triple variable name bug

Author: Neelterminusdb

lib/accessControl.js

@@ -580,4 +580,86 @@ AccessControl.prototype.updateUserRole = function (userId, capabilityId, scope,
   });
 };
 
+/**
+ * Get all the access request list for a specify organization
+ * @param {string} [orgName] -  The organization name.
+ * @return {Promise} A promise that returns the call response object, or an Error if rejected.
+ * @example
+ * accessControl.accessRequestsList().then(result=>{
+ *  console.log(result)
+ * })
+ *
+ */
+AccessControl.prototype.accessRequestsList = function (orgName) {
+  if (!orgName && !this.defaultOrganization) {
+    return Promise.reject(
+      new Error(
+        ErrorMessage.getInvalidParameterMessage(
+          'GET',
+          'Please provide a organization name',
+        ),
+      ),
+    );
+  }
+  const org = orgName || this.defaultOrganization;
+  return this.dispatch(`${this.baseURL}/organizations/${UTILS.encodeURISegment(org)}/access_requests`, CONST.GET);
+};
+
+/**
+ * Get all the access request list for a specify organization
+ * @param {string} [email] -  the user email.
+ * @param {string} [affiliation] -  the user affiliation, company, university etc..
+ * @param {string} [note] -  the message for the team admin
+ * @param {string} [orgName] -  The organization name.
+ * @return {Promise} A promise that returns the call response object, or an Error if rejected.
+ * @example
+ * accessControl.sendAccessRequest("[email protected]",
+ *  "my_company",
+ *  "please add me to your team"
+ * ).then(result=>{
+ *  console.log(result)
+ * })
+ *
+ */
+AccessControl.prototype.sendAccessRequest = function (email, affiliation, note, orgName) {
+  if (!orgName && !this.defaultOrganization) {
+    return Promise.reject(
+      new Error(
+        ErrorMessage.getInvalidParameterMessage(
+          'POST',
+          'Please provide a organization name',
+        ),
+      ),
+    );
+  }
+  const payload = { email, affiliation, note };
+  const org = orgName || this.defaultOrganization;
+  return this.dispatch(`${this.baseURL}/organizations/${UTILS.encodeURISegment(org)}/access_requests`, CONST.POST, payload);
+};
+
+/**
+ * Delete an access request to join your team, only an admin user can delete it
+ * @param {string} [orgName] -  The organization name.
+ * @return {Promise} A promise that returns the call response object, or an Error if rejected.
+ * @example
+ * accessControl.deleteAccessRequest("djjdshhsuuwewueueuiHYHYYW.......").then(result=>{
+ *  console.log(result)
+ * })
+ *
+ */
+AccessControl.prototype.deleteAccessRequest = function (acceId, orgName) {
+  if (!orgName && !this.defaultOrganization) {
+    return Promise.reject(
+      new Error(
+        ErrorMessage.getInvalidParameterMessage(
+          'POST',
+          'Please provide a organization name',
+        ),
+      ),
+    );
+  }
+  const org = orgName || this.defaultOrganization;
+  return this.dispatch(`${this.baseURL}/organizations/${UTILS.encodeURISegment(org)}/access_requests/${acceId}`, CONST.DELETE);
+};
+
 module.exports = AccessControl;

lib/query/woqlBuilder.js

@@ -63,12 +63,12 @@ WOQLQuery.prototype.iri = function (s) {
 };
 
 WOQLQuery.prototype.update_triple = function (subject, predicate, new_object, old_object) {
-  old_object = old_object || 'v:AnyObject';
+  const tmp_name = old_object || `v:AnyObject__${Date.now()}`;
   return this.and(
     new WOQLQuery().opt(
       new WOQLQuery()
-        .triple(subject, predicate, old_object)
-        .delete_triple(subject, predicate, old_object)
+        .triple(subject, predicate, tmp_name)
+        .delete_triple(subject, predicate, tmp_name)
         .not()
         .triple(subject, predicate, new_object),
     ),
@@ -88,11 +88,12 @@ WOQLQuery.prototype.update_triple = function (subject, predicate, new_object, ol
  */
 
 WOQLQuery.prototype.update_quad = function (subject, predicate, new_object, graph) {
+  const tmp_name = `v:AnyObject__${Date.now()}`;
   return this.and(
     new WOQLQuery().opt(
       new WOQLQuery()
-        .quad(subject, predicate, 'v:AnyObject', graph)
-        .delete_quad(subject, predicate, 'v:AnyObject', graph)
+        .quad(subject, predicate, tmp_name, graph)
+        .delete_quad(subject, predicate, tmp_name, graph)
         .not()
         .quad(subject, predicate, new_object, graph),
     ),