Merge master into feature/amazonq

aws-toolkit-automation · web-flow · commit 47e759e1c37d · 2024-04-26T15:53:54.000-07:00
diff --git a/packages/core/src/codecatalyst/auth.ts b/packages/core/src/codecatalyst/auth.ts
@@ -375,9 +375,12 @@ export class CodeCatalystAuthenticationProvider {
         return this.memento.get(this.mementoKey, {} as Record<string, ConnectionState>)
     }
 
+    public tryGetConnectionState(conn: SsoConnection): ConnectionState | undefined {
+        return this.getStates()[conn.id]
+    }
     public getConnectionState(conn: SsoConnection): ConnectionState {
         return (
-            this.getStates()[conn.id] ?? {
+            this.tryGetConnectionState(conn) ?? {
                 onboarded: false,
                 scopeExpired: false,
             }
@@ -397,7 +400,7 @@ export class CodeCatalystAuthenticationProvider {
     }
 
     public async isConnectionOnboarded(conn: SsoConnection, recheck = false) {
-        const state = this.getConnectionState(conn)
+        const state = this.tryGetConnectionState(conn)
         if (state !== undefined && !recheck) {
             return state.onboarded
         }

Original file line number	Diff line number	Diff line change
`@@ -375,9 +375,12 @@ export class CodeCatalystAuthenticationProvider {`
`375`	`375`	`return this.memento.get(this.mementoKey, {} as Record<string, ConnectionState>)`
`376`	`376`	`}`
`377`	`377`
	`378`	`+ public tryGetConnectionState(conn: SsoConnection): ConnectionState \| undefined {`
	`379`	`+ return this.getStates()[conn.id]`
	`380`	`+ }`
`378`	`381`	`public getConnectionState(conn: SsoConnection): ConnectionState {`
`379`	`382`	`return (`
`380`		`- this.getStates()[conn.id] ?? {`
	`383`	`+ this.tryGetConnectionState(conn) ?? {`
`381`	`384`	`onboarded: false,`
`382`	`385`	`scopeExpired: false,`
`383`	`386`	`}`
`@@ -397,7 +400,7 @@ export class CodeCatalystAuthenticationProvider {`
`397`	`400`	`}`
`398`	`401`
`399`	`402`	`public async isConnectionOnboarded(conn: SsoConnection, recheck = false) {`
`400`		`- const state = this.getConnectionState(conn)`
	`403`	`+ const state = this.tryGetConnectionState(conn)`
`401`	`404`	`if (state !== undefined && !recheck) {`
`402`	`405`	`return state.onboarded`
`403`	`406`	`}`