corebasic 1.0.101 → 1.0.103

package/libs/features.js

@@ -39,7 +39,7 @@ let appId = Utils.uid()
 let SERVICE_ADDRESS = process.env.APP_ENDPOINT || 'http://127.0.0.1:3000'
 
 
-export const send = async (feature, params, payload, headers) => {
+export const send = async (meta, feature, data, params) => {
     const throwError = () => {throw {message: `Feature ${feature} not found in internal or external list during inter feature call`}}
     let {api, service = SERVICE_ADDRESS} = getFeature(feature) ?? SLYP_FEATURES_LIST[feature] ?? throwError()
     let method = getFeatureMethod(api)
@@ -52,10 +52,10 @@ export const send = async (feature, params, payload, headers) => {
             throw {feature, when: 'api/params/substitution', message: "Internal Feature Call" }
     }
 
-    payload = { ...payload, feature, txn: Utils.uid() }
+    let payload = { ...meta, data, feature, txn: Utils.uid() }
 
     // return  (await axios[method](`${service}${url}`, { data: payload, headers: {jwt: headers.jwt}, timeout: 1000 })).data
-    return  (await axios[method](`${service}${url}`, { data: payload, headers: {jwt: SERVICE_ACCESS_TOKEN, service: true}, timeout: 1000 })).data
+    return  (await axios[method](`${service}${url}`, payload, {headers: {jwt: SERVICE_ACCESS_TOKEN, service: true}, timeout: 1000 })).data
 }
 
 let appids = {}
@@ -123,6 +123,8 @@ export const start = async (app, url, file) => {
                     if (!req.params[param])
                         throw { status: 404, message: "Resource not found. One or more url parameter not specified." }
 
+                let meta = {...req.body, data: undefined}
+                req.meta = meta
 
                 if (method === "get") {
                     try {
@@ -201,10 +203,11 @@ export const start = async (app, url, file) => {
 
 function prepareMessage(req) {
     let txn = req.body.txn ?? Utils.uid()
-    let _id = req.body.data._id ?? txn
-    let {data, feature, app, user, client, version} = req.body
+    let _id = req.body.data?._id ?? txn
+    let {data, feature, app, user, outlet, company, client, version} = req.body
+    let meta = req.meta
     let params = req.params
-    return { data, params, feature, app, user, client, version, txn, id: _id, date: new Date().getTime() }
+    return { data, params, meta, feature, app, user, outlet, company, client, version, txn, id: _id, date: new Date().getTime() }
 }
 const commandAction = async (req, res, topic) => {
     let message = prepareMessage(req)

package/libs/messaging.js

@@ -74,8 +74,13 @@ export async function start(app) {
 
 
 export async function publish(channel, message) {
-    if (publisher)
-        await publisher.publish(channel, typeof message === "object" ? JSON.stringify(message) : message);
+    if (publisher && !Utils.isEmpty(channel)) {
+        try {
+            await publisher.publish(channel, typeof message === "object" ? JSON.stringify(message) : message)
+        } catch {
+            console.log('Error: Publishing on redis channel', channel)
+        }
+    }
 }
 
 

package/libs/privileges.js

@@ -0,0 +1,91 @@
+
+
+import * as Dip from './dip.js'
+
+
+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" },
+    //     },
+    // }
+}
+
+
+export const get = async (company) => {
+    PRIVILEGES_CACHE[company] = {}
+    let privileges = await Dip.query("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 companies = await Dip.query("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
+}
+
+
+
+
+
+
+export const getAllowedFeatures = (company, roles) => {
+    return [...new Set(rolesToFeatures(company, roles))]
+}
+
+export const check = async (company, user, feature) => {
+    let roles = await getRoles(company, user)
+    return roles.includes(feature)
+}
+
+export const checkRequest = async (req) => {
+    return await check(req.body.company, req.body.user, req.body.feature)
+}
+
+
+
+
+const getRoles = async (company, user) => {
+    let staff = (await Dip.query("staff", { user: user }))[0]
+    let roles = (await Dip.query("privileges.staff", { _id: staff._id }))[0].items.map(item => item._id)
+    return getAllowedFeatures(company, roles)
+}
+
+
+
+
+

package/libs/session.js

@@ -1,4 +1,5 @@
 import jwt from 'jsonwebtoken'
+import * as Privilege from './privileges.js'
 let app
 
 
@@ -15,8 +16,9 @@ export const start = (expressApp, allowedUrls) => {
     urlsAllowed = ["/refreshToken", "/login"].concat(allowedUrls ?? [])
     app = expressApp
 
+    Privilege.start()
 
-    app.use((req, res, next) => {
+    app.use(async (req, res, next) => {
 
         // return next()    // Disable session
 
@@ -28,7 +30,7 @@ export const start = (expressApp, allowedUrls) => {
             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))
+            else if (jwt.verify(token, ACCESS_TOKEN_SECRET) && (process.env.GRANT_FULL_ACCESS || await Privilege.checkRequest(req)))
                 return next()
             throw null;
         } catch (error) {

package/package.json

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