diff --git a/package-lock.json b/package-lock.json index c68b8bd..f3002e4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "treetracker", - "version": "1.2.0", + "version": "1.4.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "treetracker", - "version": "1.2.0", + "version": "1.4.2", "license": "GPL-3.0-or-later", "dependencies": { "@fast-csv/format": "^4.3.5", @@ -21,6 +21,7 @@ "express-async-handler": "^1.1.4", "express-validator": "^6.4.0", "joi": "^17.4.2", + "jwt-decode": "^3.1.2", "knex": "^0.95.11", "loglevel": "^1.6.8", "multer": "^1.4.3", @@ -4293,6 +4294,11 @@ "integrity": "sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg==", "dev": true }, + "node_modules/jwt-decode": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.2.tgz", + "integrity": "sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A==" + }, "node_modules/keyv": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz", @@ -10910,6 +10916,11 @@ "integrity": "sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg==", "dev": true }, + "jwt-decode": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.2.tgz", + "integrity": "sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A==" + }, "keyv": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz", diff --git a/package.json b/package.json index 53339e7..4dbc80d 100644 --- a/package.json +++ b/package.json @@ -43,6 +43,7 @@ "express-async-handler": "^1.1.4", "express-validator": "^6.4.0", "joi": "^17.4.2", + "jwt-decode": "^3.1.2", "knex": "^0.95.11", "loglevel": "^1.6.8", "multer": "^1.4.3", diff --git a/server/handlers/earningsHandler.js b/server/handlers/earningsHandler.js index 5e1f29a..bc11372 100644 --- a/server/handlers/earningsHandler.js +++ b/server/handlers/earningsHandler.js @@ -1,4 +1,5 @@ const Joi = require('joi'); +const jwt_decode = require('jwt-decode'); const csv = require('csvtojson'); const fs = require('fs'); const { v4: uuid } = require('uuid'); @@ -126,6 +127,8 @@ const earningsBatchPatch = async (req, res, next) => { const batchUpdateEarnings = (batch_id) => { let count = 0; + const authorizationHeader = req.get('authorization'); + const adminPanelUser = jwt_decode(authorizationHeader); return new Promise((resolve, reject) => { csv() .fromStream(csvReadStream) @@ -137,6 +140,8 @@ const earningsBatchPatch = async (req, res, next) => { await updateEarnings(earningsRepo, { ...json, batch_id, + payment_confirmation_method: 'batch', + payment_confirmed_by: adminPanelUser?.id, }); count++; },