Updated pipeline and settings for live deployment

Author: AndyButland

azure-pipeline - Crm.Hubspot.OAuthProxy.yml

@@ -8,8 +8,10 @@ variables:
   projectName: 'Umbraco.Forms.Integrations.Crm.Hubspot.OAuthProxy'
   project: 'src/$(projectName)/$(projectName).csproj'
   buildConfiguration: 'Release'
-  azureServiceConnection: 'Umbraco Forms Integrations - Umbraco Cloud Services Dev - Hubspot Auth'
-  webAppName: 'azapp-forms-hubspot-auth-we-dev-svc'
+  azureServiceConnectionDev: 'Umbraco Forms Integrations - Umbraco Cloud Services Dev - Hubspot Auth'
+  azureServiceConnectionLive: 'Umbraco Forms Integrations - Umbraco Cloud Services Live - Hubspot Auth'
+  webAppNameDev: 'azapp-forms-hubspot-auth-we-dev-svc'
+  webAppNameLive: 'azapp-forms-hubspot-auth-we-live-svc'
 
 steps:
 - script: dotnet build $(project) --configuration $(buildConfiguration)
@@ -21,16 +23,35 @@ steps:
     projects: $(project)
     publishWebProjects: false
 - task: AzureWebApp@1
-  displayName: 'Deploy Web App'
+  displayName: 'Deploy Web App (Dev)'
   inputs:
-    azureSubscription: $(azureServiceConnection)
-    appName: $(webAppName)
+    azureSubscription: $(azureServiceConnectionDev)
+    appName: $(webAppNameDev)
     package: '$(System.DefaultWorkingDirectory)/**/*.zip'
 - task: AzureAppServiceSettings@1
-  displayName: 'Set Web App Settings'
+  displayName: 'Set Web App Settings (Dev)'
   inputs:
-    azureSubscription: $(azureServiceConnection)
-    appName: $(webAppName)
+    azureSubscription: $(azureServiceConnectionDev)
+    appName: $(webAppNameDev)
+    appSettings: |
+      [
+        {
+          "name": "AppSettings:ClientSecret",
+          "value": "$(hubSpotAppSecretKey)",
+          "slotSetting": false
+        }
+      ]
+- task: AzureWebApp@1
+  displayName: 'Deploy Web App (Live)'
+  inputs:
+    azureSubscription: $(azureServiceConnectionLive)
+    appName: $(webAppNameLive)
+    package: '$(System.DefaultWorkingDirectory)/**/*.zip'
+- task: AzureAppServiceSettings@1
+  displayName: 'Set Web App Settings (Live)'
+  inputs:
+    azureSubscription: $(azureServiceConnectionLive)
+    appName: $(webAppNameLive)
     appSettings: |
       [
         {

src/Umbraco.Forms.Integrations.Crm.Hubspot/Services/HubspotContactService.cs

@@ -37,8 +37,8 @@ public class HubspotContactService : IContactService
         private const string OAuthScopes = "crm.objects.contacts.read%20crm.objects.contacts.write";
         private const string OAauthClientId = "1a04f5bf-e99e-48e1-9d62-6c25bf2bdefe";
 
-        private const string OAuthRedirectUrl = "https://hubspot-forms-auth.rainbowsrock.net/";
-        private const string OAuthTokenProxyUrl = "https://hubspot-forms-auth.rainbowsrock.net//oauth/v1/token";
+        private const string OAuthRedirectUrl = "https://hubspot-forms-auth.umbraco.com/";
+        private const string OAuthTokenProxyUrl = "https://hubspot-forms-auth.umbraco.com/oauth/v1/token";
 
         private const string AccessTokenCacheKey = "HubSpotOAuthAccessToken";
 

src/Umbraco.Forms.Integrations.sln

@@ -15,6 +15,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Forms.Integrations.
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D8563F12-E8CF-4900-BEF4-531B8C1FE8A3}"
 	ProjectSection(SolutionItems) = preProject
+		..\azure-pipeline - Crm.Hubspot.OAuthProxy.yml = ..\azure-pipeline - Crm.Hubspot.OAuthProxy.yml
 		..\azure-pipeline - Crm.Hubspot.yml = ..\azure-pipeline - Crm.Hubspot.yml
 		..\README.md = ..\README.md
 	EndProjectSection