azure-pipelines-tasks-azurermdeploycommon 3.221.0 → 3.221.2

package/operations/AzureAppServiceUtility.js

@@ -141,17 +141,24 @@ class AzureAppServiceUtility {
     getKuduAuthHeader(publishingCredentials) {
         return __awaiter(this, void 0, void 0, function* () {
             const scmPolicyCheck = yield this.isSitePublishingCredentialsEnabled();
-            if (!scmPolicyCheck) {
-                const accessToken = yield this._appService._client.getCredentials().getToken();
-                tl.debug("Kudu: using bearer token.");
-                return "Bearer " + accessToken;
+            let token = "";
+            let method = "";
+            if (scmPolicyCheck === false) {
+                token = yield this._appService._client.getCredentials().getToken();
+                method = "Bearer";
             }
-            const password = publishingCredentials.properties["publishingPassword"];
-            const userName = publishingCredentials.properties["publishingUserName"];
-            tl.setVariable(`AZURE_APP_SERVICE_KUDU_${this._appService.getSlot()}_PASSWORD`, password, true);
-            tl.debug("Kudu: using basic auth.");
-            const auth = (new Buffer(userName + ':' + password).toString('base64'));
-            return "Basic " + auth;
+            else {
+                tl.setVariable(`AZURE_APP_SERVICE_KUDU_${this._appService.getSlot()}_PASSWORD`, publishingCredentials.properties["publishingPassword"], true);
+                const buffer = new Buffer(publishingCredentials.properties["publishingUserName"] + ':' + publishingCredentials.properties["publishingPassword"]);
+                token = buffer.toString('base64');
+                method = "Basic";
+            }
+            const authMethodtelemetry = {
+                authMethod: method
+            };
+            tl.debug(`Using ${method} authentication method for Kudu service.`);
+            console.log("##vso[telemetry.publish area=TaskDeploymentMethod;feature=AzureAppServiceDeployment]" + JSON.stringify(authMethodtelemetry));
+            return method + " " + token;
         });
     }
     getPhysicalPath(virtualApplication) {
@@ -301,8 +308,8 @@ class AzureAppServiceUtility {
                 }
             }
             catch (error) {
-                tl.debug(`Skipping SCM Policy check: ${error}`);
-                return null;
+                tl.debug(`Call to get SCM Policy check failed: ${error}`);
+                return false;
             }
         });
     }

package/operations/AzureAppServiceUtility.ts

@@ -134,20 +134,26 @@ export class AzureAppServiceUtility {
     private async getKuduAuthHeader(publishingCredentials: any): Promise<string> {
         const scmPolicyCheck = await this.isSitePublishingCredentialsEnabled(); 
 
-        if (!scmPolicyCheck) {
-            const accessToken = await this._appService._client.getCredentials().getToken();
-            tl.debug("Kudu: using bearer token.");
-            return "Bearer " + accessToken;
+        let token = "";
+        let method = "";
+
+        if(scmPolicyCheck === false) {
+            token = await this._appService._client.getCredentials().getToken();
+            method = "Bearer";
+        } else {
+            tl.setVariable(`AZURE_APP_SERVICE_KUDU_${this._appService.getSlot()}_PASSWORD`, publishingCredentials.properties["publishingPassword"], true);
+            const buffer = new Buffer(publishingCredentials.properties["publishingUserName"] + ':' + publishingCredentials.properties["publishingPassword"]);
+            token = buffer.toString('base64');
+            method = "Basic";
         }
 
-        const password = publishingCredentials.properties["publishingPassword"];
-        const userName = publishingCredentials.properties["publishingUserName"];
+        const authMethodtelemetry = {
+            authMethod: method
+        };
+        tl.debug(`Using ${method} authentication method for Kudu service.`);
+        console.log("##vso[telemetry.publish area=TaskDeploymentMethod;feature=AzureAppServiceDeployment]" + JSON.stringify(authMethodtelemetry));
 
-        tl.setVariable(`AZURE_APP_SERVICE_KUDU_${this._appService.getSlot()}_PASSWORD`, password, true);
-        tl.debug("Kudu: using basic auth.");
-
-        const auth = (new Buffer(userName + ':' + password).toString('base64'));
-        return "Basic " + auth;
+        return method + " " + token;
     }
 
     public async getPhysicalPath(virtualApplication: string): Promise<string> {
@@ -309,8 +315,8 @@ export class AzureAppServiceUtility {
             }
         }
         catch(error){
-            tl.debug(`Skipping SCM Policy check: ${error}`);
-            return null;
+            tl.debug(`Call to get SCM Policy check failed: ${error}`);
+            return false;
         }
     }
     

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "azure-pipelines-tasks-azurermdeploycommon",
-    "version": "3.221.0",
+    "version": "3.221.2",
     "description": "Common Lib for Azure ARM REST apis",
     "repository": {
         "type": "git",