corebasic 1.0.261 → 1.0.263

package/dist/libs/auth.js

@@ -42,7 +42,7 @@ const Apps = {
     Portal: "Portal"
 };
 async function attemptLogin(req) {
-    let meta = { company: "GLOBAL", outlet: "GLOBAL" };
+    const globalMeta = Dip.globalMeta({ suffix: req.body.app });
     let errMessage = { success: false, message: "Login Server Error" };
     if (!req.body?.app || !Apps[req.body.app])
         throw { ...errMessage, mode: 'verify', info: "Invalid app" };
@@ -51,16 +51,15 @@ async function attemptLogin(req) {
     const code = req.body.code ?? '';
     let mob = userMob.endsWith('123456789') ? '0123456789' : Utils.parseMob(userMob, code);
     let time = new Date().getTime();
-    const collection = `${req.body.app}.auth.login`;
     let otpValid = Utils.isEmpty(req.body.otp) ? false : true;
     let clientId = req.body.clientId;
     if (Utils.isEmpty(clientId))
         throw { ...errMessage, mode: otpValid ? 'verify' : 'login', info: "Invalid Client ID" };
     if (otpValid) { // verify login
-        let res = await Dip.query(meta, collection, { _id: mob, otp: req.body.otp, clientId, time: { $gt: time - expiry } });
+        let res = await Dip.query(globalMeta, "auths", { _id: mob, otp: req.body.otp, clientId, time: { $gt: time - expiry } });
         if (res.length) {
             try {
-                await Dip.update(meta, collection, { _id: mob }, { $set: { otp: '', clientId: '', loggedIn: true } });
+                await Dip.update(globalMeta, "auths", { _id: mob }, { $set: { otp: '', clientId: '', loggedIn: true } });
             }
             catch (err) {
                 throw { ...errMessage, mode: 'verify', info: 'Cleanup Failed' };
@@ -76,7 +75,7 @@ async function attemptLogin(req) {
             let now = Utils.now().getTime();
             let data = req.body.data ?? {};
             let info = { clientId, created: now, updated: now, ...data };
-            await Dip.update(meta, collection, { _id: mob }, { $set: { otp, clientId, time, updated: now, attemptLogin: true }, $setOnInsert: { _id: mob, otp, time, userId, ...info } }, { upsert: true });
+            await Dip.update(globalMeta, "auths", { _id: mob }, { $set: { otp, clientId, time, updated: now, attemptLogin: true }, $setOnInsert: { _id: mob, otp, time, userId, ...info } }, { upsert: true });
             return { mode: 'login', success: true, userId, expiry, phone: mob, mob, code };
         }
         throw { ...errMessage, mode: 'login', info: 'Generating Info Failed' };

package/dist/libs/features.js

@@ -182,9 +182,9 @@ const apiHandler = async (req, res) => {
             meta.outlet = 'DEFAULT_OUTLET';
         }
         meta.txn = meta.txn ?? Utils.uid();
-        function buildQuery(key, id) {
-            key = key ? key : "_id";
-            const array_paths = key.split(".$.");
+        function buildQuery(opt, id) {
+            opt = opt ? opt : "_id";
+            const array_paths = opt.split(".$.");
             const last_path = array_paths.pop();
             const query = {};
             let obj = query;
@@ -204,7 +204,7 @@ const apiHandler = async (req, res) => {
             meta,
             data: req.body.data,
             params: featureless ? req.params : req.body.params,
-            query: req.body.params?.key && (feature.key)?.includes(req.body.params?.key) ? buildQuery(req.body.params?.key ?? "_id", req.body.params?.id) : req.body.params?.id ? { _id: req.body.params?.id } : undefined,
+            query: req.body.params?.opt && (feature.opt)?.includes(req.body.params?.opt) ? buildQuery(req.body.params?.opt ?? "_id", req.body.params?.id) : req.body.params?.id ? { _id: req.body.params?.id } : undefined,
             update: req.body.params?.mut && (feature.mut)?.includes(req.body.params?.mut) ? { $set: { [req.body.params.mut]: req.body.data[req.body.params.mut], ...Dip.updateKeys({ meta }) } } : undefined,
         };
         const appReq = {

package/libs/auth.ts

@@ -97,32 +97,30 @@ type Auth = {
     loggedIn?: boolean
 }
 declare global {
-    interface Schema extends Record<`${keyof typeof Apps}.auth.login`, Auth> {}
+    interface Schema extends Record<"auths", Auth> {}
 }
 
 async function attemptLogin(req: AuthRequest) {
-    let meta = {company: "GLOBAL", outlet: "GLOBAL"}
+    const globalMeta = Dip.globalMeta({suffix: req.body.app})
     let errMessage = {success: false, message: "Login Server Error"}
 
     if (!req.body?.app || !Apps[req.body.app as keyof typeof Apps])
         throw {...errMessage, mode: 'verify', info: "Invalid app"}
 
-
     let expiry = 300000
     let userMob = req.body.mob ?? req.body.phone ?? ''
     const code = req.body.code ?? ''
     let mob = userMob.endsWith('123456789') ? '0123456789' : Utils.parseMob(userMob, code)
     let time = new Date().getTime()
-    const collection = `${req.body.app}.auth.login` as `${keyof typeof Apps}.auth.login`;
     let otpValid = Utils.isEmpty(req.body.otp) ? false : true
     let clientId = req.body.clientId
     if (Utils.isEmpty(clientId))
         throw { ...errMessage, mode: otpValid ? 'verify' : 'login', info: "Invalid Client ID" }
 
     if (otpValid) { // verify login
-        let res = await Dip.query(meta, collection, { _id: mob, otp: req.body.otp, clientId, time: { $gt: time - expiry } })
+        let res = await Dip.query(globalMeta, "auths", { _id: mob, otp: req.body.otp, clientId, time: { $gt: time - expiry } })
         if (res.length) {
-            try {await Dip.update(meta, collection, { _id: mob }, { $set: { otp: '', clientId: '', loggedIn: true } }) } catch (err) { throw {...errMessage, mode: 'verify', info: 'Cleanup Failed'} }
+            try {await Dip.update(globalMeta, "auths", { _id: mob }, { $set: { otp: '', clientId: '', loggedIn: true } }) } catch (err) { throw {...errMessage, mode: 'verify', info: 'Cleanup Failed'} }
             return {...res[0], mode: 'verify', success: true, userId: res[0]!.userId!, phone: res[0]!._id, mob: res[0]!._id, code}
         }
         throw {...errMessage, mode: 'verify', info: "Invalid/Expired OTP"}
@@ -133,7 +131,7 @@ async function attemptLogin(req: AuthRequest) {
             let now = Utils.now().getTime()
             let data = req.body.data ?? {}
             let info = { clientId, created: now, updated: now, ...data}
-            await Dip.update(meta, collection, { _id: mob }, { $set: { otp, clientId, time, updated: now, attemptLogin: true }, $setOnInsert: { _id: mob, otp, time, userId, ...info } }, { upsert: true })
+            await Dip.update(globalMeta, "auths", { _id: mob }, { $set: { otp, clientId, time, updated: now, attemptLogin: true }, $setOnInsert: { _id: mob, otp, time, userId, ...info } }, { upsert: true })
 
             return {mode: 'login', success: true, userId, expiry, phone: mob, mob, code}
         }

package/libs/features.ts

@@ -145,7 +145,7 @@ type RemoteFeatureEntry = {
     headers?: {JWT?: string, service?: boolean, NDCURVE_DEVELOPER_LICENSE_ACCESS_TOKEN?: string}
 }
 
-type FeatureEntry = { api: string, topic: string, bypass: boolean, featureless: boolean, subscribe: string, handler: Handler<unknown, unknown, keyof Schema>, key?: string[], mut?: string[] }
+type FeatureEntry = { api: string, topic: string, bypass: boolean, featureless: boolean, subscribe: string, handler: Handler<unknown, unknown, keyof Schema>, opt?: string[], mut?: string[] }
 
 
 let features: Record<string, FeatureEntry> = {}
@@ -312,9 +312,9 @@ const apiHandler = async (req: ExpressRequest, res: ExpressResponse) => {
         meta.txn = meta.txn ?? Utils.uid()
 
 
-        function buildQuery(key: string, id: unknown): unknown {
-            key = key ? key : "_id"
-            const array_paths = key.split(".$.")
+        function buildQuery(opt: string, id: unknown): unknown {
+            opt = opt ? opt : "_id"
+            const array_paths = opt.split(".$.")
             const last_path = array_paths.pop()
             const query: Record<string, unknown> = {}
             let obj = query
@@ -336,7 +336,7 @@ const apiHandler = async (req: ExpressRequest, res: ExpressResponse) => {
             meta,
             data: req.body.data,
             params: featureless ? req.params : req.body.params!,
-            query: req.body.params?.key && (feature.key!)?.includes(req.body.params?.key as string) ? buildQuery(req.body.params?.key ?? "_id", req.body.params?.id) : req.body.params?.id ? {_id: req.body.params?.id} : undefined,
+            query: req.body.params?.opt && (feature.opt!)?.includes(req.body.params?.opt as string) ? buildQuery(req.body.params?.opt ?? "_id", req.body.params?.id) : req.body.params?.id ? {_id: req.body.params?.id} : undefined,
             update: req.body.params?.mut && (feature.mut!)?.includes(req.body.params?.mut as string) ? { $set: { [req.body.params!.mut]: (req.body.data as Record<string, unknown>)[req.body.params!.mut], ...Dip.updateKeys({meta}) } } : undefined,
 
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "corebasic",
   "type": "module",
-  "version": "1.0.261",
+  "version": "1.0.263",
   "description": "",
   "main": "dist/index.js",
   "types": "./index.ts",