refactor using of XMLBuilder

.licenses/npm/xmlbuilder.dep.yml

@@ -1,24 +0,0 @@
----
-name: xmlbuilder
-version: 13.0.2
-type: npm
-summary: An XML builder for node.js
-homepage: http://github.com/oozcitak/xmlbuilder-js
-license: mit
-licenses:
-- sources: LICENSE
-  text: "The MIT License (MIT)\r\n\r\nCopyright (c) 2013 Ozgur Ozcitak\r\n\r\nPermission
-    is hereby granted, free of charge, to any person obtaining a copy\r\nof this software
-    and associated documentation files (the \"Software\"), to deal\r\nin the Software
-    without restriction, including without limitation the rights\r\nto use, copy,
-    modify, merge, publish, distribute, sublicense, and/or sell\r\ncopies of the Software,
-    and to permit persons to whom the Software is\r\nfurnished to do so, subject to
-    the following conditions:\r\n\r\nThe above copyright notice and this permission
-    notice shall be included in\r\nall copies or substantial portions of the Software.\r\n\r\nTHE
-    SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\r\nIMPLIED,
-    INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\r\nFITNESS FOR
-    A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\r\nAUTHORS OR
-    COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\r\nLIABILITY, WHETHER
-    IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\r\nOUT OF OR IN CONNECTION
-    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\r\nTHE SOFTWARE.\r\n"
-notices: []

package-lock.json

@@ -15,8 +15,7 @@
         "@actions/http-client": "^2.0.1",
         "@actions/io": "^1.0.2",
         "fast-xml-parser": "^4.0.10",
-        "semver": "^6.3.0",
+        "semver": "^6.3.0"
-        "xmlbuilder": "^13.0.2"
       },
       "devDependencies": {
         "@types/jest": "^27.0.2",
@@ -4673,14 +4672,6 @@
       "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
       "dev": true
     },
-    "node_modules/xmlbuilder": {
-      "version": "13.0.2",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-13.0.2.tgz",
-      "integrity": "sha512-Eux0i2QdDYKbdbA6AM6xE4m6ZTZr4G4xF9kahI2ukSEMCzwce2eX9WlTI5J3s+NU7hpasFsr8hWIONae7LluAQ==",
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
     "node_modules/xmlchars": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
@@ -8313,11 +8304,6 @@
       "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
       "dev": true
     },
-    "xmlbuilder": {
-      "version": "13.0.2",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-13.0.2.tgz",
-      "integrity": "sha512-Eux0i2QdDYKbdbA6AM6xE4m6ZTZr4G4xF9kahI2ukSEMCzwce2eX9WlTI5J3s+NU7hpasFsr8hWIONae7LluAQ=="
-    },
     "xmlchars": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",

package.json

@@ -30,8 +30,7 @@
     "@actions/http-client": "^2.0.1",
     "@actions/io": "^1.0.2",
     "fast-xml-parser": "^4.0.10",
-    "semver": "^6.3.0",
+    "semver": "^6.3.0"
-    "xmlbuilder": "^13.0.2"
   },
   "devDependencies": {
     "@types/jest": "^27.0.2",

src/authutil.ts

@@ -2,8 +2,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as core from '@actions/core';
 import * as github from '@actions/github';
-import * as xmlbuilder from 'xmlbuilder';
+import {XMLParser, XMLBuilder} from 'fast-xml-parser';
-import {XMLParser} from 'fast-xml-parser';
 
 export function configAuthentication(
   feedUrl: string,
@@ -49,7 +48,6 @@ function writeFeedToFile(
   core.info(
     `dotnet-auth: Finding any source references in ${existingFileLocation}, writing a new temporary configuration file with credentials to ${tempFileLocation}`
   );
-  let xml: xmlbuilder.XMLElement;
   let sourceKeys: string[] = [];
   let owner: string = core.getInput('owner');
   let sourceUrl: string = feedUrl;
@@ -103,24 +101,50 @@ function writeFeedToFile(
     }
   }
 
-  xml = xmlbuilder
+  const xmlSource: any[] = [
-    .create('configuration')
+    {
-    .ele('config')
+      '?xml version="1.0"': [
-    .ele('add', {key: 'defaultPushSource', value: sourceUrl})
+        {
-    .up()
+          '#text': ''
-    .up();
+        }
+      ]
+    },
+    {
+      configuration: [
+        {
+          config: [
+            {
+              add: [],
+              ':@': {
+                '@_key': 'defaultPushSource',
+                '@_value': sourceUrl
+              }
+            }
+          ]
+        }
+      ]
+    }
+  ];
 
   if (!sourceKeys.length) {
     let keystring = 'Source';
-    xml = xml
+
-      .ele('packageSources')
+    xmlSource[1].configuration.push({
-      .ele('add', {key: keystring, value: sourceUrl})
+      packageSources: [
-      .up()
+        {
-      .up();
+          add: [],
+          ':@': {
+            '@_key': keystring,
+            '@_value': sourceUrl
+          }
+        }
+      ]
+    });
+
     sourceKeys.push(keystring);
   }
-  xml = xml.ele('packageSourceCredentials');
 
+  const packageSourceCredentials: any[] = [];
   sourceKeys.forEach(key => {
     if (!isValidKey(key)) {
       throw new Error(
@@ -128,16 +152,24 @@ function writeFeedToFile(
       );
     }
 
-    xml = xml
+    packageSourceCredentials.push({
-      .ele(key)
+      [key]: [
-      .ele('add', {key: 'Username', value: owner})
+        {
-      .up()
+          add: [],
-      .ele('add', {
+          ':@': {
-        key: 'ClearTextPassword',
+            '@_key': 'Username',
-        value: process.env.NUGET_AUTH_TOKEN
+            '@_value': owner
-      })
+          }
-      .up()
+        },
-      .up();
+        {
+          add: [],
+          ':@': {
+            '@_key': 'ClearTextPassword',
+            '@_value': process.env.NUGET_AUTH_TOKEN
+          }
+        }
+      ]
+    });
   });
 
   // If NuGet fixes itself such that on Linux it can look for environment variables in the config file (it doesn't seem to work today),
@@ -146,6 +178,18 @@ function writeFeedToFile(
   //             ? '%NUGET_AUTH_TOKEN%'
   //             : '$NUGET_AUTH_TOKEN'
 
-  const output = xml.end({pretty: true});
+  const xmlBuilderOptions = {
+    format: true,
+    ignoreAttributes: false,
+    preserveOrder: true,
+    allowBooleanAttributes: true,
+    suppressBooleanAttributes: true,
+    suppressEmptyNode: true
+  };
+
+  const builder = new XMLBuilder(xmlBuilderOptions);
+
+  const output = builder.build(xmlSource);
+
   fs.writeFileSync(tempFileLocation, output);
 }