Skip to content
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.

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

Fix signature generator. Added function to replace special characters in the JSON body #24

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
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
82 changes: 47 additions & 35 deletions src/signature.ts
Original file line number Diff line number Diff line change
@@ -1,45 +1,57 @@
import crypto = require('crypto');

export function sortObject(obj: any): any {
const sortedObj: any = {};
Object.keys(obj).sort().forEach((key): void => {
if(Array.isArray(obj[key])) {
sortedObj[key] = obj[key]
} else if(typeof obj[key] === 'object') {
sortedObj[key] = sortObject(obj[key]);
} else {
sortedObj[key] = obj[key];
}
const sortedObj: any = {};
Object.keys(obj)
.sort()
.forEach((key): void => {
if (Array.isArray(obj[key])) {
sortedObj[key] = obj[key];
} else if (typeof obj[key] === 'object') {
sortedObj[key] = sortObject(obj[key]);
} else {
sortedObj[key] = obj[key];
}
});
return sortedObj;
return sortedObj;
}

export function generateSignature(arg: {
data: any,
requestUrl: string,
nonceStr: string,
signType: string,
method: string,
timestamp: string,
}, privateKey: string): string {
const replaceSpecialCharacters = (str: string) => {
return str
.replace(/</g, '\\u003c')
.replace(/>/g, '\\u003e')
.replace(/&/g, '\\u0026');
};

let signature_data = ''
export function generateSignature(
arg: {
data: any;
requestUrl: string;
nonceStr: string;
signType: string;
method: string;
timestamp: string;
},
privateKey: string
): string {
let signature_data = '';

if (arg.data !== null && typeof arg.data === 'object') {
const signature_body = sortObject(arg.data)
const signature = Buffer.from(JSON.stringify(signature_body)).toString('base64')
signature_data = 'data=' + signature + '&'
}
if (arg.data !== null && typeof arg.data === 'object') {
const signature_body = sortObject(arg.data);
const jsonValue = replaceSpecialCharacters(JSON.stringify(signature_body));
const signature = Buffer.from(jsonValue).toString('base64');
signature_data = 'data=' + signature + '&';
}

const full_signature = signature_data
+ 'method=' + arg.method
+ '&nonceStr=' + arg.nonceStr
+ '&requestUrl=' + arg.requestUrl
+ '&signType=' + arg.signType
+ '&timestamp=' + arg.timestamp
const full_signature = signature_data
+ 'method=' + arg.method
+ '&nonceStr=' + arg.nonceStr
+ '&requestUrl=' + arg.requestUrl
+ '&signType=' + arg.signType
+ '&timestamp=' + arg.timestamp

return crypto
.createSign('SHA256')
.update(full_signature)
.sign(privateKey, 'base64')
}
return crypto
.createSign('SHA256')
.update(full_signature)
.sign(privateKey, 'base64');
}