Merge pull request #1 from mcasella/master

Updates for gamefly
VirtuOz · Feb 16, 2015 · 3865c34 · 3865c34
2 parents e547425 + 7349b04
commit 3865c34
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/lib/client.js b/lib/client.js
@@ -3,6 +3,8 @@
  * MIT Licensed
  */
 
+var soapNamespacePrefix = "soap";
+
 function findKey(obj, val) {
     for (var n in obj) if (obj[n] === val) return n;
 }
@@ -123,18 +125,19 @@ Client.prototype._invoke = function(method, arguments, location, callback, optio
         assert.ok(!style || style == 'document', 'invalid message definition for rpc style binding');
         message = self.wsdl.objectToDocumentXML(input.$name, arguments, input.targetNSAlias, input.targetNamespace);
     }
-    xml = "<soap:Envelope " + 
-            "xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\" " +
+
+    xml = "<"+soapNamespacePrefix+":Envelope " + 
+            "xmlns:"+soapNamespacePrefix+"=\"http://schemas.xmlsoap.org/soap/envelope/\" " +
             encoding +
             this.wsdl.xmlnsInEnvelope + '>' +
-            "<soap:Header>" +
+            "<"+soapNamespacePrefix+":Header>" +
                 (self.soapHeaders ? self.soapHeaders.join("\n") : "") +
                 (self.security ? self.security.toXML() : "") +
-            "</soap:Header>" +
-            "<soap:Body>" +
+            "</"+soapNamespacePrefix+":Header>" +
+            "<"+soapNamespacePrefix+":Body>" +
                 message +
-            "</soap:Body>" +
-        "</soap:Envelope>";
+            "</"+soapNamespacePrefix+":Body>" +
+        "</"+soapNamespacePrefix+":Envelope>";
 
 	self.lastRequest = xml;
 
@@ -164,3 +167,7 @@ Client.prototype._invoke = function(method, arguments, location, callback, optio
 }
 
 exports.Client = Client;
+
+exports.setNamespacePrefix = function(newPrefix) {
+    soapNamespacePrefix = newPrefix;
+};
diff --git a/lib/soap.js b/lib/soap.js
@@ -150,3 +150,4 @@ exports.createClient = createClient;
 exports.passwordDigest = passwordDigest;
 exports.listen = listen;
 exports.WSDL = WSDL;
+exports.setNamespacePrefix = require('./client').setNamespacePrefix;
diff --git a/lib/wsdl.js b/lib/wsdl.js
@@ -747,6 +747,7 @@ WSDL.prototype.xmlToObject = function(xml) {
 					refs[id].hrefs.push({par:top.object,key:name,obj:obj});
 				}
 				if(id=attrs.id) {
+				    obj = id; //Gamefly update to get id attribute returned
 					if(!refs[id]) refs[id] = {hrefs:[],obj:null};
 				}