Polish sign in again for projects (#5355)

src/github/credentials.ts

@@ -54,12 +54,15 @@ export class CredentialStore implements vscode.Disposable {
 	private _isInitialized: boolean = false;
 	private _onDidInitialize: vscode.EventEmitter<void> = new vscode.EventEmitter();
 	public readonly onDidInitialize: vscode.Event<void> = this._onDidInitialize.event;
-	private _scopes: string[] = SCOPES;
+	private _scopes: string[] = SCOPES_OLD;
 	private _scopesEnterprise: string[] = SCOPES_OLD;
 
 	private _onDidGetSession: vscode.EventEmitter<void> = new vscode.EventEmitter();
 	public readonly onDidGetSession = this._onDidGetSession.event;
 
+	private _onDidUpgradeSession: vscode.EventEmitter<void> = new vscode.EventEmitter();
+	public readonly onDidUpgradeSession = this._onDidUpgradeSession.event;
+
 	constructor(private readonly _telemetry: ITelemetry, private readonly context: vscode.ExtensionContext) {
 		this.setScopesFromState();
 
@@ -88,8 +91,8 @@ export class CredentialStore implements vscode.Disposable {
 	}
 
 	private setScopesFromState() {
-		this._scopes = this.context.globalState.get(LAST_USED_SCOPES_GITHUB_KEY, SCOPES);
-		this._scopesEnterprise = this.context.globalState.get(LAST_USED_SCOPES_ENTERPRISE_KEY, SCOPES);
+		this._scopes = this.context.globalState.get(LAST_USED_SCOPES_GITHUB_KEY, SCOPES_OLD);
+		this._scopesEnterprise = this.context.globalState.get(LAST_USED_SCOPES_ENTERPRISE_KEY, SCOPES_OLD);
 	}
 
 	private async saveScopesInState() {
@@ -111,7 +114,7 @@ export class CredentialStore implements vscode.Disposable {
 
 		let session: vscode.AuthenticationSession | undefined = undefined;
 		let isNew: boolean = false;
-		let usedScopes: string[] | undefined = SCOPES;
+		let usedScopes: string[] | undefined = SCOPES_OLD;
 		const oldScopes = this._scopes;
 		const oldEnterpriseScopes = this._scopesEnterprise;
 		const authResult: AuthResult = { canceled: false };
@@ -243,6 +246,9 @@ export class CredentialStore implements vscode.Disposable {
 	public async getHubEnsureAdditionalScopes(authProviderId: AuthProvider): Promise<GitHub | undefined> {
 		const hasScopesAlready = this.isAuthenticatedWithAdditionalScopes(authProviderId);
 		await this.initialize(authProviderId, { createIfNone: !hasScopesAlready }, SCOPES_WITH_ADDITIONAL, true);
+		if (!hasScopesAlready) {
+			this._onDidUpgradeSession.fire();
+		}
 		return this.getHub(authProviderId);
 	}
 
@@ -355,8 +361,8 @@ export class CredentialStore implements vscode.Disposable {
 			return { session: existingSession.session, isNew: false, scopes: existingSession.scopes };
 		}
 
-		const session = await vscode.authentication.getSession(authProviderId, requireScopes ? scopes : SCOPES, getAuthSessionOptions);
-		return { session, isNew: !!session, scopes: requireScopes ? scopes : SCOPES };
+		const session = await vscode.authentication.getSession(authProviderId, requireScopes ? scopes : SCOPES_OLD, getAuthSessionOptions);
+		return { session, isNew: !!session, scopes: requireScopes ? scopes : SCOPES_OLD };
 	}
 
 	private async findExistingScopes(authProviderId: AuthProvider): Promise<{ session: vscode.AuthenticationSession, scopes: string[] } | undefined> {

src/github/interface.ts

@@ -141,7 +141,7 @@ export interface Issue {
 	updatedAt: string;
 	user: IAccount;
 	labels: ILabel[];
-	projectItems: IProjectItem[];
+	projectItems?: IProjectItem[];
 	milestone?: IMilestone;
 	repositoryOwner?: string;
 	repositoryName?: string;

src/github/issueModel.ts

@@ -291,7 +291,7 @@ export class IssueModel<TItem extends Issue = Issue> {
 						},
 					},
 				})));
-			this.item.projectItems = this.item.projectItems.filter(project => !projectItems.find(p => p.project.id === project.project.id));
+			this.item.projectItems = this.item.projectItems?.filter(project => !projectItems.find(p => p.project.id === project.project.id));
 		} catch (err) {
 			Logger.error(err, IssueModel.ID);
 		}
@@ -311,14 +311,17 @@ export class IssueModel<TItem extends Issue = Issue> {
 						},
 					},
 				})));
+			if (!this.item.projectItems) {
+				this.item.projectItems = [];
+			}
 			this.item.projectItems.push(...projects.map((project, index) => { return { project, id: itemIds[index].data!.addProjectV2ItemById.item.id }; }));
 		} catch (err) {
 			Logger.error(err, IssueModel.ID);
 		}
 	}
 
-	async updateProjects(projects: IProject[]): Promise<IProjectItem[]> {
-		const projectsToAdd: IProject[] = projects.filter(project => !this.item.projectItems.find(p => p.project.id === project.id));
+	async updateProjects(projects: IProject[]): Promise<IProjectItem[] | undefined> {
+		const projectsToAdd: IProject[] = projects.filter(project => !this.item.projectItems?.find(p => p.project.id === project.id));
 		const projectsToRemove: IProjectItem[] = this.item.projectItems?.filter(project => !projects.find(p => p.id === project.project.id)) ?? [];
 		await this.removeProjects(projectsToRemove);
 		await this.addProjects(projectsToAdd);

src/github/pullRequestOverview.ts

@@ -126,6 +126,9 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 				});
 			}),
 		);
+		this._disposables.push(folderRepositoryManager.credentialStore.onDidUpgradeSession(() => {
+			this.updatePullRequest(this._item);
+		}));
 	}
 
 	registerPrListeners() {

src/github/utils.ts

@@ -579,9 +579,9 @@ function parseActor(
 	}
 }
 
-export function parseProjectItems(projects: { id: string; project: { id: string; title: string; } }[] | undefined): IProjectItem[] {
+export function parseProjectItems(projects: { id: string; project: { id: string; title: string; } }[] | undefined): IProjectItem[] | undefined {
 	if (!projects) {
-		return [];
+		return undefined;
 	}
 	return projects.map(project => {
 		return {

src/github/views.ts

@@ -81,5 +81,5 @@ export interface PullRequest {
 }
 
 export interface ProjectItemsReply {
-	projectItems: IProjectItem[];
+	projectItems: IProjectItem[] | undefined;
 }

webviews/components/sidebar.tsx

@@ -25,6 +25,12 @@ export default function Sidebar({ reviewers, labels, hasWritePermission, isIssue
 		updatePR,
 		pr,
 	} = useContext(PullRequestContext);
+
+	const updateProjects = async () => {
+		const newProjects = await changeProjects();
+		updatePR({ ...newProjects });
+	};
+
 	return (
 		<div id="sidebar">
 			{!isIssue ? (
@@ -130,10 +136,7 @@ export default function Sidebar({ reviewers, labels, hasWritePermission, isIssue
 				)}
 			</div>
 			<div id="project" className="section">
-				<div className="section-header" onClick={async () => {
-					const newProjects = await changeProjects();
-					updatePR({ ...newProjects });
-				}}>
+				<div className="section-header" onClick={updateProjects}>
 					<div className="section-title">Project</div>
 					{hasWritePermission ? (
 						<button
@@ -143,11 +146,14 @@ export default function Sidebar({ reviewers, labels, hasWritePermission, isIssue
 						</button>
 					) : null}
 				</div>
-				{(projects && projects.length > 0) ? projects.map(project => (
-					<Project key={project.project.title} {...project} canDelete={hasWritePermission} />
-				)) : (
-					<div className="section-placeholder">None Yet</div>
-				)}
+				{!projects ?
+					<a onClick={updateProjects}>Sign in with more permissions to see projects</a>
+					: (projects.length > 0)
+						? projects.map(project => (
+							<Project key={project.project.title} {...project} canDelete={hasWritePermission} />
+						)) :
+						<div className="section-placeholder">None Yet</div>
+				}
 			</div>
 			<div id="milestone" className="section">
 				<div className="section-header" onClick={async () => {