Merge master into feature/q-dev-execution

Author: aws-toolkit-automation

packages/amazonq/.changes/next-release/Bug Fix-771c645f-eeea-4da5-b2d2-4315dfad9506.json

@@ -0,0 +1,4 @@
+{
+    "type": "Bug Fix",
+    "description": "fixed device code detection when running auth through tunneled vscode"
+}

packages/core/src/auth/sso/ssoAccessTokenProvider.ts

@@ -38,7 +38,7 @@ import { getIdeProperties, isAmazonQ, isCloud9 } from '../../shared/extensionUti
 import { randomBytes, createHash } from 'crypto'
 import { localize } from '../../shared/utilities/vsCodeUtils'
 import { randomUUID } from '../../shared/crypto'
-import { isRemoteWorkspace, isWebWorkspace } from '../../shared/vscode/env'
+import { getExtRuntimeContext } from '../../shared/vscode/env'
 import { showInputBox } from '../../shared/ui/inputPrompter'
 import { AmazonQPromptSettings, DevSettings, PromptSettings, ToolkitPromptSettings } from '../../shared/settings'
 import { onceChanged } from '../../shared/utilities/functionUtils'
@@ -304,10 +304,10 @@ export abstract class SsoAccessTokenProvider {
              *
              * Since we are unable to serve the final authorization page
              */
-            return isRemoteWorkspace() || isWebWorkspace()
+            return getExtRuntimeContext().extensionHost === 'remote'
         }
     ) {
-        if (DevSettings.instance.get('webAuth', false) && isWebWorkspace()) {
+        if (DevSettings.instance.get('webAuth', false) && getExtRuntimeContext().extensionHost === 'webworker') {
             return new WebAuthorization(profile, cache, oidc, reAuthState)
         }
         if (useDeviceFlow()) {

packages/core/src/shared/vscode/env.ts

@@ -10,7 +10,7 @@ import * as os from 'os'
 import { getLogger } from '../logger'
 import { onceChanged } from '../utilities/functionUtils'
 import { ChildProcess } from '../utilities/processUtils'
-import { isWeb } from '../extensionGlobals'
+import globals, { isWeb } from '../extensionGlobals'
 
 /**
  * Returns true if the current build is running on CI (build server).
@@ -138,8 +138,33 @@ export function isWin(): boolean {
     return process.platform === 'win32'
 }
 
-export function isWebWorkspace(): boolean {
-    return vscode.env.uiKind === vscode.UIKind.Web
+const UIKind = {
+    [vscode.UIKind.Desktop]: 'desktop',
+    [vscode.UIKind.Web]: 'web',
+} as const
+export type ExtensionHostUI = (typeof UIKind)[keyof typeof UIKind]
+export type ExtensionHostLocation = 'local' | 'remote' | 'webworker'
+
+/**
+ * Detects where the ui and the extension host are running
+ */
+export function getExtRuntimeContext(): {
+    ui: ExtensionHostUI
+    extensionHost: ExtensionHostLocation
+} {
+    const extensionHost =
+        // taken from https://github.com/microsoft/vscode/blob/7c9e4bb23992c63f20cd86bbe7a52a3aa4bed89d/extensions/github-authentication/src/githubServer.ts#L121 to help determine which auth flows
+        // should be used
+        typeof navigator === 'undefined'
+            ? globals.context.extension.extensionKind === vscode.ExtensionKind.UI
+                ? 'local'
+                : 'remote'
+            : 'webworker'
+
+    return {
+        ui: UIKind[vscode.env.uiKind],
+        extensionHost,
+    }
 }
 
 export function getCodeCatalystProjectName(): string | undefined {

packages/toolkit/.changes/next-release/Bug Fix-9c15d2c5-6b28-42ae-b068-f71821acf62a.json

@@ -0,0 +1,4 @@
+{
+    "type": "Bug Fix",
+    "description": "fixed device code detection when running auth through tunneled vscode"
+}