@rpcbase/client 0.153.0 → 0.154.0

package/get_object_id.js

@@ -3,7 +3,7 @@ import assert from "assert"
 
 import isHexadecimal from "validator/lib/isHexadecimal"
 
-import {TENANT_PREFIX} from "env"
+import {RB_TENANT_ID} from "env"
 
 
 const get_random_bytes = (n) => {
@@ -13,11 +13,11 @@ const get_random_bytes = (n) => {
 }
 
 // Validation: is defined
-assert(TENANT_PREFIX, "expected TENANT_PREFIX to be defined")
+assert(RB_TENANT_ID, "expected RB_TENANT_ID to be defined")
 // is hexadecimal
-assert(isHexadecimal(TENANT_PREFIX), "expected TENANT_PREFIX to be a hexadecimal")
+assert(isHexadecimal(RB_TENANT_ID), "expected RB_TENANT_ID to be a hexadecimal")
 // is 4 bytes
-assert(TENANT_PREFIX.length === 8, "TENANT_PREFIX must be exactly bytes long ie: 8 hex chars")
+assert(RB_TENANT_ID.length === 8, "RB_TENANT_ID must be exactly bytes long ie: 8 hex chars")
 
 // generates a 12 bytes mongodb object id using the org id prefix or custom customer id
 const get_object_id = () => {
@@ -27,7 +27,7 @@ const get_object_id = () => {
   const random_bytes = get_random_bytes(4)
   const random_hex = Buffer.from(random_bytes).toString("hex")
 
-  const obj_id = `${ts_bytes}${TENANT_PREFIX}${random_hex}`
+  const obj_id = `${ts_bytes}${RB_TENANT_ID}${random_hex}`
   return obj_id
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/client",
-  "version": "0.153.0",
+  "version": "0.154.0",
   "scripts": {
     "test": "../../node_modules/.bin/wireit"
   },

package/rts/store/get_collection.js

@@ -4,11 +4,11 @@ import PouchDB from "pouchdb-core"
 import IndexedDBAdapter from "pouchdb-adapter-indexeddb"
 import FindPlugin from "pouchdb-find"
 
-import {TENANT_PREFIX, RB_APP_NAME} from "env"
+import {RB_TENANT_ID, RB_APP_NAME} from "env"
 
 const log = debug("rb:rts:store")
 
-let prefix = `rb/${TENANT_PREFIX}/`
+let prefix = `rb/${RB_TENANT_ID}/`
 
 if (RB_APP_NAME) prefix += `${RB_APP_NAME}/`
 

package/rts/store/index.js

@@ -43,7 +43,7 @@ const run_query = async({model_name, query, query_key, options}, callback) => {
   // console.log("run_query", {model_name, query, query_key, options})
   // console.time("store run_query")
 
-  // TODO: we should prefix model_name with tenant_prefix + env_id
+  // TODO: we should prefix model_name with RB_TENANT_ID + env_id
   const collection = get_collection(model_name)
 
   const replaced_query = replace_query_keys(query, (k) => (k.startsWith("_") && k !== "_id") ? `${UNDERSCORE_PREFIX}${k}` : k)