Merge pull request #333 from pqv199x/cookie-store

fix voting and loging in error
BuildOnViction · Nov 26, 2018 · 5f77c39 · 5f77c39
2 parents f0c5900 + 039eb81
commit 5f77c39
Show file tree

Hide file tree

Showing 4 changed files with 104 additions and 104 deletions.
diff --git a/apis/auth.js b/apis/auth.js
@@ -0,0 +1,100 @@
+'use strict'
+const express = require('express')
+const config = require('config')
+const router = express.Router()
+const utils = require('ethereumjs-util')
+const db = require('../models/mongodb')
+
+const uuidv4 = require('uuid/v4')
+
+router.get('/generateLoginQR', async (req, res, next) => {
+    try {
+        const message = '[Tomomaster ' + (new Date().toLocaleString().replace(/['"]+/g, '')) + '] Login'
+        res.send({
+            message,
+            url: `${config.get('baseUrl')}api/auth/verifyLogin?id=`,
+            id: uuidv4()
+        })
+    } catch (e) {
+        next(e)
+    }
+})
+
+router.post('/verifyLogin', async (req, res, next) => {
+    try {
+        const message = req.body.message
+        const signature = req.body.signature
+        const id = req.query.id
+        let signer = req.body.signer
+
+        if (!message || !signature || !id || !signer) {
+            return res.status(406).send('id, message, signature and signer are required')
+        }
+        signer = signer.toLowerCase()
+
+        const signedAddress = ecRecover(message, signature)
+
+        if (signer !== signedAddress) {
+            return res.status(401).send('The Signature Message Verification Failed')
+        }
+
+        // Store id, address, msg, signature
+        let sign = await db.Signature.findOne({ signedAddress: signedAddress })
+        if (sign && id === sign.signedId) {
+            res.status(406).send('Cannot use a QR code twice')
+        } else {
+            const data = {}
+            data.signedId = id
+            data.message = message
+            data.signature = signature
+
+            await db.Signature.findOneAndUpdate({ signedAddress: signedAddress }, data, { upsert: true, new: true })
+        }
+        res.send('Done')
+    } catch (e) {
+        next(e)
+    }
+})
+
+router.post('/getLoginResult', async (req, res, next) => {
+    try {
+        const messId = req.body.messId || ''
+
+        const signature = await db.Signature.findOne({ signedId: messId })
+
+        if (signature) {
+            res.json({
+                user: signature.signedAddress
+            })
+        } else {
+            res.send({
+                error: {
+                    message: 'No data'
+                }
+            })
+        }
+    } catch (e) {
+        console.trace(e)
+        console.log(e)
+        return res.status(500).send()
+    }
+})
+// Get signed address
+function ecRecover (message, signature) {
+    const signatureBuffer = utils.toBuffer(signature)
+    const signatureParams = utils.fromRpcSig(signatureBuffer)
+
+    const m = utils.toBuffer(message)
+    const msgHash = utils.hashPersonalMessage(m)
+
+    const publicKey = utils.ecrecover(
+        msgHash,
+        signatureParams.v,
+        signatureParams.r,
+        signatureParams.s
+    )
+    const addressBuffer = utils.publicToAddress(publicKey)
+    return utils.bufferToHex(addressBuffer)
+}
+
+module.exports = router
diff --git a/apis/config.js b/apis/config.js
@@ -3,10 +3,6 @@ const express = require('express')
 const config = require('config')
 const router = express.Router()
 const web3 = require('../models/blockchain/web3rpc')
-const utils = require('ethereumjs-util')
-const db = require('../models/mongodb')
-
-const uuidv4 = require('uuid/v4')
 
 router.get('/', async function (req, res, next) {
     let appConfig = {}
@@ -22,101 +18,4 @@ router.get('/', async function (req, res, next) {
     return res.json(appConfig)
 })
 
-router.get('/generateLoginQR', async (req, res, next) => {
-    try {
-        const message = '[Tomomaster ' + (new Date().toLocaleString().replace(/['"]+/g, '')) + '] Login'
-        res.send({
-            message,
-            url: `${config.get('baseUrl')}api/config/verifyLogin?id=`,
-            id: uuidv4()
-        })
-    } catch (e) {
-        console.log(e)
-        res.send({
-            error: {
-                message: e
-            }
-        })
-    }
-})
-
-router.post('/verifyLogin', async (req, res, next) => {
-    try {
-        const message = req.body.message
-        const signature = req.body.signature
-        const id = req.query.id
-        let signer = req.body.signer
-
-        if (!message || !signature || !id || !signer) {
-            return res.status(406).send('id, message, signature and signer are required')
-        }
-        signer = signer.toLowerCase()
-
-        const signedAddress = ecRecover(message, signature)
-
-        if (signer !== signedAddress) {
-            return res.status(401).send('The Signature Message Verification Failed')
-        }
-
-        // Store id, address, msg, signature
-        let sign = await db.Signature.findOne({ signedAddress: signedAddress })
-        if (sign && id === sign.signedId) {
-            res.status(406).send('Cannot use a QR code twice')
-        } else {
-            const data = {}
-            data.signedId = id
-            data.message = message
-            data.signature = signature
-
-            await db.Signature.findOneAndUpdate({ signedAddress: signedAddress }, data, { upsert: true, new: true })
-        }
-        res.send('Done')
-    } catch (e) {
-        console.trace(e)
-        console.log(e)
-        return res.status(500).send(e)
-    }
-})
-
-router.post('/getLoginResult', async (req, res, next) => {
-    try {
-        const messId = req.body.messId || ''
-
-        const signature = await db.Signature.findOne({ signedId: messId })
-
-        if (signature) {
-            res.json({
-                user: signature.signedAddress
-            })
-        } else {
-            res.send({
-                error: {
-                    message: 'No data'
-                }
-            })
-        }
-    } catch (e) {
-        console.trace(e)
-        console.log(e)
-        return res.status(500).send()
-    }
-})
-// Get signed address
-function ecRecover (message, signature) {
-    const signatureBuffer = utils.toBuffer(signature)
-    const signatureParams = utils.fromRpcSig(signatureBuffer)
-
-    const m = utils.toBuffer(message)
-    const msgHash = utils.hashPersonalMessage(m)
-
-    const publicKey = utils.ecrecover(
-        msgHash,
-        signatureParams.v,
-        signatureParams.r,
-        signatureParams.s
-    )
-    const addressBuffer = utils.publicToAddress(publicKey)
-    return utils.bufferToHex(addressBuffer)
-}
-
 module.exports = router
diff --git a/app/components/Setting.vue b/app/components/Setting.vue
@@ -278,7 +278,7 @@ export default {
                     }
                 }
 
-                if (store.get('address')) {
+                if (store.get('address') && self.isReady) {
                     account = store.get('address').toLowerCase()
                 } else {
                     account = this.$store.state.walletLoggedIn
@@ -438,7 +438,7 @@ export default {
         },
         async loginByQRCode () {
             // generate qr code
-            const { data } = await axios.get('/api/config/generateLoginQR')
+            const { data } = await axios.get('/api/auth/generateLoginQR')
             this.id = data.id
             this.qrCode = encodeURI(
                 'tomochain:login?message=' + data.message +
@@ -448,7 +448,7 @@ export default {
         },
         async getLoginResult () {
             // calling api every 2 seconds
-            const { data } = await axios.post('/api/config/getLoginResult', { messId: this.id })
+            const { data } = await axios.post('/api/auth/getLoginResult', { messId: this.id })
 
             if (!data.error && data) {
                 this.loading = true

diff --git a/app/components/voters/Voting.vue b/app/components/voters/Voting.vue
@@ -271,6 +271,7 @@ export default {
                 self.loading = true
 
                 let account = await self.getAccount()
+                account = account.toLowerCase()
                 let contract = await self.TomoValidator.deployed()
                 let rs = await contract.vote(self.candidate, {
                     from: account,