@forge/cli-shared 8.3.1-next.2 → 8.3.1-next.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @forge/cli-shared
 
+## 8.3.1-next.3
+
+### Patch Changes
+
+- d77aea3: Cache credentials in credential store
+
 ## 8.3.1-next.2
 
 ### Patch Changes

package/out/auth/personal/credential-store.d.ts

@@ -43,6 +43,7 @@ export declare class CredentialStoreImpl implements CredentialStore {
     private readonly cachedConfig;
     private readonly userRepository;
     private keytarAccount;
+    private cached;
     constructor(logger: Logger, instructionsURL: string, keytar: Keytar | null, cachedConfig: CachedConf, userRepository: UserRepository);
     private wrapKeytarError;
     decodeCredentials(credentialsString: string | null): PersonalApiCredentialsValidated;

package/out/auth/personal/credential-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"credential-store.d.ts","sourceRoot":"","sources":["../../../src/auth/personal/credential-store.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,CAAC,MAAM,OAAO,CAAC;AAC3B,OAAO,EAAuB,UAAU,EAAE,MAAM,aAAa,CAAC;AAG9D,OAAO,EAAE,SAAS,EAAa,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,MAAM,EAAQ,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,eAAO,MAAM,SAAS,gBAAgB,CAAC;AACvC,eAAO,MAAM,aAAa,oBAAoB,CAAC;AAa/C,MAAM,WAAW,MAAM;IACrB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAEtE,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE/E,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACjE;AAUD,eAAO,MAAM,2BAA2B;;;EAGtC,CAAC;AAEH,eAAO,MAAM,oCAAoC;;;;EAI/C,CAAC;AAEH,oBAAY,sBAAsB,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,2BAA2B,CAAC,CAAC;AAClF,oBAAY,+BAA+B,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,oCAAoC,CAAC,CAAC;AAEpG,qBAAa,mBAAoB,SAAQ,SAAS;;CAIjD;AAED,qBAAa,aAAc,SAAQ,SAAS;;CAI3C;AAED,qBAAa,iBAAkB,SAAQ,SAAS;CAAG;AAEnD,MAAM,WAAW,gBAAgB;IAC/B,cAAc,IAAI,OAAO,CAAC,+BAA+B,CAAC,CAAC;CAC5D;AAED,MAAM,WAAW,eAAgB,SAAQ,gBAAgB;IACvD,cAAc,CAAC,WAAW,EAAE,+BAA+B,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5E,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACpC;AAED,qBAAa,mBAAoB,YAAW,eAAe;IAIvD,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAPjC,OAAO,CAAC,aAAa,CAAS;gBAGX,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,YAAY,EAAE,UAAU,EACxB,cAAc,EAAE,cAAc;IAKjD,OAAO,CAAC,eAAe;IAoBvB,iBAAiB,CAAC,iBAAiB,EAAE,MAAM,GAAG,IAAI,GAAG,+BAA+B;IAoB9E,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,+BAA+B,GAAG,SAAS,CAAC;IAehG,+BAA+B,IAAI,+BAA+B,GAAG,SAAS;IAS9E,kCAAkC,IAAI,IAAI;IAIpC,cAAc,IAAI,OAAO,CAAC,+BAA+B,CAAC;IA8B1D,cAAc,CAAC,WAAW,EAAE,+BAA+B,GAAG,OAAO,CAAC,IAAI,CAAC;IAY3E,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;CAWzC;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,cAAc,GAAG,eAAe,CAKlG"}
+{"version":3,"file":"credential-store.d.ts","sourceRoot":"","sources":["../../../src/auth/personal/credential-store.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,CAAC,MAAM,OAAO,CAAC;AAC3B,OAAO,EAAuB,UAAU,EAAE,MAAM,aAAa,CAAC;AAG9D,OAAO,EAAE,SAAS,EAAa,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,MAAM,EAAQ,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,eAAO,MAAM,SAAS,gBAAgB,CAAC;AACvC,eAAO,MAAM,aAAa,oBAAoB,CAAC;AAa/C,MAAM,WAAW,MAAM;IACrB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAEtE,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE/E,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACjE;AAUD,eAAO,MAAM,2BAA2B;;;EAGtC,CAAC;AAEH,eAAO,MAAM,oCAAoC;;;;EAI/C,CAAC;AAEH,oBAAY,sBAAsB,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,2BAA2B,CAAC,CAAC;AAClF,oBAAY,+BAA+B,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,oCAAoC,CAAC,CAAC;AAEpG,qBAAa,mBAAoB,SAAQ,SAAS;;CAIjD;AAED,qBAAa,aAAc,SAAQ,SAAS;;CAI3C;AAED,qBAAa,iBAAkB,SAAQ,SAAS;CAAG;AAEnD,MAAM,WAAW,gBAAgB;IAC/B,cAAc,IAAI,OAAO,CAAC,+BAA+B,CAAC,CAAC;CAC5D;AAED,MAAM,WAAW,eAAgB,SAAQ,gBAAgB;IACvD,cAAc,CAAC,WAAW,EAAE,+BAA+B,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5E,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACpC;AAED,qBAAa,mBAAoB,YAAW,eAAe;IAKvD,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,cAAc;IARjC,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,MAAM,CAAgD;gBAG3C,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,YAAY,EAAE,UAAU,EACxB,cAAc,EAAE,cAAc;IAKjD,OAAO,CAAC,eAAe;IAoBvB,iBAAiB,CAAC,iBAAiB,EAAE,MAAM,GAAG,IAAI,GAAG,+BAA+B;IAoB9E,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,+BAA+B,GAAG,SAAS,CAAC;IAehG,+BAA+B,IAAI,+BAA+B,GAAG,SAAS;IAS9E,kCAAkC,IAAI,IAAI;IAIpC,cAAc,IAAI,OAAO,CAAC,+BAA+B,CAAC;IAoC1D,cAAc,CAAC,WAAW,EAAE,+BAA+B,GAAG,OAAO,CAAC,IAAI,CAAC;IAa3E,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;CAYzC;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,cAAc,GAAG,eAAe,CAKlG"}

package/out/auth/personal/credential-store.js

@@ -61,6 +61,7 @@ class CredentialStoreImpl {
     cachedConfig;
     userRepository;
     keytarAccount;
+    cached = null;
     constructor(logger, instructionsURL, keytar, cachedConfig, userRepository) {
         this.logger = logger;
         this.instructionsURL = instructionsURL;
@@ -130,6 +131,10 @@ class CredentialStoreImpl {
         this.cachedConfig.delete(CACHE_CREDENTIALS_KEY);
     }
     async getCredentials() {
+        if (this.cached) {
+            return this.cached;
+        }
+        let result;
         const plaintextCredentials = this.popInsecurePlaintextCredentials();
         if (plaintextCredentials) {
             if (this.keytar) {
@@ -146,17 +151,19 @@ class CredentialStoreImpl {
                 token: process.env[exports.API_TOKEN_KEY]
             };
             const { accountId } = await this.userRepository.getUser(credentials);
-            return { ...credentials, accountId };
+            result = { ...credentials, accountId };
         }
-        if (this.keytar) {
-            const result = await this.getCredentialsKeytar(this.keytar);
-            if (result) {
-                return result;
-            }
+        else if (this.keytar) {
+            result = await this.getCredentialsKeytar(this.keytar);
+        }
+        if (result) {
+            this.cached = result;
+            return result;
         }
         throw new NoTokenInStoreError();
     }
     async setCredentials(credentials) {
+        this.cached = null;
         if (this.keytar) {
             try {
                 await this.keytar.setPassword(KEYTAR_SERVICE, this.keytarAccount, JSON.stringify(credentials));
@@ -170,6 +177,7 @@ class CredentialStoreImpl {
         }
     }
     async deleteCredentials() {
+        this.cached = null;
         if (this.keytar) {
             try {
                 await this.keytar.deletePassword(KEYTAR_SERVICE, this.keytarAccount);

package/out/graphql/graphql-types.d.ts

@@ -1734,6 +1734,41 @@ export declare type AgentStudioTeamsChannelDetails = {
     channelName?: Maybe<Scalars['String']['output']>;
     channelUrl?: Maybe<Scalars['String']['output']>;
 };
+export declare type AgentStudioTool = {
+    __typename?: 'AgentStudioTool';
+    description?: Maybe<Scalars['String']['output']>;
+    displayName?: Maybe<Scalars['String']['output']>;
+    iconUrl?: Maybe<Scalars['String']['output']>;
+    id: Scalars['ID']['output'];
+    integrationKey?: Maybe<Scalars['String']['output']>;
+};
+export declare type AgentStudioToolEdge = {
+    __typename?: 'AgentStudioToolEdge';
+    cursor?: Maybe<Scalars['String']['output']>;
+    node?: Maybe<AgentStudioTool>;
+};
+export declare type AgentStudioToolIntegration = {
+    __typename?: 'AgentStudioToolIntegration';
+    displayName?: Maybe<Scalars['String']['output']>;
+    iconUrl?: Maybe<Scalars['String']['output']>;
+    id: Scalars['ID']['output'];
+    integrationKey?: Maybe<Scalars['String']['output']>;
+};
+export declare type AgentStudioToolIntegrationEdge = {
+    __typename?: 'AgentStudioToolIntegrationEdge';
+    cursor?: Maybe<Scalars['String']['output']>;
+    node?: Maybe<AgentStudioToolIntegration>;
+};
+export declare type AgentStudioToolIntegrationsConnection = {
+    __typename?: 'AgentStudioToolIntegrationsConnection';
+    edges?: Maybe<Array<AgentStudioToolIntegrationEdge>>;
+    pageInfo?: Maybe<PageInfo>;
+};
+export declare type AgentStudioToolsConnection = {
+    __typename?: 'AgentStudioToolsConnection';
+    edges?: Maybe<Array<AgentStudioToolEdge>>;
+    pageInfo?: Maybe<PageInfo>;
+};
 export declare type AgentStudioUpdateAgentActionsPayload = Payload & {
     __typename?: 'AgentStudioUpdateAgentActionsPayload';
     agent?: Maybe<AgentStudioAgent>;
@@ -23880,7 +23915,7 @@ export declare type ExternalAssociationEdge = {
     cursor?: Maybe<Scalars['String']['output']>;
     node?: Maybe<ExternalAssociation>;
 };
-export declare type ExternalAssociationEntity = DevOpsService | ExternalBranch | ExternalBuildInfo | ExternalCalendarEvent | ExternalComment | ExternalCommit | ExternalConversation | ExternalCustomerOrg | ExternalDeal | ExternalDeployment | ExternalDesign | ExternalDocument | ExternalFeatureFlag | ExternalMessage | ExternalOrganisation | ExternalPosition | ExternalProject | ExternalPullRequest | ExternalRemoteLink | ExternalRepository | ExternalSoftwareService | ExternalSpace | ExternalTest | ExternalTestExecution | ExternalTestRun | ExternalVideo | ExternalVulnerability | ExternalWorkItem | ExternalWorker | JiraIssue | JiraProject | JiraVersion | ThirdPartyUser;
+export declare type ExternalAssociationEntity = DevOpsService | ExternalBranch | ExternalBuildInfo | ExternalCalendarEvent | ExternalComment | ExternalCommit | ExternalConversation | ExternalCustomerOrg | ExternalDeal | ExternalDeployment | ExternalDesign | ExternalDocument | ExternalFeatureFlag | ExternalMessage | ExternalOrganisation | ExternalPosition | ExternalProject | ExternalPullRequest | ExternalRemoteLink | ExternalRepository | ExternalSoftwareService | ExternalSpace | ExternalTest | ExternalTestExecution | ExternalTestPlan | ExternalTestRun | ExternalVideo | ExternalVulnerability | ExternalWorkItem | ExternalWorker | JiraIssue | JiraProject | JiraVersion | ThirdPartyUser;
 export declare type ExternalAttachment = {
     __typename?: 'ExternalAttachment';
     byteSize?: Maybe<Scalars['Long']['output']>;
@@ -24377,13 +24412,14 @@ export declare type ExternalEntities = {
     space?: Maybe<Array<Maybe<ExternalSpace>>>;
     test?: Maybe<Array<Maybe<ExternalTest>>>;
     testExecution?: Maybe<Array<Maybe<ExternalTestExecution>>>;
+    testPlan?: Maybe<Array<Maybe<ExternalTestPlan>>>;
     testRun?: Maybe<Array<Maybe<ExternalTestRun>>>;
     video?: Maybe<Array<Maybe<ExternalVideo>>>;
     vulnerability?: Maybe<Array<Maybe<ExternalVulnerability>>>;
     workItem?: Maybe<Array<Maybe<ExternalWorkItem>>>;
     worker?: Maybe<Array<Maybe<ExternalWorker>>>;
 };
-export declare type ExternalEntity = ExternalBranch | ExternalBuildInfo | ExternalCalendarEvent | ExternalComment | ExternalCommit | ExternalConversation | ExternalCustomerOrg | ExternalDeal | ExternalDeployment | ExternalDesign | ExternalDocument | ExternalFeatureFlag | ExternalMessage | ExternalOrganisation | ExternalPosition | ExternalProject | ExternalPullRequest | ExternalRemoteLink | ExternalRepository | ExternalSoftwareService | ExternalSpace | ExternalTest | ExternalTestExecution | ExternalTestRun | ExternalVideo | ExternalVulnerability | ExternalWorkItem | ExternalWorker;
+export declare type ExternalEntity = ExternalBranch | ExternalBuildInfo | ExternalCalendarEvent | ExternalComment | ExternalCommit | ExternalConversation | ExternalCustomerOrg | ExternalDeal | ExternalDeployment | ExternalDesign | ExternalDocument | ExternalFeatureFlag | ExternalMessage | ExternalOrganisation | ExternalPosition | ExternalProject | ExternalPullRequest | ExternalRemoteLink | ExternalRepository | ExternalSoftwareService | ExternalSpace | ExternalTest | ExternalTestExecution | ExternalTestPlan | ExternalTestRun | ExternalVideo | ExternalVulnerability | ExternalWorkItem | ExternalWorker;
 export declare type ExternalEnvironment = {
     __typename?: 'ExternalEnvironment';
     displayName?: Maybe<Scalars['String']['output']>;
@@ -24829,6 +24865,25 @@ export declare type ExternalTestInfo = {
     numberSkipped?: Maybe<Scalars['Int']['output']>;
     totalNumber?: Maybe<Scalars['Int']['output']>;
 };
+export declare type ExternalTestPlan = Node & {
+    __typename?: 'ExternalTestPlan';
+    associatedWith?: Maybe<ExternalAssociationConnection>;
+    createdAt?: Maybe<Scalars['String']['output']>;
+    createdBy?: Maybe<ExternalUser>;
+    displayName?: Maybe<Scalars['String']['output']>;
+    externalId?: Maybe<Scalars['String']['output']>;
+    id: Scalars['ID']['output'];
+    lastUpdated?: Maybe<Scalars['String']['output']>;
+    lastUpdatedBy?: Maybe<ExternalUser>;
+    owners?: Maybe<Array<Maybe<ExternalUser>>>;
+    parent?: Maybe<ExternalEntity>;
+    parentId?: Maybe<Scalars['ID']['output']>;
+    provider?: Maybe<ExternalProvider>;
+    thirdPartyId?: Maybe<Scalars['String']['output']>;
+    thumbnail?: Maybe<ExternalThumbnail>;
+    updateSequenceNumber?: Maybe<Scalars['Long']['output']>;
+    url?: Maybe<Scalars['String']['output']>;
+};
 export declare type ExternalTestRun = Node & {
     __typename?: 'ExternalTestRun';
     assignee?: Maybe<ExternalUser>;
@@ -60462,11 +60517,11 @@ export declare type JiraFieldSchemeAssociatedFieldsEdge = {
     node?: Maybe<JiraFieldSchemeAssociatedField>;
 };
 export declare type JiraFieldSchemeAssociatedFieldsInput = {
-    nameFilter?: InputMaybe<Scalars['String']['input']>;
+    nameOrDescriptionFilter?: InputMaybe<Scalars['String']['input']>;
     schemeId: Scalars['ID']['input'];
 };
 export declare type JiraFieldSchemeAvailableFieldsInput = {
-    nameFilter?: InputMaybe<Scalars['String']['input']>;
+    nameOrDescriptionFilter?: InputMaybe<Scalars['String']['input']>;
     schemeId: Scalars['ID']['input'];
 };
 export declare type JiraFieldSchemePayload = Payload & {
@@ -88279,6 +88334,8 @@ export declare type Query = {
     agentStudio_scenarioListByContainerId?: Maybe<AgentStudioScenariosResult>;
     agentStudio_scenariosByIds?: Maybe<Array<Maybe<AgentStudioScenario>>>;
     agentStudio_suggestConversationStarters?: Maybe<AgentStudioSuggestConversationStartersResult>;
+    agentStudio_toolIntegrations?: Maybe<AgentStudioToolIntegrationsConnection>;
+    agentStudio_tools?: Maybe<AgentStudioToolsConnection>;
     agentStudio_validateScenario?: Maybe<AgentStudioScenarioValidationPayload>;
     agentStudio_validateScenarios?: Maybe<AgentStudioScenarioValidateModeOutput>;
     aiCoreApi_vsaQuestionsByProject?: Maybe<AiCoreApiVsaQuestionsResult>;
@@ -88990,6 +89047,18 @@ export declare type QueryAgentStudio_SuggestConversationStartersArgs = {
     cloudId: Scalars['String']['input'];
     input: AgentStudioSuggestConversationStartersInput;
 };
+export declare type QueryAgentStudio_ToolIntegrationsArgs = {
+    after?: InputMaybe<Scalars['String']['input']>;
+    cloudId: Scalars['String']['input'];
+    first?: InputMaybe<Scalars['Int']['input']>;
+};
+export declare type QueryAgentStudio_ToolsArgs = {
+    after?: InputMaybe<Scalars['String']['input']>;
+    cloudId: Scalars['String']['input'];
+    first?: InputMaybe<Scalars['Int']['input']>;
+    integrationKeys?: InputMaybe<Array<InputMaybe<Scalars['String']['input']>>>;
+    searchQuery?: InputMaybe<Scalars['String']['input']>;
+};
 export declare type QueryAgentStudio_ValidateScenarioArgs = {
     cloudId: Scalars['String']['input'];
     containerId: Scalars['ID']['input'];