Skip to content

Update feedType to feedToken Correct Name PLUS + Public IP to non-vulnerable version #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hsk11 wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Update feedType to feedToken Correct Name PLUS + Public IP to non-vulnerable version #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b364e2d
Update package.json Axios & Public IP
hsk11 Apr 27, 2024
c69fddf
Update Public IP plugin
hsk11 Apr 27, 2024
0cd0e8d
Update feedType to feedToken Correct Name:
hsk11 Apr 27, 2024
2f49dcb
Type Bug Fix : token_data.data => response.data
hsk11 Apr 27, 2024
8bb7b3c
Reverting back Axios
hsk11 Apr 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions lib/smartapi-connect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,14 @@
let axios = require('axios');
let querystring = require('querystring');
let address = require('address');
let publicIp = require('public-ip');
const https = require('https');
let { API } = require('../config/api');
const { errorLogger } = require('./winston_log');
const publicIp = {}
process.nextTick(async () => {
const object = await import('public-ip');
Object.assign(publicIp, object);
});
/**
* @constructor
* @name SmartApi
Expand Down Expand Up @@ -45,7 +49,7 @@ var SmartApi = function (params) {
});

(async () => {
self.public_ip = await publicIp.v4();
self.public_ip = await publicIp.publicIpv4();
})();

var requestInstance = axios.create({
Expand Down Expand Up @@ -226,7 +230,7 @@ var SmartApi = function (params) {
token_data.then((response) => {
if (response.status) {
self.setAccessToken(response.data.jwtToken);
self.setPublicToken(token_data.data.refreshToken);
self.setPublicToken(response.data.refreshToken);
}
});

Expand Down
4 changes: 2 additions & 2 deletions lib/websocket2.0.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ let triggers = {

let WebSocketV2 = function (params) {
try {
let { clientcode, jwttoken, apikey, feedtype } = params;
let { clientcode, jwttoken, apikey, feedtype, feedtoken } = params;
let self = this;
let ws = null;
let headers = {
'x-client-code': clientcode,
Authorization: jwttoken,
'x-api-key': apikey,
'x-feed-token': feedtype,
'x-feed-token': feedtype || feedtoken, // MAKE SURE BACKWARD COMPATIBILITY IS THERE
};
const url = CONSTANTS?.websocketURL;
let ping_Interval = CONSTANTS?.Interval;
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"nyc": "^15.1.0",
"pako": "^2.1.0",
"proxyquire": "^2.1.3",
"public-ip": "^4.0.2",
"public-ip": "^6.0.2",
"querystring": "^0.2.0",
"sinon": "^17.0.1",
"winston": "^3.11.0",
Expand Down