From 66df7adc662a08f552be4c39eb3925ad774b91ed Mon Sep 17 00:00:00 2001
From: gjsjohnmurray <johnm@georgejames.com>
Date: Thu, 20 Jan 2022 16:08:15 +0000
Subject: [PATCH 1/2] Allow serverForUri to return password for unnamed server
 (#837)

---
 src/extension.ts | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/extension.ts b/src/extension.ts
index 722b1bae..603cb26b 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -968,11 +968,22 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {
       const { apiTarget } = connectionTarget(uri);
       const api = new AtelierAPI(apiTarget);
 
-      // We explicitly no longer expose the password.
+      // We explicitly no longer expose the password for named servers.
       // API client extensions can use Server Manager 3's authentication provider to get this,
       // which will require user consent.
 
-      const { serverName, active, host = "", https, port, pathPrefix, username, ns = "", apiVersion } = api.config;
+      const {
+        serverName,
+        active,
+        host = "",
+        https,
+        port,
+        pathPrefix,
+        username,
+        password,
+        ns = "",
+        apiVersion,
+      } = api.config;
       return {
         serverName,
         active,
@@ -981,7 +992,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {
         port,
         pathPrefix,
         username,
-        password: undefined,
+        password: serverName === "" ? password : undefined,
         namespace: ns,
         apiVersion: active ? apiVersion : undefined,
       };

From 7e857aa28d17f98da2507ea478754d938f806319 Mon Sep 17 00:00:00 2001
From: gjsjohnmurray <johnm@georgejames.com>
Date: Wed, 26 Jan 2022 22:22:27 +0000
Subject: [PATCH 2/2] Restrict main CI's 'on release' action to master branch

---
 .github/workflows/main.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b10f4a8b..60a0d9d3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,6 +14,8 @@ on:
     branches:
       - master
   release:
+    branches:
+      - master
     types:
       - released
 jobs: