Skip to content

Commit

Permalink
ver++
Browse files Browse the repository at this point in the history
  • Loading branch information
7-of-9 committed Dec 24, 2020
1 parent 840ba09 commit f29088a
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "scpx-svr",
"version": "0.5.5",
"version": "0.9",
"author": "Dominic Morris",
"license": "MS-RSL",
"private": false,
Expand Down
2 changes: 1 addition & 1 deletion readme.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Scoop API Server
Release Candidate 5
v0.9

RESTful node.js Express web server for the [Scoop Wallet](https://github.com/Scoop-Tech/scpx-wallet).

Expand Down
12 changes: 6 additions & 6 deletions scp_eos.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,9 @@ module.exports = {
if (!h_email || h_email === undefined || h_email.length !== 32) { // validate email hash -- expecting MD5 32 hex chars (128 bits)
res.status(400).send( { msg: "bad h_email" } ); return;
}
const h_email_ui128 = new BigNumber(h_email, 16).toFixed()
const h_email_ui128 = new BigNumber(h_email, 16).toFixed();

var scp_ac_pubkey = req.body.pubkey;
//var scp_ac_pubkey = req.body.pubkey;
var Eos_ecc = require('eosjs-ecc');
if (!Eos_ecc.isValidPublic(publicKeys.owner) || !Eos_ecc.isValidPublic(publicKeys.active)) { // validate pubkey
res.status(400).send( { msg: "bad pubkey" } ); return;
Expand Down Expand Up @@ -141,7 +141,7 @@ module.exports = {
})
.catch(err2 => {
console.log(err2);
isCatch = true
isCatch = true;
try {
console.error("## new_account ERR 2 (" + JSON.stringify(err2) + ") (exec tx) [catch object doesn't propagate reliably?]");
const json_err = JSON.parse(err2)
Expand Down Expand Up @@ -222,9 +222,9 @@ module.exports = {
const dec_e_email = enc.aesDecryption(CryptoJS.MD5(user.owner).toString(), config.get("api_enc_key_1"), user.e_email);
const dec_assets_json = enc.aesDecryption(CryptoJS.MD5(e_email + user.owner).toString(), config.get("api_enc_key_2"), user.assets_json);
const dec_data_json = enc.aesDecryption(CryptoJS.MD5(e_email).toString(), config.get("api_enc_key_3"), user.data_json);
user.e_email = dec_e_email
user.assets_json = dec_assets_json
user.data_json = dec_data_json
user.e_email = dec_e_email;
user.assets_json = dec_assets_json;
user.data_json = dec_data_json;

// authentication
if (user.e_email !== e_email) { // email mismatch?
Expand Down

0 comments on commit f29088a

Please sign in to comment.