Merge pull request #5493 from Microsoft/users/ajya/fixForEnvPropertyIssue

issue fix

Author: Ajay Kumar Yadav

Tasks/AzureAppServiceManage/task.json

@@ -17,7 +17,7 @@
     "version": {
         "Major": 0,
         "Minor": 2,
-        "Patch": 15
+        "Patch": 16
     },
     "minimumAgentVersion": "1.102.0",
     "instanceNameFormat": "$(Action): $(WebAppName)",

Tasks/AzureAppServiceManage/task.loc.json

@@ -17,7 +17,7 @@
   "version": {
     "Major": 0,
     "Minor": 2,
-    "Patch": 15
+    "Patch": 16
   },
   "minimumAgentVersion": "1.102.0",
   "instanceNameFormat": "ms-resource:loc.instanceNameFormat",

Tasks/AzureRmWebAppDeployment/task.json

@@ -16,7 +16,7 @@
     "version": {
         "Major": 3,
         "Minor": 3,
-        "Patch": 16
+        "Patch": 17
     },
     "releaseNotes": "What's new in Version 3.0: <br/>&nbsp;&nbsp;Supports File Transformations (XDT) <br/>&nbsp;&nbsp;Supports Variable Substitutions(XML, JSON) <br/>Click [here](https://aka.ms/azurermwebdeployreadme) for more Information.",
     "minimumAgentVersion": "2.104.1",

Tasks/AzureRmWebAppDeployment/task.loc.json

@@ -16,7 +16,7 @@
   "version": {
     "Major": 3,
     "Minor": 3,
-    "Patch": 16
+    "Patch": 17
   },
   "releaseNotes": "ms-resource:loc.releaseNotes",
   "minimumAgentVersion": "2.104.1",

Tasks/Common/azurestack-common/azurestackrestutility.ts

@@ -25,7 +25,9 @@ export async function initializeAzureRMEndpointData(connectedServiceName)
 
     if(endPoint["environment"] != null && endPoint["environment"].toLowerCase() == azureStackEnvironment.toLowerCase()) {
         if(!endPoint["envAuthUrl"] || !endPoint["activeDirectoryResourceId"]) {
-            endPoint =  await initializeAzureStackData({"url":endPoint["url"]});
+            endPoint =  await initializeAzureStackData(endPoint);
+            endPoint["envAuthUrl"] = endPoint['environmentAuthorityUrl'];
+            endPoint["activeDirectoryResourceId"] = endPoint['activeDirectoryServiceEndpointResourceId'];
 
             if(endPoint["envAuthUrl"] == null) {
                 throw tl.loc("UnableToFetchAuthorityURL");
@@ -62,6 +64,7 @@ export async function initializeAzureStackData(endpoint): Promise<any>
             if(authenticationData) {
                 var loginEndpoint = authenticationData.loginEndpoint;
                 if(loginEndpoint) {
+                    loginEndpoint += (loginEndpoint.lastIndexOf("/") == loginEndpoint.length - 1) ? "" : "/";
                     endpoint['activeDirectoryAuthority'] = loginEndpoint;
                     endpoint['environmentAuthorityUrl'] = loginEndpoint;
                 }