Update repository account before attempting to push

Author: pol-rivero

app/src/lib/stores/app-store.ts

@@ -5725,7 +5725,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
   public async _updateRepositoryAccount(
     repository: Repository,
     account: Account | null
-  ): Promise<void> {
+  ): Promise<Repository> {
     if (repository.gitHubRepository && account === null) {
       await this.repositoriesStore.clearGitHubRepositoryLogin(
         repository.gitHubRepository
@@ -5739,6 +5739,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
       repo
     )
     await this._refreshRepository(refreshedRepo)
+    return refreshedRepo
   }
 
   public async _updateRepositoryEditorOverride(
@@ -6287,7 +6288,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
 
   /** This shouldn't be called directly. See `Dispatcher`. */
   public async _publishRepository(
-    repository: Repository,
+    oldRepo: Repository,
     name: string,
     description: string,
     private_: boolean,
@@ -6302,8 +6303,11 @@ export class AppStore extends TypedBaseStore<IAppState> {
       private_
     )
 
-    const gitStore = this.gitStoreCache.get(repository)
+    const gitStore = this.gitStoreCache.get(oldRepo)
     await gitStore.addRemote('origin', apiRepository.clone_url)
+    await gitStore.refreshDefaultBranch()
+
+    const repository = await this._updateRepositoryAccount(oldRepo, account)
 
     // skip pushing if the current branch is a detached HEAD or the repository
     // is unborn
@@ -6320,9 +6324,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
       await this.performPush(repository)
     }
 
-    await gitStore.refreshDefaultBranch()
-
-    return this.repositoryWithRefreshedGitHubRepository(repository)
+    return repository
   }
 
   /** This shouldn't be called directly. See `Dispatcher`. */

app/src/ui/dispatcher/dispatcher.ts

@@ -970,7 +970,7 @@ export class Dispatcher {
   public updateRepositoryAccount(
     repository: Repository,
     account: Account | null
-  ): Promise<void> {
+  ): Promise<Repository> {
     account = account?.isAnonymous ? null : account
     return this.appStore._updateRepositoryAccount(repository, account)
   }