Add Web socket authentication to deployment add.

hawkular · Sep 11, 2015 · 3802536 · 3802536
1 parent bbf721f
commit 3802536
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/dist/hawkular-ui-service.js b/dist/hawkular-ui-service.js
@@ -757,8 +757,8 @@ var hawkularRest;
                 factory.performOperation = function (operation) {
                     ws.send('ExecuteOperationRequest=' + JSON.stringify(operation));
                 };
-                factory.performAddDeployOperation = function (resourcePath, destinationFileName, fileBinaryContent) {
-                    var json = 'DeployApplicationRequest={\"resourcePath\": \"' + resourcePath + '\", \"destinationFileName\":\"' + destinationFileName + '\" }';
+                factory.performAddDeployOperation = function (resourcePath, destinationFileName, fileBinaryContent, authToken) {
+                    var json = "DeployApplicationRequest={\"resourcePath\": \"" + resourcePath + "\",\n        \"destinationFileName\":\"" + destinationFileName + "\"\n          \"authentication:\"{\"token\":\"" + authToken + "\"} }";
                     var binaryblob = new Blob([json, fileBinaryContent], { type: 'application/octet-stream' });
                     console.log('DeployApplicationRequest: ' + json);
                     ws.send(binaryblob);

diff --git a/dist/hawkular-ui-service.min.js b/dist/hawkular-ui-service.min.js
@@ -757,8 +757,8 @@ var hawkularRest;
                 factory.performOperation = function (operation) {
                     ws.send('ExecuteOperationRequest=' + JSON.stringify(operation));
                 };
-                factory.performAddDeployOperation = function (resourcePath, destinationFileName, fileBinaryContent) {
-                    var json = 'DeployApplicationRequest={\"resourcePath\": \"' + resourcePath + '\", \"destinationFileName\":\"' + destinationFileName + '\" }';
+                factory.performAddDeployOperation = function (resourcePath, destinationFileName, fileBinaryContent, authToken) {
+                    var json = "DeployApplicationRequest={\"resourcePath\": \"" + resourcePath + "\",\n        \"destinationFileName\":\"" + destinationFileName + "\"\n          \"authentication:\"{\"token\":\"" + authToken + "\"} }";
                     var binaryblob = new Blob([json, fileBinaryContent], { type: 'application/octet-stream' });
                     console.log('DeployApplicationRequest: ' + json);
                     ws.send(binaryblob);

diff --git a/src/rest/hawkRest-ops-factory.ts b/src/rest/hawkRest-ops-factory.ts
@@ -131,8 +131,10 @@ module hawkularRest {
         ws.send('ExecuteOperationRequest=' + JSON.stringify(operation));
       };
 
-      factory.performAddDeployOperation = function (resourcePath, destinationFileName, fileBinaryContent) {
-        var json = 'DeployApplicationRequest={\"resourcePath\": \"' + resourcePath + '\", \"destinationFileName\":\"' + destinationFileName + '\" }';
+      factory.performAddDeployOperation = function (resourcePath, destinationFileName, fileBinaryContent, authToken) {
+        var json = `DeployApplicationRequest={"resourcePath": "${resourcePath}",
+        "destinationFileName":"${destinationFileName}"
+          "authentication:"{"token":"${authToken}"} }`;
         var binaryblob = new Blob([json, fileBinaryContent], {type: 'application/octet-stream'});
         console.log('DeployApplicationRequest: ' + json);
         ws.send(binaryblob);