Add persona to web socket authentication.

hawkular · Sep 11, 2015 · c979911 · c979911
1 parent 269b4fa
commit c979911
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/dist/hawkular-ui-service.js b/dist/hawkular-ui-service.js
@@ -758,8 +758,8 @@ var hawkularRest;
                 factory.performOperation = function (operation) {
                     ws.send('ExecuteOperationRequest=' + JSON.stringify(operation));
                 };
-                factory.performAddDeployOperation = function (resourcePath, destinationFileName, fileBinaryContent, authToken) {
-                    var json = "DeployApplicationRequest={\"resourcePath\": \"" + resourcePath + "\",\n        \"destinationFileName\":\"" + destinationFileName + "\"\n          \"authentication:\"{\"token\":\"" + authToken + "\"} }";
+                factory.performAddDeployOperation = function (resourcePath, destinationFileName, fileBinaryContent, authToken, personaId) {
+                    var json = "DeployApplicationRequest={\"resourcePath\": \"" + resourcePath + "\",\n        \"destinationFileName\":\"" + destinationFileName + "\"\n          \"authentication:\"{\"token\":\"" + authToken + "\", \"persona\":\"" + personaId + "\" } }";
                     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
@@ -758,8 +758,8 @@ var hawkularRest;
                 factory.performOperation = function (operation) {
                     ws.send('ExecuteOperationRequest=' + JSON.stringify(operation));
                 };
-                factory.performAddDeployOperation = function (resourcePath, destinationFileName, fileBinaryContent, authToken) {
-                    var json = "DeployApplicationRequest={\"resourcePath\": \"" + resourcePath + "\",\n        \"destinationFileName\":\"" + destinationFileName + "\"\n          \"authentication:\"{\"token\":\"" + authToken + "\"} }";
+                factory.performAddDeployOperation = function (resourcePath, destinationFileName, fileBinaryContent, authToken, personaId) {
+                    var json = "DeployApplicationRequest={\"resourcePath\": \"" + resourcePath + "\",\n        \"destinationFileName\":\"" + destinationFileName + "\"\n          \"authentication:\"{\"token\":\"" + authToken + "\", \"persona\":\"" + personaId + "\" } }";
                     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,10 +131,14 @@ module hawkularRest {
         ws.send('ExecuteOperationRequest=' + JSON.stringify(operation));
       };
 
-      factory.performAddDeployOperation = (resourcePath:string, destinationFileName:string, fileBinaryContent:any, authToken:string) => {
+      factory.performAddDeployOperation = (resourcePath:string,
+                                           destinationFileName:string,
+                                           fileBinaryContent:any,
+                                           authToken:string,
+                                           personaId:string) => {
         let json = `DeployApplicationRequest={"resourcePath": "${resourcePath}",
         "destinationFileName":"${destinationFileName}"
-          "authentication:"{"token":"${authToken}"} }`;
+          "authentication:"{"token":"${authToken}", "persona":"${personaId}" } }`;
         let binaryblob = new Blob([json, fileBinaryContent], {type: 'application/octet-stream'});
         console.log('DeployApplicationRequest: ' + json);
         ws.send(binaryblob);