From 382f8f8f84db1e3e95ba448a5f0c3a8cd6748c53 Mon Sep 17 00:00:00 2001
From: Simon Knittel <hallo@simonknittel.de>
Date: Fri, 30 Apr 2021 15:19:25 +0200
Subject: [PATCH] Add support for non-organization accounts in GitHub Discovery

Signed-off-by: Simon Knittel <hallo@simonknittel.de>
---
 .../src/ingestion/processors/github/github.ts | 32 ++++++++++++++++---
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/plugins/catalog-backend/src/ingestion/processors/github/github.ts b/plugins/catalog-backend/src/ingestion/processors/github/github.ts
index e07ea8917b..0b7f3d831d 100644
--- a/plugins/catalog-backend/src/ingestion/processors/github/github.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/github/github.ts
@@ -21,6 +21,7 @@ import { graphql } from '@octokit/graphql';
 
 export type QueryResponse = {
   organization: Organization;
+  user: User;
 };
 
 export type Organization = {
@@ -41,6 +42,7 @@ export type User = {
   avatarUrl?: string;
   email?: string;
   name?: string;
+  repositories?: Connection<Repository>;
 };
 
 export type Team = {
@@ -243,13 +245,27 @@ export async function getOrganizationRepositories(
         }
       }
     }
+    user(login: $org) {
+      name
+      repositories(first: 100, after: $cursor) {
+        nodes {
+          name
+          url
+          isArchived
+        }
+        pageInfo {
+          hasNextPage
+          endCursor
+        }
+      }
+    }
   }
   `;
 
   const repositories = await queryWithPaging(
     client,
     query,
-    r => r.organization?.repositories,
+    r => r.organization?.repositories || r.user?.repositories,
     x => x,
     { org },
   );
@@ -327,10 +343,16 @@ export async function queryWithPaging<
 
   let cursor: string | undefined = undefined;
   for (let j = 0; j < 1000 /* just for sanity */; ++j) {
-    const response: Response = await client(query, {
-      ...variables,
-      cursor,
-    });
+    let response: Response;
+
+    try {
+      response = await client(query, {
+        ...variables,
+        cursor,
+      });
+    } catch (e) {
+      response = e.data;
+    }
 
     const conn = connection(response);
     if (!conn) {