corebasic 1.0.10 → 1.0.12

package/libs/app.js

@@ -4,10 +4,12 @@ let Elabase = require('./elabase')
 let Kafka = require('./kafka')
 let Utils = require('./utils')
 let Session = require('./session')
+let Auth = require('./auth')
 
 module.exports = {
     Elabase,
     Kafka,
     Utils,
-    Session
+    Session,
+    Auth
 }

package/libs/auth.js

@@ -0,0 +1,92 @@
+const axios = require('axios');
+const otpGenerator = require('otp-generator')
+
+const Elabase = require('./elabase')
+const Utils = require('./utils')
+const Session = require('./session')
+
+let validateFn, validateErrMessage
+export function validate(callback, errMessage){
+    validateFn = callback
+}
+
+export function start(app, successCallback) {
+    app.post("/login", async (req, res) => {
+        if (validateFn && !validateFn(req)) {
+            res.json({mode: 'login', success: false, msg: validateErrMessage ?? 'Validation Failed'})
+            return
+        }
+
+        let login = await auth.login(req, res)
+        if (login.mode === 'verify' && login.success) {
+            // let userId = "GET_LOGGED_IN_USER_ID" // login contains userId
+            let tokens = Session.generateAccessToken(login.userId, req.body.clientId)
+            let response = {tokens, ...login}
+            if (successCallback)
+                await successCallback(req, res, response)
+            else
+                res.json(response)
+        }
+        res.json(login)
+    })
+}
+
+
+async function login(req, res) {
+    let phone = req.body.phone
+    let time = new Date().getTime()
+    let collection = (req.body.app ? req.body.app + '.' : '') + "auth.login"
+    if (req.body.otp) { // verify login
+        try {
+            let res = await Elabase.query(collection, { _id: phone.trim(), otp: req.body.otp, time: { $gt: time - 300000 } })
+            if (res.length)
+                return {mode: 'verify', success: true, userId: res[0].userId}
+            throw false
+        } catch {
+            return {mode: 'verify', success: false}
+        }
+        
+    } else {            // generate login
+        try {
+            let otp = otpGenerator.generate(4, { upperCaseAlphabets: false, specialChars: false, digital: true, lowerCaseAlphabets: false });
+            if (await sendOtp(phone, otp)) {
+                let userId = req.body.userId ?? Utils.uid()
+                await Elabase.update(collection, { _id: phone.trim() }, { $set: { otp, time }, $setOnInsert: { _id: phone.trim(), otp, time, userId } }, { upsert: true })
+                return {mode: 'login', success: true, userId}
+            }
+            throw false
+        } catch {
+            return {mode: 'login', success: false}
+        }
+    }
+}
+
+
+async function sendOtp(phone, otp) {
+    try {
+        let link = process.env.SMS_API + phone + "/" + otp
+        await axios.get(link)
+        return true
+    } catch {
+        return false
+    }
+}
+
+
+
+// API
+// ----
+// Login =>  HttpRequest.post('/login').send({app: '', clientId: '', phone: '', otp: '', userId: 'on signup'}) // Response => { mode: 'login', success, userId }
+// Verify => HttpRequest.post('/login').send({app: '', clientId: '', phone: '', otp: ''})                      // Response => { mode: 'verify', success, userId }
+
+// Usage
+// Auth.validate((req) => ["Phone1", "Phone2"].includes(req.body.phone.trim()))
+// Auth.start(app, async (req, res, data) => { 
+//     try {
+//         await Elabase.insert("users", {  }, "asdsds")
+//         await Kafka.send("users", {event: "userLogin", ...data, time: Utils.now()})
+//         res.json(data)
+//     } catch {
+//         res.json({...data, success: false})
+//     }
+// })

package/libs/kafka.js

@@ -46,13 +46,17 @@ const start_consumer = async function (topic, groupId, callback) {
     await consumer.subscribe({ topic: topic, fromBeginning: true })
 
     await consumer.run({
+        autoCommit: false,
         eachMessage: async ({ topic, partition, message }) => {
             // callback(topic, message.value.toString(), partition) // toString() returns array so won't parse if json.
+            let success
             try {
-                callback(topic, JSON.parse(message.value), partition)
+                success = callback(topic, JSON.parse(message.value), partition)
             } catch (ex) {
-                callback(topic, message.value, partition)
+                success = callback(topic, message.value, partition)
             }
+
+            await consumer.commitOffsets([{ topic, partition, offset: (Number(message.offset) + 1).toString() }]);
         },
     })
 }

package/libs/session.js

@@ -14,7 +14,7 @@ const REFRESH_TOKEN_SECRET = process.env.JWT_REFRESH_TOKEN_SECRET || "MY_SECRET_
 let urlsAllowed = []
 
 function start(expressApp, allowedUrls) {
-    urlsAllowed = ["/refreshToken"].concat(allowedUrls)
+    urlsAllowed = ["/refreshToken", "/login"].concat(allowedUrls ?? [])
     app = expressApp
 
 

package/package.json

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