Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: vpulim/node-soap
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: fabrictech/node-soap
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 6 commits
  • 6 files changed
  • 1 contributor

Commits on Feb 8, 2018

  1. moving .ejs template files to .js files for webpack friendliness

    Julian Marinus committed Feb 8, 2018
    Copy the full SHA
    fba7e90 View commit details

  2. bump version number

    Julian Marinus committed Feb 8, 2018
    Copy the full SHA
    3cd5364 View commit details

  3. revert version number change

    Julian Marinus committed Feb 8, 2018
    Copy the full SHA
    6045ed7 View commit details

  4. 0.23.1

    Julian Marinus committed Feb 8, 2018
    Copy the full SHA
    94307cb View commit details

  5. change project name

    Julian Marinus committed Feb 8, 2018
    Copy the full SHA
    219e45f View commit details

  6. 0.23.2

    Julian Marinus committed Feb 8, 2018
    Copy the full SHA
    4172041 View commit details
11 changes: 9 additions & 2 deletions lib/security/WSSecurityCert.js
View file
Original file line number Diff line number Diff line change
@@ -5,8 +5,15 @@ var path = require('path');
var ejs = require('ejs');
var SignedXml = require('xml-crypto').SignedXml;
var uuid4 = require('uuid/v4');
var wsseSecurityHeaderTemplate = ejs.compile(fs.readFileSync(path.join(__dirname, 'templates', 'wsse-security-header.ejs')).toString());
var wsseSecurityTokenTemplate = ejs.compile(fs.readFileSync(path.join(__dirname, 'templates', 'wsse-security-token.ejs')).toString());
// Julian comments:
// webpack has issues loading .ejs files from an external library.
// we forked the node-soap library and are changing the .ejs files to .js
// files and importing them normally so webpack understands them.
var wsseSecurityHeaderEjs = require('./templates/wsse-security-header.ejs').Xml;
var wsseSecurityTokenEjs = require('./templates/wsse-security-token.ejs').Xml;

var wsseSecurityHeaderTemplate = ejs.compile(wsseSecurityHeaderEjs);
var wsseSecurityTokenTemplate = ejs.compile(wsseSecurityTokenEjs);

function addMinutes(date, minutes) {
return new Date(date.getTime() + minutes * 60000);
12 changes: 0 additions & 12 deletions lib/security/templates/wsse-security-header.ejs
View file

This file was deleted.

16 changes: 16 additions & 0 deletions lib/security/templates/wsse-security-header.ejs.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
"use strict";

var Xml = '<wsse:Security xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" ' +
'xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" ' +
'soap:mustUnderstand="1"> ' +
'<wsse:BinarySecurityToken ' +
' EncodingType="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#Base64Binary" ' +
' ValueType="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-x509-token-profile-1.0#X509v3" ' +
' wsu:Id="<%-id%>"><%-binaryToken%></wsse:BinarySecurityToken> ' +
' <Timestamp xmlns="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" Id="_1"> ' +
' <Created><%-created%></Created> ' +
' <Expires><%-expires%></Expires> ' +
' </Timestamp> ' +
'</wsse:Security> ';

exports.Xml = Xml;
3 changes: 0 additions & 3 deletions lib/security/templates/wsse-security-token.ejs
View file

This file was deleted.

7 changes: 7 additions & 0 deletions lib/security/templates/wsse-security-token.ejs.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
"use strict";

var Xml = '<wsse:SecurityTokenReference> ' +
'<wsse:Reference URI="#<%-x509Id%>" ValueType="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-x509-token-profile-1.0#X509v3"/> ' +
'</wsse:SecurityTokenReference>';

exports.Xml = Xml;
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "soap",
"version": "0.23.0",
"name": "@fabrictech/soap",
"version": "0.23.2",
"description": "A minimal node SOAP client",
"engines": {
"node": ">=4.0.0"