corebasic 1.0.150 → 1.0.152

package/libs/elabase.js

@@ -84,6 +84,7 @@ export function transactionCommit(arg) {
 }
 
 export const insert = async (meta, collection, value, _id) => {
+    if (typeof collection !== "string") throw {message: "Error: collection type is not string in Dip.insert()"}
     // Multi Company Support
     if (Utils.isEmpty(meta?.company)) throw {message: "Error: meta argument not provided in Dip.insert()"}
     collection = `${meta.company}.${collection}`
@@ -123,6 +124,7 @@ export const insert = async (meta, collection, value, _id) => {
 }
 
 export const query = async (meta, collection, query, options) => {
+    if (typeof collection !== "string") throw {message: "Error: collection type is not string in Dip.query()"}
     if (meta?.USE_EMPTY_COMPANY) {
 
     } else {
@@ -172,6 +174,7 @@ function collectionArray(col) {
 export const update = async (meta, collection, query, update, options) => {
     // Multi Company Support
     if (Utils.isEmpty(meta?.company)) throw {message: "Error: meta argument not provided in Dip.update()"}
+    if (typeof collection !== "string") throw {message: "Error: collection type is not string in Dip.update()"}
     collection = `${meta.company}.${collection}`
     if (meta.company !== "GLOBAL") {
         query.company = meta.company
@@ -215,6 +218,7 @@ export const update = async (meta, collection, query, update, options) => {
 export const remove = async (meta, collection, query) => {
     // Multi Company Support
     if (Utils.isEmpty(meta?.company)) throw {message: "Error: meta argument not provided in Dip.remove()"}
+    if (typeof collection !== "string") throw {message: "Error: collection type is not string in Dip.remove()"}
     collection = `${meta.company}.${collection}`
     if (meta.company !== "GLOBAL")
         query.company = meta.company

package/libs/session.js

@@ -1,6 +1,6 @@
 import jwt from 'jsonwebtoken'
-import * as Privilege from './privileges.js'
 import * as Utils from './utils.js'
+import * as Features from './features.js'
 let app
 
 
@@ -17,7 +17,6 @@ export const start = (expressApp, allowedUrls) => {
     urlsAllowed = ["/refreshToken", "/login"].concat(allowedUrls ?? [])
     app = expressApp
 
-    Privilege.start()
 
     app.use(async (req, res, next) => {
 
@@ -28,12 +27,14 @@ export const start = (expressApp, allowedUrls) => {
         if (urlsAllowed.includes(req.path))
             return next()
 
+        const checkPrivilege = async req => (await Features.send({company: req.body.company, outlet: req.body.outlet}, "privileges.query.check", {feature: req.body.feature }, {id: req.body.staff})).data.granted
+
         try {
             const token = req.header('JWT');    //  'Authorization' for Spring Boot, 'x-access-token' for Node.js Express back-end
             const service = req.header('SERVICE');  // Case insensitive search
             if (service && jwt.verify(token, DEPLOY_TOKEN_SECRET))
                 return next()
-            else if (jwt.verify(token, ACCESS_TOKEN_SECRET) && (process.env.GRANT_FULL_ACCESS || allowedDefaults || await Privilege.checkRequest(req)))
+            else if (jwt.verify(token, ACCESS_TOKEN_SECRET) && (process.env.GRANT_FULL_ACCESS || allowedDefaults || await checkPrivilege(req)))
                 return next()
             throw null;
         } catch (error) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "corebasic",
   "type": "module",
-  "version": "1.0.150",
+  "version": "1.0.152",
   "description": "",
   "main": "index.js",
   "scripts": {

package/libs/privileges.js

@@ -1,104 +0,0 @@
-
-
-import * as Dip from './dip.js'
-
-let DIP_URL = process.env.PRIVELEGE_DIP_URL
-let DIP_DB = process.env.PRIVELEGE_DIP_DB
-
-let PRIVILEGES_CACHE = {
-
-    // "<company>": {
-    //     "Sales Man": {
-    //         "products.query.list": { type: "Feature"  }
-    //     },
-    //     "Accountant": {
-    //         "Sales Man": { type: "Role" },
-    //         "accounts.query.list": { type: "Feature" },
-    //     },
-    //     "Cashier": {
-    //         "Sales Man": { type: "Role" },
-    //         "cash.query.list": { type: "Feature" },
-    //     },
-    // }
-}
-
-
-const get = async (company) => {
-    PRIVILEGES_CACHE[company] = {}
-    let meta = {company, outlet: "GLOBAL", DIP_URL, DIP_DB}
-    let privileges = await Dip.query(meta, "privileges", { })
-    privileges.forEach(privilege => PRIVILEGES_CACHE[company][privilege.name] = privilege)
-
-    // Format
-    for (let role in PRIVILEGES_CACHE[company])
-        PRIVILEGES_CACHE[company][role] = PRIVILEGES_CACHE[company][role].items.reduce( (obj, item) =>   ({...obj, [item.name]: {type: item.type} }), {})
-
-    return PRIVILEGES_CACHE[company]
-}
-
-export const start = async () => {
-    let meta = {company: "GLOBAL", outlet: "GLOBAL", DIP_URL, DIP_DB}
-    let companies = await Dip.query(meta, "companies", { })
-    for (let company of companies)
-         await get(company._id)
-}
-
-
-function rolesToFeatures(company, roles) {
-    let features = []
-
-    let privileges = PRIVILEGES_CACHE[company]
-
-    roles.forEach(role => {
-        for (let key in privileges[role]) {
-            let isFeature = privileges[role][key].type === "Feature"
-            let isRole = privileges[role][key].type === "Role"
-            if (isFeature)
-                features.push(key)
-            else if (isRole)
-                features.push(...(rolesToFeatures(company, [key])))
-        }
-    })
-    return features
-}
-
-
-
-
-
-
-const getAllowedFeatures = (company, roles) => {
-    return [...new Set(rolesToFeatures(company, roles))]
-}
-
-const check = async (company, user, feature, req) => {
-    let roles = await getRoles(company, user, req)
-    return roles.includes(feature)
-}
-
-export const checkRequest = async (req) => {
-    let meta = {...req.body, data: undefined, DIP_URL, DIP_DB}
-    req.meta = meta
-    if (req.body.feature === 'outlets.query.list') // Starting point for atleast selecting an outlet. (This is a Special Case)
-        return true
-    if (req.body.app === "Slyp")
-        return true
-
-    return await check(req.body.company, req.body.user, req.body.feature, req)
-}
-
-
-
-
-const getRoles = async (company, user, req) => {
-    let staff = (await Dip.query(req.meta, "staff", { user: user }))[0]
-    if (staff?._id === `${company}_DEFAULT`) // Company Creator Admin Access
-        return [req.body.feature]
-    let roles = (await Dip.query(req.meta, "privileges.staff", { _id: staff._id }))[0].items.map(item => item._id)
-    return getAllowedFeatures(company, roles)
-}
-
-
-
-
-