Merge remote-tracking branch 'origin' into alex/sign-with-msbuild

microsoft · Aug 23, 2024 · ce8c8b0 · ce8c8b0
2 parents 205aa2e + 5fc8cb4
commit ce8c8b0
Show file tree

Hide file tree

Showing 37 changed files with 417 additions and 188 deletions.
diff --git a/appservice/package-lock.json b/appservice/package-lock.json
diff --git a/appsettings/package-lock.json b/appsettings/package-lock.json
diff --git a/auth/package-lock.json b/auth/package-lock.json
diff --git a/auth/package.json b/auth/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@microsoft/vscode-azext-azureauth",
     "author": "Microsoft Corporation",
-    "version": "2.4.1",
+    "version": "2.5.0",
     "description": "Azure authentication helpers for Visual Studio Code",
     "tags": [
         "azure",

diff --git a/auth/src/AzureAuthentication.ts b/auth/src/AzureAuthentication.ts
@@ -9,12 +9,19 @@ import type * as vscode from 'vscode';
  * Represents a means of obtaining authentication data for an Azure subscription.
  */
 export interface AzureAuthentication {
+    /**
+     * Gets a VS Code authentication session for an Azure subscription.
+     * Always uses the default scope, `https://management.azure.com/.default/` and respects `microsoft-sovereign-cloud.environment` setting.
+     *
+     * @returns A VS Code authentication session or undefined, if none could be obtained.
+     */
+    getSession(): vscode.ProviderResult<vscode.AuthenticationSession>;
     /**
      * Gets a VS Code authentication session for an Azure subscription.
      *
      * @param scopes - The scopes for which the authentication is needed.
      *
      * @returns A VS Code authentication session or undefined, if none could be obtained.
      */
-    getSession(scopes?: string[]): vscode.ProviderResult<vscode.AuthenticationSession>;
+    getSessionWithScopes(scopes: string[]): vscode.ProviderResult<vscode.AuthenticationSession>;
 }
diff --git a/auth/src/AzureDevOpsSubscriptionProvider.ts b/auth/src/AzureDevOpsSubscriptionProvider.ts
@@ -152,25 +152,26 @@ export class AzureDevOpsSubscriptionProvider implements AzureSubscriptionProvide
         }
 
         const accessToken = (await this._tokenCredential?.getToken("https://management.azure.com/.default"))?.token || '';
+        const getSession = () => {
+            return {
+                accessToken,
+                id: this._tokenCredential?.tenantId || '',
+                account: {
+                    id: this._tokenCredential?.tenantId || '',
+                    label: this._tokenCredential?.tenantId || '',
+                },
+                tenantId: this._tokenCredential?.tenantId || '',
+                scopes: scopes || [],
+            };
+        };
         return {
             client: new armSubs.SubscriptionClient(this._tokenCredential,),
             credential: this._tokenCredential,
             authentication: {
-                getSession: (_scopes: string[] | undefined) => {
-                    return {
-                        accessToken,
-                        id: this._tokenCredential?.tenantId || '',
-                        account: {
-                            id: this._tokenCredential?.tenantId || '',
-                            label: this._tokenCredential?.tenantId || '',
-                        },
-                        tenantId: this._tokenCredential?.tenantId || '',
-                        scopes: scopes || [],
-                    };
-
-                }
+                getSession,
+                getSessionWithScopes: getSession,
             }
-        };
+        }
     }
 
     public onDidSignIn: Event<void> = () => { return new Disposable(() => { /*empty*/ }) };

diff --git a/auth/src/VSCodeAzureSubscriptionProvider.ts b/auth/src/VSCodeAzureSubscriptionProvider.ts
@@ -260,7 +260,10 @@ export class VSCodeAzureSubscriptionProvider extends vscode.Disposable implement
             client: new armSubs.SubscriptionClient(credential, { endpoint }),
             credential: credential,
             authentication: {
-                getSession: () => session
+                getSession: () => session,
+                getSessionWithScopes: (scopes) => {
+                    return getSessionFromVSCode(scopes, tenantId, { createIfNone: false, silent: true })
+                },
             }
         };
     }

diff --git a/azure-pipelines/1esmain.yml b/azure-pipelines/1esmain.yml
@@ -6,6 +6,9 @@ parameters:
   - name: useAzureFederatedCredentials
     type: boolean
     default: false
+  - name: additionalSetupSteps
+    type: stepList
+    default: []
 
 # `resources` specifies the location of templates to pick up, use it to get 1ES templates
 resources:
@@ -31,4 +34,5 @@ extends:
       # Execute stages from the AzExt stages template
       - template: ./1esstages.yml
         parameters:
-          useAzureFederatedCredentials: ${{ parameters.useAzureFederatedCredentials }}
+          useAzureFederatedCredentials: ${{ parameters.useAzureFederatedCredentials }}
+          additionalSetupSteps: ${{ parameters.additionalSetupSteps }}