From 4c3d8d3628dd76c64557023c7bc028cb398d36c3 Mon Sep 17 00:00:00 2001
From: Kevin BEAUGRAND <9513635+kbeaugrand@users.noreply.github.com>
Date: Sun, 11 Sep 2022 18:43:52 +0200
Subject: [PATCH] Fix #1212 - Modify deployment template (#1214)

---
 src/AzureIoTHub.Portal.sln             | 4 +++-
 templates/portalDeployWithLoRa.json    | 2 +-
 templates/portalDeployWithoutLoRa.json | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/AzureIoTHub.Portal.sln b/src/AzureIoTHub.Portal.sln
index 91ef91ea5..b320f0366 100644
--- a/src/AzureIoTHub.Portal.sln
+++ b/src/AzureIoTHub.Portal.sln
@@ -41,7 +41,9 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "templates", "templates", "{3F7A2982-4F0B-45F9-9FCA-923D5A7A1511}"
 	ProjectSection(SolutionItems) = preProject
 		..\templates\azuredeploy.json = ..\templates\azuredeploy.json
-		..\templates\portalDeploy.json = ..\templates\portalDeploy.json
+		..\templates\azuredeployUI.json = ..\templates\azuredeployUI.json
+		..\templates\portalDeployWithLoRa.json = ..\templates\portalDeployWithLoRa.json
+		..\templates\portalDeployWithoutLoRa.json = ..\templates\portalDeployWithoutLoRa.json
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ISSUE_TEMPLATES", "ISSUE_TEMPLATES", "{4B89F192-EA33-4121-9809-D99621C40F3B}"
diff --git a/templates/portalDeployWithLoRa.json b/templates/portalDeployWithLoRa.json
index 45cf5a8e9..3dbe240d7 100644
--- a/templates/portalDeployWithLoRa.json
+++ b/templates/portalDeployWithLoRa.json
@@ -227,7 +227,7 @@
             {
               "name": "PostgreSQL__ConnectionString",
               "type": "Custom",
-              "connectionString": "[concat('User ID=', parameters('pgsqlAdminLogin'), ';Password=', parameters('pgsqlAdminPassword'), ';Host=', concat(variables('pgsqlServerName'), '.postgres.database.azure.com') ,';Port=5432;Database=', variables('siteName') ,';Pooling=true;Min Pool Size=0;Max Pool Size=100;Connection Lifetime=0;"
+              "connectionString": "[concat('Server=', variables('pgsqlServerName') ,'.postgres.database.azure.com;Database=', variables('siteName') ,';Port=5432;User Id=', parameters('pgsqlAdminLogin') ,'@', variables('pgsqlServerName') ,';Password=', parameters('pgsqlAdminPassword'), ';Pooling=true;Connection Lifetime=0;Command Timeout=0;Ssl Mode=VerifyFull;')"
             }
           ],
           "appSettings": [
diff --git a/templates/portalDeployWithoutLoRa.json b/templates/portalDeployWithoutLoRa.json
index 9f991e71f..314dfcf4f 100644
--- a/templates/portalDeployWithoutLoRa.json
+++ b/templates/portalDeployWithoutLoRa.json
@@ -268,7 +268,7 @@
             {
               "name": "PostgreSQL__ConnectionString",
               "type": "Custom",
-              "connectionString": "[concat('User ID=', parameters('pgsqlAdminLogin'), ';Password=', parameters('pgsqlAdminPassword'), ';Host=', concat(variables('pgsqlServerName'), '.postgres.database.azure.com') ,';Port=5432;Database=', variables('siteName') ,';Pooling=true;Min Pool Size=0;Max Pool Size=100;Connection Lifetime=0;"
+              "connectionString": "[concat('Server=', variables('pgsqlServerName') ,'.postgres.database.azure.com;Database=', variables('siteName') ,';Port=5432;User Id=', parameters('pgsqlAdminLogin') ,'@', variables('pgsqlServerName') ,';Password=', parameters('pgsqlAdminPassword'), ';Pooling=true;Connection Lifetime=0;Command Timeout=0;Ssl Mode=VerifyFull;')"
             }
           ],
           "appSettings": [