Fix regression bug in api-url generation

nekudo · nekudo · commit eca6d1ae86e1 · 2020-04-19T22:05:53.000+02:00
diff --git a/src/ShinyDeploy/Domain/Database/ApiKeys.php b/src/ShinyDeploy/Domain/Database/ApiKeys.php
@@ -42,7 +42,7 @@ public function addApiKey(int $deploymentId) : array
         }
         return [
             'apiKey' => $apiKey,
-            'password' => $passwordForUrl
+            'apiPassword' => $passwordForUrl
         ];
     }
 
diff --git a/www/js/app/deployments/DeploymentsEditController.js b/www/js/app/deployments/DeploymentsEditController.js
@@ -146,7 +146,7 @@
                     return false;
                 }
                 var webhookUrl = location.protocol+'//'+location.hostname;
-                webhookUrl += '/api.php?ak='+data.apiKey+'&ap='+data.password;
+                webhookUrl += '/api.php?ak='+data.apiKey+'&ap='+data.apiPassword;
                 vm.apiUrl = webhookUrl;
             }, function (reason) {
                 alertsService.pushAlert(reason, 'warning');
diff --git a/www/js/project.min.js b/www/js/project.min.js

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public function addApiKey(int $deploymentId) : array`
`42`	`42`	`}`
`43`	`43`	`return [`
`44`	`44`	`'apiKey' => $apiKey,`
`45`		`- 'password' => $passwordForUrl`
	`45`	`+ 'apiPassword' => $passwordForUrl`
`46`	`46`	`];`
`47`	`47`	`}`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@`
`146`	`146`	`return false;`
`147`	`147`	`}`
`148`	`148`	`var webhookUrl = location.protocol+'//'+location.hostname;`
`149`		`- webhookUrl += '/api.php?ak='+data.apiKey+'&ap='+data.password;`
	`149`	`+ webhookUrl += '/api.php?ak='+data.apiKey+'&ap='+data.apiPassword;`
`150`	`150`	`vm.apiUrl = webhookUrl;`
`151`	`151`	`}, function (reason) {`
`152`	`152`	`alertsService.pushAlert(reason, 'warning');`