Merge branch 'main' into issue/optimize

Author: Neelterminusdb

lib/connectionConfig.js

@@ -1,6 +1,7 @@
 ////@ts-check
 //connectionConfig
 const typedef = require('./typedef')
+const {encodeURISegment} = require("./utils")
 
 /**
  * @file Terminus DB connection configuration
@@ -83,7 +84,9 @@ ConnectionConfig.prototype.update = function(params) {
     //if (typeof params.credential !== 'undefined')this.setTokenParameter(params.credential)
     if (typeof params.db !== 'undefined') this.setDB(params.db)  
     //this to set the author and the jwt in creation
-    if (typeof params.jwt !== 'undefined') this.setLocalBasicAuth(params.jwt, params.user, 'jwt')
+    if (typeof params.token !== 'undefined') this.setLocalBasicAuth(params.token, params.user, 'apikey')
+    //this is for jwt 
+    else if (typeof params.jwt !== 'undefined') this.setLocalBasicAuth(params.jwt, params.user, 'jwt')
     //this is basic authO
     else if (typeof params.key !== 'undefined') this.setLocalBasicAuth(params.key, params.user)
     //If I set only the user I have to set the 
@@ -225,7 +228,8 @@ ConnectionConfig.prototype.parseServerURL = function(str) {
 ConnectionConfig.prototype.serverUrlEncoding =  function(str){
     const orgArr = str.split("/")
     if(orgArr.length>3){
-        const org = encodeURIComponent(orgArr[3])
+        //const org = encodeURI(orgArr[3])
+        const org = encodeURISegment(orgArr[3])
         return str.replace(orgArr[3], org)
     }
     return str
@@ -309,7 +313,7 @@ ConnectionConfig.prototype.setRemoteBasicAuth = function(remoteKey, remoteUserID
  * set the local database connection credential
  * @param {string} [userKey] - basic auth api key
  * @param {string} [userId] -  user id
- * @param {string} [type] - basic|jwt 
+ * @param {string} [type] - basic|jwt|apikey
  */
 //to be review this is ok for the basic Auth 
 ConnectionConfig.prototype.setLocalBasicAuth = function(userKey, userId = 'admin', type= 'basic') {
@@ -358,7 +362,7 @@ ConnectionConfig.prototype.dbURL = function() {
 
 ConnectionConfig.prototype.userURL = function(user) {
     let url = `${this.apiURL()}user`
-    if (user) url += `/${encodeURIComponent(user)}`
+    if (user) url += `/${encodeURISegment(user)}`
     return url
 }
 
@@ -368,11 +372,11 @@ ConnectionConfig.prototype.userURL = function(user) {
  * @param {string} [action] - the organization id
  * @returns {string}
  */
-
+//encodeURIComponent
 ConnectionConfig.prototype.organizationURL = function(orgId, action) {
     let url = `${this.apiURL()}organization`
-    if (orgId) url += `/${encodeURIComponent(orgId)}`
-    if (action) url += `/${encodeURIComponent(action)}`
+    if (orgId) url += `/${encodeURISegment(orgId)}`
+    if (action) url += `/${encodeURISegment(action)}`
     return url
 }
 
@@ -561,7 +565,7 @@ ConnectionConfig.prototype.commitDescriptorUrl = function(commitId) {
 /**
  * Generate URL for optimizing db branch
  */
-
+//encodeURI() will not encode: ~!@#$&*()=:/,;?+'
 ConnectionConfig.prototype.optimizeBranchUrl = function(branchId) {
     //let o = this.optimizeBase()
     const dbBase = this.dbBase('optimize')
@@ -628,9 +632,10 @@ ConnectionConfig.prototype.branchBase = function(action) {
  * (unless dbid = system dbname in which case there is no organization)
  * @returns {string|boolean}
  */
+//encodeURIComponent
 ConnectionConfig.prototype.dbURLFragment = function() {
     if (this.db() === this.system_db) return this.db()
-    return encodeURIComponent(this.organization()) + '/' + encodeURIComponent(this.db())
+    return encodeURISegment(this.organization()) + '/' + encodeURISegment(this.db())
 }
 
 /**
@@ -650,12 +655,13 @@ ConnectionConfig.prototype.documentURL = function(params){
 ConnectionConfig.prototype.queryParameter = function(params){
     if(!params || typeof params!=='object')return ''
     let queryString = Object.keys(params).map((key) => {
-        return key + '=' + encodeURIComponent(params[key])
+        return key + '=' + encodeURISegment(params[key])
     }).join('&');
 
     return `?${queryString}`;
 }
 
+
 ConnectionConfig.prototype.jsonSchemaURL = function(params){
     const paramsStr=this.queryParameter(params)
     return this.branchBase('schema')+paramsStr

lib/dispatchRequest.js

@@ -57,7 +57,9 @@ function DispatchRequest(url, action, payload, local_auth, remote_auth = null, c
         options.headers = {Authorization: `Basic ${encoded}`}
     } else if (local_auth && local_auth.type === 'jwt') {
         options.headers = {Authorization: `Bearer ${local_auth.key}`}
-    } 
+    } else if (local_auth && local_auth.type === 'apikey') {
+        options.headers = {API_TOKEN: local_auth.key}
+    }
 
     /*
      * pass the Authorization information of another

lib/utils.js

@@ -5,6 +5,23 @@
  */
 const Utils = {}
 
+//ˆˆˆˆˆ&&**(((()*(*#&#&&#$*#*(#(#(#)#)#)_
+//'Doc%2F%3D%26test'
+//
+//%CB%86%CB%86%CB%86%CB%86%CB%86&&**(((()*(*%23&%23&&%23$*%23*(%23(%23(%23)%23)%23)_
+//encodeURI() will not encode: ~!@#$&*()=:/,;?+
+//%3D%25team =%team
+Utils.encodeURISegment = function(str){
+    if(typeof str !== 'string') return str
+    str = encodeURI(str)
+    str = str.replaceAll('?','%3F')
+    str = str.replaceAll('=','%3D')
+    str = str.replaceAll('&','%26')
+
+    return str
+}
+//%253D%25team
+
 /**
  * default set of prefixes that will be used for URL compression
  * @type {object}

lib/viewer/woqlRule.js

@@ -121,12 +121,26 @@ WOQLRule.prototype.matchCell = function(rules, row, key, rownum, action) {
     return matches
 }
 
-WOQLRule.prototype.matchColumn = function(rules, key, action) {
-    var matches = []
+/**
+ * 
+ * @param {array} rules 
+ * @param {string} key - column name 
+ * @param {string} ruleName - the rule name like header, width etc... 
+ * @returns {array}
+ */
+WOQLRule.prototype.matchColumn = function(rules, key, ruleName) {
+    const matches = []
     for (var i = 0; i < rules.length; i++) {
-        if (action && this.rule && typeof this.rule[action] == 'undefined') continue
-        if (rules[i].pattern.matchColumn(key)) {
-            matches.push(rules[i])
+        if (ruleName && this.rule && typeof this.rule[ruleName] == undefined) continue
+        const ruleRow = rules[i]
+        /*
+        * if it is not the rule that I'm looking for
+        */
+        if(ruleName && ruleRow.rule[ruleName] === undefined){
+             continue
+        }
+        if(ruleRow.pattern.matchColumn(key)) {
+            matches.push(ruleRow)
         }
     }
     return matches

lib/viewer/woqlTable.js

@@ -129,16 +129,17 @@ WOQLTable.prototype.getColumnsToRender = function() {
 
 WOQLTable.prototype.getColumnHeaderContents = function(colid) {
     colid = UTILS.removeNamespaceFromVariable(colid)
-    let hr = new WOQLRule().matchColumn(this.config.rules, colid, 'header')
-    if (hr && hr.length) {
-        let h = hr[hr.length - 1].rule.header
-        if (typeof h == 'string') {
-            return h // document.createTextNode(h);
-        } else if (typeof h == 'function') {
-            return h(colid)
-        } else return h
+    let rules = new WOQLRule().matchColumn(this.config.rules, colid, 'header')
+    //hr is an array header in not always the last item
+    if (rules.length) {
+        const header = rules[rules.length -1].rule ? rules[rules.length -1].rule.header : null
+        if (typeof header  === 'string') {
+            return header
+        } else if (typeof header === 'function') {
+            return header(colid)
+        } else return header
     }
-    if(colid[0] == "_") return " "
+    if(colid[0] === "_") return " "
     return UTILS.labelFromVariable(colid)
     //return document.createTextNode(clab);
 }