Epankou/bug non dev mode connector ewc 339 (#346)

* volume mapping & delete with clean up

* volume mapping & delete with clean up

* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332

# Conflicts:
#	src/cli/microservice.js
#	src/controllers/microservices-controller.js
#	src/services/microservices-service.js

* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332

# Conflicts:
#	src/cli/microservice.js
#	src/controllers/microservices-controller.js
#	src/services/microservices-service.js

* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332

# Conflicts:
#	src/cli/microservice.js
#	src/controllers/microservices-controller.js
#	src/services/microservices-service.js

* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332

# Conflicts:
#	src/cli/microservice.js
#	src/controllers/microservices-controller.js
#	src/services/microservices-service.js

* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332

# Conflicts:
#	src/cli/microservice.js
#	src/controllers/microservices-controller.js
#	src/services/microservices-service.js

* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332

# Conflicts:
#	src/cli/microservice.js
#	src/controllers/microservices-controller.js
#	src/services/microservices-service.js

* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332

# Conflicts:
#	src/cli/microservice.js
#	src/controllers/microservices-controller.js
#	src/services/microservices-service.js

* Merge branch 'develop' of https://github.com/ioFog/FogController into epankou/feature-volume-mapping-endpoint-EWC-332

# Conflicts:
#	src/cli/microservice.js
#	src/controllers/microservices-controller.js
#	src/services/microservices-service.js

* connector non dev mode fix EWC-339

Author: epankou

src/helpers/app-helper.js

@@ -157,6 +157,12 @@ function handleCLIError(error) {
   }
 }
 
+function trimCertificate(cert) {
+  let result = cert.replace(/(^[\s\S]*-{3,}BEGIN CERTIFICATE-{3,}[\s]*)/, "");
+  result = result.replace(/([\s]*-{3,}END CERTIFICATE-{3,}[\s\S]*$)/, "");
+  return result;
+}
+
 module.exports = {
   encryptText,
   decryptText,
@@ -173,5 +179,6 @@ module.exports = {
   findAvailablePort,
   stringifyCliJsonSchema,
   isValidPublicIP,
-  handleCLIError
+  handleCLIError,
+  trimCertificate
 };

src/services/microservices-service.js

@@ -31,6 +31,7 @@ const FlowService = require('../services/flow-service');
 const CatalogService = require('../services/catalog-service');
 const RoutingManager = require('../sequelize/managers/routing-manager');
 const Op = require('sequelize').Op;
+const fs = require('fs');
 
 const _listMicroservices = async function (flowId, user, isCLI, transaction) {
   if (!isCLI) {
@@ -602,7 +603,7 @@ async function _createPortMappingOverConnector(microservice, portMappingData, us
   const netwMsConfig = {
     'mode': 'public',
     'host': connector.domain,
-    'cert': connector.cert,
+    'cert': AppHelper.trimCertificate(fs.readFileSync(connector.cert, "utf-8")),
     'port': ports.port1,
     'passcode': ports.passcode1,
     'connectioncount': 60,