From 14250c9ec86fbc44605a9f17f4a9602d5c6cdc94 Mon Sep 17 00:00:00 2001 From: eric sciple Date: Mon, 2 Mar 2020 12:14:07 -0500 Subject: [PATCH] . --- dist/index.js | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/dist/index.js b/dist/index.js index 6c02cc8fe..3a29067c6 100644 --- a/dist/index.js +++ b/dist/index.js @@ -5074,31 +5074,28 @@ var __importStar = (this && this.__importStar) || function (mod) { result["default"] = mod; return result; }; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); +const assert = __importStar(__webpack_require__(357)); const core = __importStar(__webpack_require__(470)); const fs = __importStar(__webpack_require__(747)); +const io = __importStar(__webpack_require__(1)); +const os = __importStar(__webpack_require__(87)); const path = __importStar(__webpack_require__(622)); -<<<<<<< HEAD -const IS_WINDOWS = process.platform === 'win32'; -const HOSTNAME = 'github.com'; -const EXTRA_HEADER_KEY = `http.https://${HOSTNAME}/.extraheader`; -======= const regexpHelper = __importStar(__webpack_require__(528)); const v4_1 = __importDefault(__webpack_require__(826)); const IS_WINDOWS = process.platform === 'win32'; const HOSTNAME = 'github.com'; ->>>>>>> fb16b51... add support for submodules function createAuthHelper(git, settings) { return new GitAuthHelper(git, settings); } exports.createAuthHelper = createAuthHelper; class GitAuthHelper { constructor(gitCommandManager, gitSourceSettings) { -<<<<<<< HEAD -======= this.tokenConfigKey = `http.https://${HOSTNAME}/.extraheader`; this.temporaryHomePath = ''; ->>>>>>> fb16b51... add support for submodules this.git = gitCommandManager; this.settings = gitSourceSettings || {}; // Token auth header @@ -5115,8 +5112,6 @@ class GitAuthHelper { yield this.configureToken(); }); } -<<<<<<< HEAD -======= configureGlobalAuth() { return __awaiter(this, void 0, void 0, function* () { // Create a temp home directory @@ -5175,15 +5170,11 @@ class GitAuthHelper { } }); } ->>>>>>> fb16b51... add support for submodules removeAuth() { return __awaiter(this, void 0, void 0, function* () { yield this.removeToken(); }); } -<<<<<<< HEAD - configureToken() { -======= removeGlobalAuth() { return __awaiter(this, void 0, void 0, function* () { core.info(`Unsetting HOME override`); @@ -5192,7 +5183,6 @@ class GitAuthHelper { }); } configureToken(configPath, globalConfig) { ->>>>>>> fb16b51... add support for submodules return __awaiter(this, void 0, void 0, function* () { // Validate args assert.ok((configPath && globalConfig) || (!configPath && !globalConfig), 'Unexpected configureToken parameter combinations'); @@ -5208,8 +5198,6 @@ class GitAuthHelper { yield this.replaceTokenPlaceholder(configPath || ''); }); } -<<<<<<< HEAD -======= replaceTokenPlaceholder(configPath) { return __awaiter(this, void 0, void 0, function* () { assert.ok(configPath, 'configPath is not defined'); @@ -5224,7 +5212,6 @@ class GitAuthHelper { yield fs.promises.writeFile(configPath, content); }); } ->>>>>>> fb16b51... add support for submodules removeToken() { return __awaiter(this, void 0, void 0, function* () { // HTTP extra header