remove async

Author: Francesca-Bit

lib/connectionConfig.js

@@ -119,6 +119,7 @@ ConnectionConfig.prototype.apiURL = function() {
  * @returns {string | boolean}
  */
 ConnectionConfig.prototype.db = function() {
+    if(!this.dbid) throw new Error('Invalid database name'); 
     return this.dbid
 }
 

lib/woqlClient.js

@@ -166,7 +166,9 @@ WOQLClient.prototype.db = function(dbId) {
     if (typeof dbId !== 'undefined') {
         this.connectionConfig.setDB(dbId)
     }
-    return this.connectionConfig.db()
+    return this.connectionConfig.dbid
+    
+    //this.connectionConfig.db()
 }
 
 /**
@@ -859,7 +861,7 @@ WOQLClient.prototype.clonedb = function(cloneSource, newDbId, orgId) {
  * @property {object} [payload] - the post body
  * @returns {Promise}  A promise that returns the call response object, or an Error if rejected.
  */
-WOQLClient.prototype.dispatch = async function(action, apiUrl, payload) {
+WOQLClient.prototype.dispatch =  function(action, apiUrl, payload) {
     if (!apiUrl) {
         return Promise.reject(
             new Error(
@@ -870,15 +872,15 @@ WOQLClient.prototype.dispatch = async function(action, apiUrl, payload) {
             ),
         )
     }//I have to do a call to get the jwt token
-    if(this.connectionConfig.tokenParameter){
+    /*if(this.connectionConfig.tokenParameter){
         const param = this.connectionConfig.tokenParameter
         await axios.post(param.url,param.options).then(result=>result.data).then(data=>{
             if(data.access_token){
                 console.log("ACCESS_TOKEN",data.access_token)
                 this.localAuth({"key":data.access_token,"type":"jwt"})
             }
         })          
-    }
+    }*/
     return DispatchRequest(
             apiUrl,
             action,
@@ -1282,7 +1284,7 @@ WOQLClient.prototype.deleteDocument = function(params,dbId,message="delete docum
  * @returns 
  */
 
-WOQLClient.prototype.schema = function(type,dbId){
+WOQLClient.prototype.getSchemaFrame = function(type,dbId){
     let params
     if(type) params = {type:type}
     if (dbId) {
@@ -1291,22 +1293,47 @@ WOQLClient.prototype.schema = function(type,dbId){
     return this.dispatch(CONST.GET, this.connectionConfig.jsonSchemaURL(params))
 }
 
-WOQLClient.prototype.classes = function(dbId){
+/**
+ * get all the schema classes (documents,subdocuments,abstracts)
+ * @param {string} [dbId] 
+ * @returns 
+ */
+WOQLClient.prototype.getClasses = function(dbId){
     const params = {'graph_type':"schema","as_list":true,"type":"sys:Class"}
     return this.getDocument(params,dbId)
 }
 
-WOQLClient.prototype.getDocuments = async function(dbId){
+/**
+ * get all the Enum Objects
+ * @param {string} [dbId] 
+ * @returns 
+ */
+WOQLClient.prototype.getEnums = function(dbId){
+    const params = {'graph_type':"schema","as_list":true,"type":"sys:Enum"}
+    return this.getDocument(params,dbId)
+}
+
+/**
+ * get all the Document Classes (no abstract)
+ * @param {string} [dbId] 
+ * @returns 
+ */
+/*WOQLClient.prototype.getClassDocuments = async function(dbId){
     const params = {'graph_type':"schema","as_list":true,"type":"sys:Class"}
     const result = await this.getDocument(params,dbId)
     let documents=[]
     if(result){
          documents = result.filter(item => !item['@subdocument'] && !item['@abstract'])
     }
     return documents
-}
+}*/
 
-WOQLClient.prototype.branches = async function(dbId){
+/**
+ * 
+ * @param {*} dbId 
+ * @returns 
+ */
+/*WOQLClient.prototype.getBranches = async function(dbId){
     const params={type:'Branch','as_list':true}
     const branch = this.checkout()
     const result = await this.getDocument(params,dbId,"_commits")
@@ -1319,6 +1346,6 @@ WOQLClient.prototype.branches = async function(dbId){
     }
     this.checkout(branch)
     return branchesObj
-}
+}*/
 
 module.exports = WOQLClient