From a6f6cd4a19b25c26cbc36386719186a7e3c31fea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20F=C3=BCllemann?= <marco.fuellemann@edorex.ch>
Date: Fri, 4 Feb 2022 14:28:00 +0100
Subject: [PATCH 1/2] patch: fix flashing from URL when using basic auth

---
 lib/gui/app/components/source-selector/source-selector.tsx | 2 ++
 lib/gui/modules/child-writer.ts                            | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/gui/app/components/source-selector/source-selector.tsx b/lib/gui/app/components/source-selector/source-selector.tsx
index 3f0b193d..d6fdc637 100644
--- a/lib/gui/app/components/source-selector/source-selector.tsx
+++ b/lib/gui/app/components/source-selector/source-selector.tsx
@@ -315,6 +315,7 @@ export interface SourceMetadata extends sourceDestination.Metadata {
 	drive?: DrivelistDrive;
 	extension?: string;
 	archiveExtension?: string;
+	auth?: Authentication;
 }
 
 interface SourceSelectorProps {
@@ -529,6 +530,7 @@ export class SourceSelector extends React.Component<
 				}
 
 				if (metadata !== undefined) {
+					metadata.auth = auth;
 					selectionState.selectSource(metadata);
 					analytics.logEvent('Select image', {
 						// An easy way so we can quickly identify if we're making use of
diff --git a/lib/gui/modules/child-writer.ts b/lib/gui/modules/child-writer.ts
index b517ba18..24630c77 100644
--- a/lib/gui/modules/child-writer.ts
+++ b/lib/gui/modules/child-writer.ts
@@ -291,9 +291,14 @@ ipc.connectTo(IPC_SERVER_ID, () => {
 							url: imagePathObject.url,
 							avoidRandomAccess: true,
 							axiosInstance: axios.create(_.omit(imagePathObject, ['url'])),
+							auth: options.image.auth,
 						});
 					} else {
-						source = new Http({ url: imagePath, avoidRandomAccess: true });
+						source = new Http({
+							url: imagePath,
+							avoidRandomAccess: true,
+							auth: options.image.auth,
+						});
 					}
 				}
 			}

From 7a012a92bc2a6458d5c1e56c2a09113b8c1395e9 Mon Sep 17 00:00:00 2001
From: Balena CI <34882892+balena-ci@users.noreply.github.com>
Date: Mon, 21 Feb 2022 15:19:52 +0200
Subject: [PATCH 2/2] v1.7.5

---
 .versionbot/CHANGELOG.yml | 10 ++++++++++
 CHANGELOG.md              |  5 +++++
 package-lock.json         |  2 +-
 package.json              |  4 ++--
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/.versionbot/CHANGELOG.yml b/.versionbot/CHANGELOG.yml
index 74a0d9c8..04981526 100644
--- a/.versionbot/CHANGELOG.yml
+++ b/.versionbot/CHANGELOG.yml
@@ -1,3 +1,13 @@
+- commits:
+    - subject: "patch: fix flashing from URL when using basic auth"
+      hash: a6f6cd4a19b25c26cbc36386719186a7e3c31fea
+      body: ""
+      footer: {}
+      author: Marco Füllemann
+      nested: []
+  version: 1.7.5
+  title: "'patch: fix flashing from URL when using basic auth'"
+  date: 2022-02-21T12:39:38.276Z
 - commits:
     - subject: "patch: set version update notification 1.7.3"
       hash: 28adc34239f9abc7ccfe13f2810991ca0f17a645
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53d92eac..43f8c4b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,11 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+# v1.7.5
+## (2022-02-21)
+
+* patch: fix flashing from URL when using basic auth [Marco Füllemann]
+
 # v1.7.4
 ## (2022-02-21)
 
diff --git a/package-lock.json b/package-lock.json
index 26fb68aa..d7447451 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "balena-etcher",
-  "version": "1.7.4",
+  "version": "1.7.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index d7e15414..5cc6350e 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "balena-etcher",
   "private": true,
   "displayName": "balenaEtcher",
-  "version": "1.7.4",
+  "version": "1.7.5",
   "packageType": "local",
   "main": "generated/etcher.js",
   "description": "Flash OS images to SD cards and USB drives, safely and easily.",
@@ -116,6 +116,6 @@
     "webpack-dev-server": "4.5.0"
   },
   "versionist": {
-    "publishedAt": "2022-02-21T08:33:45.910Z"
+    "publishedAt": "2022-02-21T12:39:38.813Z"
   }
 }