From b4640c9ea5f1f4e0da81e91bc52194fe862cc6eb Mon Sep 17 00:00:00 2001
From: Tim McCarthy <tim.mccarthy@perficient.com>
Date: Mon, 2 Mar 2020 20:31:36 -0800
Subject: [PATCH] Added CallbackUrl value to Web MVC deploy pipeline and deploy
 template

---
 deploy/aro/web-mvc/azure-pipelines.yml        | 2 +-
 deploy/aro/web-mvc/webmvc-deploy-template.yml | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/deploy/aro/web-mvc/azure-pipelines.yml b/deploy/aro/web-mvc/azure-pipelines.yml
index 73089d8b8..5233f7b5a 100644
--- a/deploy/aro/web-mvc/azure-pipelines.yml
+++ b/deploy/aro/web-mvc/azure-pipelines.yml
@@ -40,7 +40,7 @@ stages:
         - script: 'oc project $(OpenShiftProject)'
           failOnStderr: true
           displayName: 'Set OpenShift Project Context'
-        - script: 'oc process -f ./deploy/aro/web-mvc/webmvc-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p IDENTITY_URL_EXTERNAL=$(IdentityUrlExternal) -p WEB_SHOPPING_API_GATEWAY_URL=$(WebShoppingApiGatewayUrl) -p MARKETING_API_URL=$(MarketingApiUrl) -p IDENTITY_API_HC_URL=$(IdentityApiHc) -p ORDERING_SIGNALR_HUB_URL=$(OrderingSignalRHubUrl) | oc apply -f-'
+        - script: 'oc process -f ./deploy/aro/web-mvc/webmvc-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p WEB_MVC_URL=$(WebMvcUrl) -p IDENTITY_URL_EXTERNAL=$(IdentityUrlExternal) -p WEB_SHOPPING_API_GATEWAY_URL=$(WebShoppingApiGatewayUrl) -p MARKETING_API_URL=$(MarketingApiUrl) -p IDENTITY_API_HC_URL=$(IdentityApiHc) -p ORDERING_SIGNALR_HUB_URL=$(OrderingSignalRHubUrl) | oc apply -f-'
           failOnStderr: true
           displayName: 'Ensure Web MVC OpenShift DeploymentConfig and Service'
         - script: 'oc apply -f ./deploy/aro/web-mvc/webmvc-public-route.json'
diff --git a/deploy/aro/web-mvc/webmvc-deploy-template.yml b/deploy/aro/web-mvc/webmvc-deploy-template.yml
index 04344d66a..c19d25744 100644
--- a/deploy/aro/web-mvc/webmvc-deploy-template.yml
+++ b/deploy/aro/web-mvc/webmvc-deploy-template.yml
@@ -28,6 +28,8 @@ objects:
           - env:
               - name: IdentityUrl
                 value: ${IDENTITY_URL_EXTERNAL}
+              - name: CallbackUrl
+                value: ${WEB_MVC_URL}
               - name: PurchaseUrl
                 value: ${WEB_SHOPPING_API_GATEWAY_URL}
               - name: MarketingUrl