ocket8888 commented on a change in pull request #3534: TP Delivery Service
Generate SSL update, new letsencrypt generate and…
URL: https://github.com/apache/trafficcontrol/pull/3534#discussion_r339184958
##########
File path: traffic_portal/app/src/common/api/DeliveryServiceSslKeysService.js
##########
@@ -17,75 +17,80 @@
* under the License.
*/
-var DeliveryServiceSslKeysService = function($http, $q, locationUtils,
messageModel, ENV) {
+var DeliveryServiceSslKeysService = function($http, locationUtils,
messageModel, ENV) {
+ this.successMessage = 'SSL Keys generated and updated for ';
+ this.letsEncryptSuccessMessage = 'Call to Lets Encrypt has been made
successfully. This may take a few minutes. Please watch for a notification in
the Change Log. Delivery Service = ';
+
this.generateSslKeys = function(deliveryService, sslKeys,
generateSslKeyForm) {
- if (sslKeys.hasOwnProperty('version')){
- generateSslKeyForm.version = parseInt(sslKeys.version)
+ 1;
- } else {
- generateSslKeyForm.version = 1;
- }
+ return this.generateSslKeysBase(deliveryService, sslKeys,
generateSslKeyForm, 'deliveryservices/sslkeys/generate', this.successMessage);
+ };
- generateSslKeyForm.cdn = deliveryService.cdnName;
- generateSslKeyForm.deliveryservice = deliveryService.xmlId;
- generateSslKeyForm.key = deliveryService.xmlId;
+ this.generateSslKeysWithLetsEncrypt = function(deliveryService, sslKeys,
generateSslKeyForm) {
+ return this.generateSslKeysBase(deliveryService, sslKeys,
generateSslKeyForm, 'deliveryservices/sslkeys/generate/letsencrypt',
this.letsEncryptSuccessMessage);
+ };
- var request = $q.defer();
- $http.post(ENV.api['root'] + "deliveryservices/sslkeys/generate",
generateSslKeyForm)
- .then(
- function(result) {
- messageModel.setMessages([ { level: 'success', text: 'SSL Keys
generated and updated for ' + deliveryService.xmlId } ], true);
- request.resolve(result.data.response);
- },
- function(fault) {
- messageModel.setMessages(fault.data.alerts, false);
- request.reject(fault);
- }
- );
- return request.promise;
- };
+ this.generateSslKeysBase = function(deliveryService, sslKeys,
generateSslKeyForm, endpoint, message) {
+ if (sslKeys.hasOwnProperty('version')){
+ generateSslKeyForm.version = parseInt(sslKeys.version, 10) + 1;
+ } else {
+ generateSslKeyForm.version = 1;
+ }
+
+ generateSslKeyForm.cdn = deliveryService.cdnName;
+ generateSslKeyForm.deliveryservice = deliveryService.xmlId;
+ generateSslKeyForm.key = deliveryService.xmlId;
+
+ return $http.post(ENV.api['root'] + endpoint, generateSslKeyForm)
+ .then(
+ function(result) {
+ messageModel.setMessages([ { level: 'success', text:
message + deliveryService.xmlId } ], true);
Review comment:
It looks like here you could just pass in the `alerts` from the server
response, couldn't you? I think you've re-implemented what it already does.
Also, if you're not redirecting after setting the messages, that second
argument should be `false`.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
