Merge master into feature/dynamodb

Author: aws-toolkit-automation

packages/amazonq/.changes/next-release/Feature-273f3647-0ce0-48ad-874a-a9614447a18d.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Add notification for extended session to IdC users"
+}

packages/amazonq/package.json

@@ -106,6 +106,10 @@
                         "amazonQWelcomePage": {
                             "type": "boolean",
                             "default": false
+                        },
+                        "amazonQSessionConfigurationMessage": {
+                            "type": "boolean",
+                            "default": false
                         }
                     },
                     "additionalProperties": false

packages/core/src/codewhisperer/activation.ts

@@ -302,6 +302,9 @@ export async function activate(context: ExtContext): Promise<void> {
             const defaulMsg = localize('AWS.generic.message.error', 'Failed to reauth:')
             void logAndShowError(localize, e, 'showReauthenticatePrompt', defaulMsg)
         })
+        if (auth.isEnterpriseSsoInUse()) {
+            await auth.notifySessionConfiguration()
+        }
     }
     if (auth.isValidEnterpriseSsoInUse()) {
         await notifyNewCustomizations()

packages/core/src/codewhisperer/util/authUtil.ts

@@ -36,6 +36,9 @@ import { showReauthenticateMessage } from '../../shared/utilities/messages'
 import { showAmazonQWalkthroughOnce } from '../../amazonq/onboardingPage/walkthrough'
 import { setContext } from '../../shared/vscode/setContext'
 import { isInDevEnv } from '../../shared/vscode/env'
+import { openUrl } from '../../shared/utilities/vsCodeUtils'
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
 import { telemetry } from '../../shared/telemetry/telemetry'
 
 /** Backwards compatibility for connections w pre-chat scopes */
@@ -345,6 +348,38 @@ export class AuthUtil {
         }
     }
 
+    public async notifySessionConfiguration() {
+        const suppressId = 'amazonQSessionConfigurationMessage'
+        const settings = AmazonQPromptSettings.instance
+        const shouldShow = await settings.isPromptEnabled(suppressId)
+        if (!shouldShow) {
+            return
+        }
+
+        const message = localize(
+            'aws.amazonq.sessionConfiguration.message',
+            'Your maximum session length for Amazon Q can be extended to 90 days by your administrator. For more information, refer to How to extend the session duration for Amazon Q in the IDE in the IAM Identity Center User Guide.'
+        )
+
+        const learnMoreUrl = vscode.Uri.parse(
+            'https://docs.aws.amazon.com/singlesignon/latest/userguide/configure-user-session.html#90-day-extended-session-duration'
+        )
+        await telemetry.toolkit_showNotification.run(async () => {
+            telemetry.record({ id: 'sessionExtension' })
+            void vscode.window.showInformationMessage(message, localizedText.learnMore).then(async (resp) => {
+                await telemetry.toolkit_invokeAction.run(async () => {
+                    if (resp === localizedText.learnMore) {
+                        telemetry.record({ action: 'learnMore' })
+                        await openUrl(learnMoreUrl)
+                    } else {
+                        telemetry.record({ action: 'dismissSessionExtensionNotification' })
+                    }
+                    await settings.disablePrompt(suppressId)
+                })
+            })
+        })
+    }
+
     public async notifyReauthenticate(isAutoTrigger?: boolean) {
         void this.showReauthenticatePrompt(isAutoTrigger)
         await this.setVscodeContextProps()

packages/core/src/shared/settings-amazonq.gen.ts

@@ -15,7 +15,8 @@ export const amazonqSettings = {
         "createCredentialsProfile": {},
         "codeWhispererNewWelcomeMessage": {},
         "codeWhispererConnectionExpired": {},
-        "amazonQWelcomePage": {}
+        "amazonQWelcomePage": {},
+        "amazonQSessionConfigurationMessage": {}
     },
     "amazonQ.showInlineCodeSuggestionsWithCodeReferences": {},
     "amazonQ.importRecommendationForInlineCodeSuggestions": {},