fix order or actions

Author: marcomura

src/atlclients/jiraAuthenticator.ts

@@ -1,23 +1,25 @@
 import { AccessibleResource, DetailedSiteInfo, OAuthProvider, ProductJira } from './authInfo';
+
 import { Authenticator } from './authenticator';
 import { CredentialManager } from './authStore';
-import { Container } from '../container';
 
 export class JiraAuthentictor implements Authenticator {
     public async getOAuthSiteDetails(
         provider: OAuthProvider,
         userId: string,
         resources: AccessibleResource[],
     ): Promise<DetailedSiteInfo[]> {
+        let newSites: DetailedSiteInfo[] = [];
+
         const apiUri = provider === OAuthProvider.JiraCloudStaging ? 'api.stg.atlassian.com' : 'api.atlassian.com';
 
         //TODO: [VSCODE-505] call serverInfo endpoint when it supports OAuth
         //const baseUrlString = await getJiraCloudBaseUrl(`https://${apiUri}/ex/jira/${newResource.id}/rest/2`, authInfo.access);
 
-        const newSites = resources.map(async (r) => {
+        newSites = resources.map((r) => {
             const credentialId = CredentialManager.generateCredentialId(ProductJira.key, userId);
 
-            const siteDetails: DetailedSiteInfo = {
+            return {
                 avatarUrl: r.avatarUrl,
                 baseApiUrl: `https://${apiUri}/ex/jira/${r.id}/rest`,
                 baseLinkUrl: r.url,
@@ -28,16 +30,10 @@ export class JiraAuthentictor implements Authenticator {
                 isCloud: true,
                 userId: userId,
                 credentialId: credentialId,
-                hasResolutionField: false,
+                hasResolutionField: false, // this field is populated in loginManager.ts
             };
-
-            const client = await Container.clientManager.jiraClient(siteDetails);
-            const fields = await client.getFields();
-            siteDetails.hasResolutionField = fields.some((f) => f.id === 'resolution');
-
-            return siteDetails;
         });
 
-        return await Promise.all(newSites);
+        return newSites;
     }
 }

src/atlclients/loginManager.ts

@@ -90,7 +90,13 @@ export class LoginManager {
 
             siteDetails.forEach(async (siteInfo) => {
                 await this._credentialManager.saveAuthInfo(siteInfo, oauthInfo);
+
+                const client = await Container.clientManager.jiraClient(siteInfo);
+                const fields = await client.getFields();
+                siteInfo.hasResolutionField = fields.some((f) => f.id === 'resolution');
+
                 this._siteManager.addSites([siteInfo]);
+
                 authenticatedEvent(siteInfo, isOnboarding).then((e) => {
                     this._analyticsClient.sendTrackEvent(e);
                 });
@@ -234,10 +240,6 @@ export class LoginManager {
         };
 
         if (site.product.key === ProductJira.key) {
-            const client = await Container.clientManager.jiraClient(siteDetails);
-            const fields = await client.getFields();
-            siteDetails.hasResolutionField = fields.some((f) => f.id === 'resolution');
-
             credentials.user = {
                 displayName: json.displayName,
                 id: userId,
@@ -254,6 +256,13 @@ export class LoginManager {
         }
 
         await this._credentialManager.saveAuthInfo(siteDetails, credentials);
+
+        if (site.product.key === ProductJira.key) {
+            const client = await Container.clientManager.jiraClient(siteDetails);
+            const fields = await client.getFields();
+            siteDetails.hasResolutionField = fields.some((f) => f.id === 'resolution');
+        }
+
         this._siteManager.addOrUpdateSite(siteDetails);
 
         return siteDetails;