corebasic 1.0.27 → 1.0.29

package/libs/auth.js

@@ -13,7 +13,7 @@ module.exports.validate = (callback, errMessage) => {
 module.exports.start = (app, successCallback) => {
     app.post("/login", async (req, res) => {
         if (validateFn && !validateFn(req)) {
-            res.status(401).json({ mode: 'login', success: false, msg: validateErrMessage ?? 'Validation Failed' })
+            res.status(401).json({ mode: 'login', success: false, info: validateErrMessage ?? 'Validation Failed', message: 'Login Server Error' })
             return
         }
         try {
@@ -38,22 +38,30 @@ async function attemptLogin(req, res) {
     let phone = req.body.phone.trim()
     let time = new Date().getTime()
     let collection = (req.body.app ? req.body.app + '.' : '') + "auth.login"
-    if (req.body.otp) { // verify login
-        let res = await Elabase.query(collection, { _id: phone, otp: req.body.otp, time: { $gt: time - expiry } })
-        if (res.length) 
-            return {...res[0], mode: 'verify', success: true, userId: res[0].userId, position: res[0].position, phone: res[0]._id}
-        throw {mode: 'verify', success: false, msg: "Invalid OTP"}
+    let errMessage = {success: false, message: "Login Server Error"}
+    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 Elabase.query(collection, { _id: phone, otp: req.body.otp, clientId, time: { $gt: time - expiry } })
+        if (res.length) {
+            try {await Elabase.update(collection, { _id: phone }, { $set: { otp: '', clientId: '' } }) } catch (err) { throw {...errMessage, mode: 'verify', info: 'Cleanup Failed'} }
+            return {...res[0], mode: 'verify', success: true, userId: res[0].userId, phone: res[0]._id}
+        }
+        throw {...errMessage, mode: 'verify', info: "Invalid/Expired OTP"}
     } else {            // generate login
         let otp = phone === '0123456789' ? '1234' : otpGenerator.generate(4, { upperCaseAlphabets: false, specialChars: false, digital: true, lowerCaseAlphabets: false });
         if (phone === '0123456789' || await sendOtp(phone, otp)) {
             let userId = req.body.userId ?? Utils.uid()
             let now = Utils.now().toISOString()
             let data = req.body.data ?? {}
-            let meta = {createdAt: now, updatedAt: now, pos: req.body.pos ?? undefined, ...data}
-            await Elabase.update(collection, { _id: phone }, { $set: { otp, time, updatedAt: now }, $setOnInsert: { _id: phone, otp, time, userId, ...meta } }, { upsert: true })
+            let meta = { clientId, createdAt: now, updatedAt: now, ...data}
+            await Elabase.update(collection, { _id: phone }, { $set: { otp, clientId, time, updatedAt: now }, $setOnInsert: { _id: phone, otp, time, userId, ...meta } }, { upsert: true })
             return {mode: 'login', success: true, userId, expiry, phone}
         }
-        throw {mode: 'login', success: false, msg: "Login Server Error"}
+        throw {...errMessage, mode: 'login', info: 'Generating Info Failed'}
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "corebasic",
-  "version": "1.0.27",
+  "version": "1.0.29",
   "description": "",
   "main": "index.js",
   "scripts": {