fixup

Author: AlexTugarev

components/dashboard/src/projects/NewProject.tsx

@@ -23,7 +23,7 @@ export default function NewProject() {
     const location = useLocation();
     const history = useHistory();
     const { teams } = useContext(TeamsContext);
-    const { user } = useContext(UserContext);
+    const { user, setUser } = useContext(UserContext);
 
     const [provider, setProvider] = useState<string>("github.com");
     const [reposInAccounts, setReposInAccounts] = useState<ProviderRepository[]>([]);
@@ -281,7 +281,10 @@ export default function NewProject() {
 
         const empty = reposInAccounts.length === 0;
 
-        const onGitProviderSeleted = (host: string) => {
+        const onGitProviderSeleted = async (host: string, updateUser?: boolean) => {
+            if (updateUser) {
+                setUser(await getGitpodService().server.getLoggedInUser());
+            }
             setShowGitProviders(false);
             setProvider(host);
         }
@@ -347,7 +350,7 @@ export default function NewProject() {
 }
 
 function GitProviders(props: {
-    onHostSelected: (host: string) => void
+    onHostSelected: (host: string, updateUser?: boolean) => void
 }) {
     const [authProviders, setAuthProviders] = useState<AuthProviderInfo[]>([]);
 
@@ -367,8 +370,8 @@ function GitProviders(props: {
         await openAuthorizeWindow({
             host: ap.host,
             scopes: ap.requirements?.default,
-            onSuccess: () => {
-                props.onHostSelected(ap.host);
+            onSuccess: async () => {
+                props.onHostSelected(ap.host, true);
             },
             onError: (error) => {
                 console.log(error);

components/server/ee/src/github/github-app-support.ts

@@ -59,7 +59,7 @@ export class GitHubAppSupport {
                         name: r.name,
                         cloneUrl: r.clone_url,
                         account: r.owner.login,
-                        accountAvatarUrl: r.owner.avatar_url,
+                        accountAvatarUrl: r.owner?.avatar_url,
                         updatedAt: r.updated_at,
                         installationId: installation.data.id,
                         installationUpdatedAt: installation.data.updated_at

components/server/src/gitlab/gitlab-repository-provider.ts

@@ -27,7 +27,7 @@ export class GitlabRepositoryProvider implements RepositoryProvider {
         const cloneUrl = response.http_url_to_repo;
         const description = response.default_branch;
         const host = parseRepoUrl(cloneUrl)!.host;
-        const avatarUrl = response.owner.avatar_url || undefined;
+        const avatarUrl = response.owner?.avatar_url || undefined;
         const webUrl = response.web_url;
         return { host, owner, name, cloneUrl, description, avatarUrl, webUrl };
     }