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

enabling async methods for postProcess #1174

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions src/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ export class Client extends EventEmitter {
}
}

private _invoke(method: OperationElement, args, location: string, callback, options, extraHeaders) {
private async _invoke(method: OperationElement, args, location: string, callback, options, extraHeaders) {
const name = method.$name;
const input = method.input;
const output = method.output;
Expand Down Expand Up @@ -462,7 +462,7 @@ export class Client extends EventEmitter {
}

if (options && options.postProcess) {
xml = options.postProcess(xml);
xml = await options.postProcess(xml);
}

this.lastMessage = message;
Expand Down
95 changes: 91 additions & 4 deletions test/client-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -1652,8 +1652,8 @@ it('should add namespace to array of objects', function (done) {
} else {
assert.ok(null, `Array object don't have namesapce`)
}
done();
});
done();
});
});

Expand Down Expand Up @@ -1734,7 +1734,7 @@ describe('Client posting complex body', () => {
return void done(err);
}
assert.ok(client);

var requestBody = {
id: 'ID00000000000000000000000000000000',
lastName: 'Doe',
Expand All @@ -1753,7 +1753,7 @@ describe('Client posting complex body', () => {
companyName: 'ACME'
}
}

client.registerUser(requestBody, function (err, result) {
assert.ok(client.lastRequest);
assert.ok(client.lastMessage);
Expand All @@ -1762,9 +1762,96 @@ describe('Client posting complex body', () => {
console.log(client.lastMessage);
const expectedBody = '<registrationMessages:registerUserRequest xmlns:registrationMessages="http://test-soap.com/api/registration/messages" xmlns="http://test-soap.com/api/registration/messages"><registrationMessages:id>ID00000000000000000000000000000000</registrationMessages:id><registrationMessages:lastName>Doe</registrationMessages:lastName><registrationMessages:firstName>John</registrationMessages:firstName><registrationMessages:dateOfBirth>1970-01-01</registrationMessages:dateOfBirth><registrationMessages:correspondenceLanguage>ENG</registrationMessages:correspondenceLanguage><registrationMessages:emailAddress>jdoe@doe.com</registrationMessages:emailAddress><registrationMessages:lookupPermission>ALLOWED</registrationMessages:lookupPermission><registrationMessages:companyAddress><ct:address xmlns:ct="http://test-soap.com/api/common/types"><ct:streetName>Street</ct:streetName><ct:postalCode>Code</ct:postalCode><ct:city>City</ct:city><ct:countryCode>US</ct:countryCode></ct:address><ct:companyName xmlns:ct="http://test-soap.com/api/common/types">ACME</ct:companyName></registrationMessages:companyAddress></registrationMessages:registerUserRequest>';
assert.strictEqual(client.lastMessage, expectedBody);

done();
});
}, baseUrl);
});


it('should resolve promise on async invoke postProcess', function (done) {
soap.createClient(__dirname + '/wsdl/complex/registration-common.wsdl', function (err, client) {
if (err) {
return void done(err);
}
assert.ok(client);

var requestBody = {
id: 'ID00000000000000000000000000000000',
lastName: 'Doe',
firstName: 'John',
dateOfBirth: '1970-01-01',
correspondenceLanguage: 'ENG',
emailAddress: 'jdoe@doe.com',
lookupPermission: 'ALLOWED',
companyAddress: {
address: {
streetName: 'Street',
postalCode: 'Code',
city: 'City',
countryCode: 'US'
},
companyName: 'ACME'
}
}

client.registerUser(requestBody, {
postProcess: async (xml) => {
const testString = await new Promise(resolve => setTimeout(resolve("Jane"), 3000));

xml = xml.replace("John", testString)
return xml;
}
}, function (err, result) {
assert.ok(client.lastRequest);
const expectedBody = '<?xml version="1.0" encoding="utf-8"?><soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="http://test-soap.com/api/registration" xmlns:registrationMessages="http://test-soap.com/api/registration/messages" xmlns:commonMessages="http://test-soap.com/api/common/messages"><soap:Body><registrationMessages:registerUserRequest xmlns:registrationMessages="http://test-soap.com/api/registration/messages" xmlns="http://test-soap.com/api/registration/messages"><registrationMessages:id>ID00000000000000000000000000000000</registrationMessages:id><registrationMessages:lastName>Doe</registrationMessages:lastName><registrationMessages:firstName>Jane</registrationMessages:firstName><registrationMessages:dateOfBirth>1970-01-01</registrationMessages:dateOfBirth><registrationMessages:correspondenceLanguage>ENG</registrationMessages:correspondenceLanguage><registrationMessages:emailAddress>jdoe@doe.com</registrationMessages:emailAddress><registrationMessages:lookupPermission>ALLOWED</registrationMessages:lookupPermission><registrationMessages:companyAddress><ct:address xmlns:ct="http://test-soap.com/api/common/types"><ct:streetName>Street</ct:streetName><ct:postalCode>Code</ct:postalCode><ct:city>City</ct:city><ct:countryCode>US</ct:countryCode></ct:address><ct:companyName xmlns:ct="http://test-soap.com/api/common/types">ACME</ct:companyName></registrationMessages:companyAddress></registrationMessages:registerUserRequest></soap:Body></soap:Envelope>'
assert.strictEqual(client.lastRequest, expectedBody);

done();
});
}, baseUrl);
})

it('should resolve sync invoke postProcess', function (done) {
soap.createClient(__dirname + '/wsdl/complex/registration-common.wsdl', function (err, client) {
if (err) {
return void done(err);
}
assert.ok(client);

var requestBody = {
id: 'ID00000000000000000000000000000000',
lastName: 'Doe',
firstName: 'John',
dateOfBirth: '1970-01-01',
correspondenceLanguage: 'ENG',
emailAddress: 'jdoe@doe.com',
lookupPermission: 'ALLOWED',
companyAddress: {
address: {
streetName: 'Street',
postalCode: 'Code',
city: 'City',
countryCode: 'US'
},
companyName: 'ACME'
}
}

client.registerUser(requestBody, {
postProcess: (xml) => {
const testString = "Jane"

xml = xml.replace("John", testString)
return xml;
}
}, function (err, result) {
assert.ok(client.lastRequest);
const expectedBody = '<?xml version="1.0" encoding="utf-8"?><soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="http://test-soap.com/api/registration" xmlns:registrationMessages="http://test-soap.com/api/registration/messages" xmlns:commonMessages="http://test-soap.com/api/common/messages"><soap:Body><registrationMessages:registerUserRequest xmlns:registrationMessages="http://test-soap.com/api/registration/messages" xmlns="http://test-soap.com/api/registration/messages"><registrationMessages:id>ID00000000000000000000000000000000</registrationMessages:id><registrationMessages:lastName>Doe</registrationMessages:lastName><registrationMessages:firstName>Jane</registrationMessages:firstName><registrationMessages:dateOfBirth>1970-01-01</registrationMessages:dateOfBirth><registrationMessages:correspondenceLanguage>ENG</registrationMessages:correspondenceLanguage><registrationMessages:emailAddress>jdoe@doe.com</registrationMessages:emailAddress><registrationMessages:lookupPermission>ALLOWED</registrationMessages:lookupPermission><registrationMessages:companyAddress><ct:address xmlns:ct="http://test-soap.com/api/common/types"><ct:streetName>Street</ct:streetName><ct:postalCode>Code</ct:postalCode><ct:city>City</ct:city><ct:countryCode>US</ct:countryCode></ct:address><ct:companyName xmlns:ct="http://test-soap.com/api/common/types">ACME</ct:companyName></registrationMessages:companyAddress></registrationMessages:registerUserRequest></soap:Body></soap:Envelope>'
assert.strictEqual(client.lastRequest, expectedBody);

done();
});
}, baseUrl);
})
});